From 3b0be6406b5498b46b7e8fffe0970efbfad2e6ad Mon Sep 17 00:00:00 2001 From: Mark Drobnak Date: Thu, 20 Sep 2018 11:32:52 -0400 Subject: [PATCH 1/2] Add the `ANALYZE_ONLY_A_AND_AAAA` config option Signed-off-by: Mark Drobnak --- docs/ftldns/configfile.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/ftldns/configfile.md b/docs/ftldns/configfile.md index 5462b03..b6dd4bf 100644 --- a/docs/ftldns/configfile.md +++ b/docs/ftldns/configfile.md @@ -12,6 +12,11 @@ Listen only for local socket connections or permit all connections Allow `FTL` to analyze AAAA queries from pihole.log? +### ANALYZE_ONLY_A_AND_AAAA +`ANALYZE_ONLY_A_AND_AAAA=false|true` + +Should `FTL` only analyze A and AAAA queries? + ### RESOLVE_IPV6 `RESOLVE_IPV6=yes|no` From f5ae3a94bbf708eea11c37964dfdafce5e469f17 Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Mon, 24 Sep 2018 12:38:32 -0400 Subject: [PATCH 2/2] Fix build by locking dependency versions The dependency verions are now locked in requirements.txt. The mkdocs config had to be updated to use a different extension config style, as the old style seems to have been deprecated. The gitignore has been updated to ignore the build directory. Signed-off-by: Mcat12 --- .gitignore | 1 + .travis.yml | 4 ++-- mkdocs.yml | 15 ++++++++++----- requirements.txt | 16 ++++++++++++++++ 4 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 requirements.txt diff --git a/.gitignore b/.gitignore index df01c24..6f5734c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.iml /.idea .idea +site/ diff --git a/.travis.yml b/.travis.yml index c3f45f3..f5fd229 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: python install: -- pip install mkdocs-material markdown-include +- pip install -r requirements.txt script: - mkdocs build --verbose --clean deploy: @@ -11,4 +11,4 @@ deploy: name: $BOT_NAME email: $BOT_EMAIL on: - branch: master \ No newline at end of file + branch: master diff --git a/mkdocs.yml b/mkdocs.yml index 245e087..445d1f7 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -11,27 +11,32 @@ theme: markdown_extensions: # Code highlighting in ``` ``` blocks - - codehilite(guess_lang=true) + - codehilite: + guess_lang: true # Table of Contents - - toc(permalink=true) + - toc: + permalink: true # block-styled side content - admonition # linkafies URL and email links without having to wrap them in Markdown syntax. Also, allows shortens repository issue, pull request, and commit links. - pymdownx.magiclink # Task lists (https://facelessuser.github.io/pymdown-extensions/extensions/tasklist/) - - pymdownx.tasklist(custom_checkbox=true) + - pymdownx.tasklist: + custom_checkbox: true # Highlight words with ==mark me== - pymdownx.mark # Adds support for deletion ~~Delete me~~ and subscript text~a\ subscript~ - pymdownx.tilde -# This extension is a convenience extension, and it currently provides no other additional features +# This extension is a convenience extension which includes many pymdownx extensions +# (https://facelessuser.github.io/pymdown-extensions/extensions/extra/) - pymdownx.extra # Adds syntax for defining footnotes in Markdown documents (https://python-markdown.github.io/extensions/footnotes/) - footnotes # Adds the ability to define abbreviations - abbr # Include files in other documents like {!some/dir/in/docs/filename.md!} - - markdown_include.include(base_path=docs) + - markdown_include.include: + base_path: docs pages: - 'Overview & Support': 'index.md' - 'Getting Started': diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..d3fcb9e --- /dev/null +++ b/requirements.txt @@ -0,0 +1,16 @@ +backports-abc==0.5 +click==6.7 +futures==3.2.0 +Jinja2==2.10 +livereload==2.5.2 +Markdown==3.0 +markdown-include==0.5.1 +MarkupSafe==1.0 +mkdocs==1.0.4 +mkdocs-material==3.0.4 +Pygments==2.2.0 +pymdown-extensions==5.0 +PyYAML==3.13 +singledispatch==3.4.0.3 +six==1.11.0 +tornado==5.1.1