From c3dbbb8f67080c2479fc1058c011e80dd30f7913 Mon Sep 17 00:00:00 2001 From: Joshua Dye Date: Thu, 1 Aug 2019 13:20:27 -0400 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .etckeeper | 145 ++++++++++++++++++++++++++++++++++++++++++++ .pihole | 1 + dhcpcd.conf | 4 ++ pihole/adlists.list | 7 +++ 4 files changed, 157 insertions(+) create mode 160000 .pihole create mode 100644 pihole/adlists.list diff --git a/.etckeeper b/.etckeeper index 9a34f27a..34c8c167 100755 --- a/.etckeeper +++ b/.etckeeper @@ -1,5 +1,7 @@ # Generated by etckeeper. Do not edit. +mkdir -p './.pihole/.git/branches' +mkdir -p './.pihole/.git/objects/info' mkdir -p './X11/xkb' mkdir -p './apparmor.d/force-complain' mkdir -p './apt/auth.conf.d' @@ -54,6 +56,147 @@ maybe chmod 0755 '.' maybe chmod 0700 '.etckeeper' maybe chmod 0644 '.fstab' maybe chmod 0600 '.gitignore' +maybe chmod 0755 '.pihole' +maybe chmod 0644 '.pihole/.editorconfig' +maybe chmod 0755 '.pihole/.git' +maybe chmod 0644 '.pihole/.git/HEAD' +maybe chmod 0755 '.pihole/.git/branches' +maybe chmod 0644 '.pihole/.git/config' +maybe chmod 0644 '.pihole/.git/description' +maybe chmod 0755 '.pihole/.git/hooks' +maybe chmod 0755 '.pihole/.git/hooks/applypatch-msg.sample' +maybe chmod 0755 '.pihole/.git/hooks/commit-msg.sample' +maybe chmod 0755 '.pihole/.git/hooks/fsmonitor-watchman.sample' +maybe chmod 0755 '.pihole/.git/hooks/post-update.sample' +maybe chmod 0755 '.pihole/.git/hooks/pre-applypatch.sample' +maybe chmod 0755 '.pihole/.git/hooks/pre-commit.sample' +maybe chmod 0755 '.pihole/.git/hooks/pre-push.sample' +maybe chmod 0755 '.pihole/.git/hooks/pre-rebase.sample' +maybe chmod 0755 '.pihole/.git/hooks/pre-receive.sample' +maybe chmod 0755 '.pihole/.git/hooks/prepare-commit-msg.sample' +maybe chmod 0755 '.pihole/.git/hooks/update.sample' +maybe chmod 0644 '.pihole/.git/index' +maybe chmod 0755 '.pihole/.git/info' +maybe chmod 0644 '.pihole/.git/info/exclude' +maybe chmod 0755 '.pihole/.git/logs' +maybe chmod 0644 '.pihole/.git/logs/HEAD' +maybe chmod 0755 '.pihole/.git/logs/refs' +maybe chmod 0755 '.pihole/.git/logs/refs/heads' +maybe chmod 0644 '.pihole/.git/logs/refs/heads/master' +maybe chmod 0755 '.pihole/.git/logs/refs/remotes' +maybe chmod 0755 '.pihole/.git/logs/refs/remotes/origin' +maybe chmod 0644 '.pihole/.git/logs/refs/remotes/origin/HEAD' +maybe chmod 0755 '.pihole/.git/objects' +maybe chmod 0755 '.pihole/.git/objects/info' +maybe chmod 0755 '.pihole/.git/objects/pack' +maybe chmod 0444 '.pihole/.git/objects/pack/pack-c5b658a7bf94a1b9aa33c84549e17ab69492e489.idx' +maybe chmod 0444 '.pihole/.git/objects/pack/pack-c5b658a7bf94a1b9aa33c84549e17ab69492e489.pack' +maybe chmod 0644 '.pihole/.git/packed-refs' +maybe chmod 0755 '.pihole/.git/refs' +maybe chmod 0755 '.pihole/.git/refs/heads' +maybe chmod 0644 '.pihole/.git/refs/heads/master' +maybe chmod 0755 '.pihole/.git/refs/remotes' +maybe chmod 0755 '.pihole/.git/refs/remotes/origin' +maybe chmod 0644 '.pihole/.git/refs/remotes/origin/HEAD' +maybe chmod 0755 '.pihole/.git/refs/tags' +maybe chmod 0644 '.pihole/.git/refs/tags/v2.13' +maybe chmod 0644 '.pihole/.git/refs/tags/v2.13.1' +maybe chmod 0644 '.pihole/.git/refs/tags/v2.13.2' +maybe chmod 0644 '.pihole/.git/refs/tags/v3.0' +maybe chmod 0644 '.pihole/.git/refs/tags/v3.0.1' +maybe chmod 0644 '.pihole/.git/refs/tags/v3.1' +maybe chmod 0644 '.pihole/.git/refs/tags/v3.1.4' +maybe chmod 0644 '.pihole/.git/refs/tags/v3.2' +maybe chmod 0644 '.pihole/.git/refs/tags/v3.2.1' +maybe chmod 0644 '.pihole/.git/refs/tags/v3.3' +maybe chmod 0644 '.pihole/.git/refs/tags/v3.3.1' +maybe chmod 0644 '.pihole/.git/refs/tags/v4.0' +maybe chmod 0644 '.pihole/.git/refs/tags/v4.1' +maybe chmod 0644 '.pihole/.git/refs/tags/v4.1.1' +maybe chmod 0644 '.pihole/.git/refs/tags/v4.2' +maybe chmod 0644 '.pihole/.git/refs/tags/v4.2.1' +maybe chmod 0644 '.pihole/.git/refs/tags/v4.2.2' +maybe chmod 0644 '.pihole/.git/refs/tags/v4.3' +maybe chmod 0644 '.pihole/.git/refs/tags/v4.3.1' +maybe chmod 0644 '.pihole/.git/shallow' +maybe chmod 0644 '.pihole/.gitattributes' +maybe chmod 0755 '.pihole/.github' +maybe chmod 0644 '.pihole/.github/ISSUE_TEMPLATE.md' +maybe chmod 0644 '.pihole/.github/PULL_REQUEST_TEMPLATE.md' +maybe chmod 0644 '.pihole/.github/dco.yml' +maybe chmod 0644 '.pihole/.gitignore' +maybe chmod 0755 '.pihole/.idea' +maybe chmod 0644 '.pihole/.idea/codeStyleSettings.xml' +maybe chmod 0755 '.pihole/.idea/codeStyles' +maybe chmod 0644 '.pihole/.idea/codeStyles/Project.xml' +maybe chmod 0644 '.pihole/.idea/codeStyles/codeStyleConfig.xml' +maybe chmod 0644 '.pihole/.stickler.yml' +maybe chmod 0644 '.pihole/.travis.yml' +maybe chmod 0644 '.pihole/CONTRIBUTING.md' +maybe chmod 0644 '.pihole/LICENSE' +maybe chmod 0644 '.pihole/README.md' +maybe chmod 0755 '.pihole/advanced' +maybe chmod 0644 '.pihole/advanced/01-pihole.conf' +maybe chmod 0755 '.pihole/advanced/GIFs' +maybe chmod 0644 '.pihole/advanced/GIFs/25Bytes.gif' +maybe chmod 0644 '.pihole/advanced/GIFs/26Bytes.gif' +maybe chmod 0644 '.pihole/advanced/GIFs/37Bytes.gif' +maybe chmod 0644 '.pihole/advanced/GIFs/43Bytes.gif' +maybe chmod 0755 '.pihole/advanced/Scripts' +maybe chmod 0644 '.pihole/advanced/Scripts/COL_TABLE' +maybe chmod 0755 '.pihole/advanced/Scripts/chronometer.sh' +maybe chmod 0755 '.pihole/advanced/Scripts/list.sh' +maybe chmod 0644 '.pihole/advanced/Scripts/piholeCheckout.sh' +maybe chmod 0755 '.pihole/advanced/Scripts/piholeDebug.sh' +maybe chmod 0755 '.pihole/advanced/Scripts/piholeLogFlush.sh' +maybe chmod 0644 '.pihole/advanced/Scripts/query.sh' +maybe chmod 0755 '.pihole/advanced/Scripts/setupLCD.sh' +maybe chmod 0755 '.pihole/advanced/Scripts/update.sh' +maybe chmod 0755 '.pihole/advanced/Scripts/updatecheck.sh' +maybe chmod 0755 '.pihole/advanced/Scripts/version.sh' +maybe chmod 0755 '.pihole/advanced/Scripts/webpage.sh' +maybe chmod 0644 '.pihole/advanced/Scripts/wildcard_regex_converter.sh' +maybe chmod 0755 '.pihole/advanced/Templates' +maybe chmod 0644 '.pihole/advanced/Templates/logrotate' +maybe chmod 0644 '.pihole/advanced/Templates/pihole-FTL.service' +maybe chmod 0644 '.pihole/advanced/Templates/pihole.cron' +maybe chmod 0644 '.pihole/advanced/Templates/pihole.sudo' +maybe chmod 0755 '.pihole/advanced/bash-completion' +maybe chmod 0644 '.pihole/advanced/bash-completion/pihole' +maybe chmod 0644 '.pihole/advanced/blockingpage.css' +maybe chmod 0644 '.pihole/advanced/cmdline.txt' +maybe chmod 0644 '.pihole/advanced/console-setup' +maybe chmod 0644 '.pihole/advanced/dnsmasq.conf.original' +maybe chmod 0644 '.pihole/advanced/index.php' +maybe chmod 0644 '.pihole/advanced/lighttpd.conf.debian' +maybe chmod 0644 '.pihole/advanced/lighttpd.conf.fedora' +maybe chmod 0755 '.pihole/automated install' +maybe chmod 0755 '.pihole/automated install/basic-install.sh' +maybe chmod 0755 '.pihole/automated install/uninstall.sh' +maybe chmod 0755 '.pihole/autotest' +maybe chmod 0755 '.pihole/block hulu ads' +maybe chmod 0644 '.pihole/block hulu ads/lighttpd.conf' +maybe chmod 0644 '.pihole/block hulu ads/minidlna.conf' +maybe chmod 0755 '.pihole/gravity.sh' +maybe chmod 0755 '.pihole/manpages' +maybe chmod 0644 '.pihole/manpages/pihole-FTL.8' +maybe chmod 0644 '.pihole/manpages/pihole-FTL.conf.5' +maybe chmod 0644 '.pihole/manpages/pihole.8' +maybe chmod 0755 '.pihole/pihole' +maybe chmod 0644 '.pihole/requirements.txt' +maybe chmod 0644 '.pihole/setup.py' +maybe chmod 0755 '.pihole/test' +maybe chmod 0644 '.pihole/test/README.md' +maybe chmod 0644 '.pihole/test/__init__.py' +maybe chmod 0644 '.pihole/test/centos.Dockerfile' +maybe chmod 0644 '.pihole/test/conftest.py' +maybe chmod 0644 '.pihole/test/debian.Dockerfile' +maybe chmod 0644 '.pihole/test/fedora.Dockerfile' +maybe chmod 0644 '.pihole/test/test_000_build_containers.py' +maybe chmod 0644 '.pihole/test/test_automated_install.py' +maybe chmod 0644 '.pihole/test/test_centos_fedora_support.py' +maybe chmod 0644 '.pihole/test/test_shellcheck.py' +maybe chmod 0644 '.pihole/tox.ini' maybe chmod 0755 'X11' maybe chmod 0755 'X11/Xreset' maybe chmod 0755 'X11/Xreset.d' @@ -5893,6 +6036,8 @@ maybe chmod 0644 'perl/Net/libnet.cfg' maybe chmod 0755 'perl/XML' maybe chmod 0755 'perl/XML/SAX' maybe chmod 0644 'perl/XML/SAX/ParserDetails.ini' +maybe chmod 0755 'pihole' +maybe chmod 0644 'pihole/adlists.list' maybe chmod 0644 'pip.conf' maybe chmod 0755 'plymouth' maybe chmod 0644 'plymouth/plymouthd.conf' diff --git a/.pihole b/.pihole new file mode 160000 index 00000000..1a741f69 --- /dev/null +++ b/.pihole @@ -0,0 +1 @@ +Subproject commit 1a741f696eec2ee148fc59bc0dc98e862475e6ef diff --git a/dhcpcd.conf b/dhcpcd.conf index b34f11a0..ab1d9a40 100644 --- a/dhcpcd.conf +++ b/dhcpcd.conf @@ -57,3 +57,7 @@ slaac private # fallback to static profile on eth0 #interface eth0 #fallback static_eth0 +interface eth0 + static ip_address=10.3.14.92/10 + static routers=10.42.47.42 + static domain_name_servers=127.0.0.1 diff --git a/pihole/adlists.list b/pihole/adlists.list new file mode 100644 index 00000000..914ebad1 --- /dev/null +++ b/pihole/adlists.list @@ -0,0 +1,7 @@ +https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts +https://mirror1.malwaredomains.com/files/justdomains +http://sysctl.org/cameleon/hosts +https://zeustracker.abuse.ch/blocklist.php?download=domainblocklist +https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt +https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt +https://hosts-file.net/ad_servers.txt