diff --git a/.etckeeper b/.etckeeper index eec6b658..7d214db8 100755 --- a/.etckeeper +++ b/.etckeeper @@ -89,9 +89,12 @@ 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 0644 '.pihole/.git/logs/refs/remotes/origin/master' 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-7a2786ac307537f383ccb724df38dc16e32de3e6.idx' +maybe chmod 0444 '.pihole/.git/objects/pack/pack-7a2786ac307537f383ccb724df38dc16e32de3e6.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' @@ -101,6 +104,7 @@ 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 0644 '.pihole/.git/refs/remotes/origin/master' 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' @@ -121,9 +125,11 @@ 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/refs/tags/v4.3.2' maybe chmod 0644 '.pihole/.git/shallow' maybe chmod 0644 '.pihole/.gitattributes' maybe chmod 0755 '.pihole/.github' +maybe chmod 0644 '.pihole/.github/FUNDING.yml' maybe chmod 0644 '.pihole/.github/ISSUE_TEMPLATE.md' maybe chmod 0644 '.pihole/.github/PULL_REQUEST_TEMPLATE.md' maybe chmod 0644 '.pihole/.github/dco.yml' @@ -654,6 +660,8 @@ maybe chmod 0755 'dhcp/.git/objects/42' maybe chmod 0444 'dhcp/.git/objects/42/6afab5434983fa2632d6b8b288217b58063e36' maybe chmod 0755 'dhcp/.git/objects/47' maybe chmod 0444 'dhcp/.git/objects/47/8395125b027ce250914513399088593575c011' +maybe chmod 0755 'dhcp/.git/objects/4b' +maybe chmod 0444 'dhcp/.git/objects/4b/4316049c32c94068767541e4ef205ed981efb2' maybe chmod 0755 'dhcp/.git/objects/50' maybe chmod 0444 'dhcp/.git/objects/50/80430ed42d9518fec6e462f33337acfe22f8fd' maybe chmod 0755 'dhcp/.git/objects/59' @@ -704,10 +712,14 @@ maybe chmod 0755 'dhcp/.git/objects/df' maybe chmod 0444 'dhcp/.git/objects/df/e494006d441bc7e882158263c68e964b30b2b0' maybe chmod 0755 'dhcp/.git/objects/e3' maybe chmod 0444 'dhcp/.git/objects/e3/7679f4d2333dc4b44b1cd89d8158e230295435' +maybe chmod 0755 'dhcp/.git/objects/e4' +maybe chmod 0444 'dhcp/.git/objects/e4/a249d00465924f4acac2a290680374e5b47c08' maybe chmod 0755 'dhcp/.git/objects/e7' maybe chmod 0444 'dhcp/.git/objects/e7/67214abab058ee2af123641d9fa94d45c05054' maybe chmod 0755 'dhcp/.git/objects/e9' maybe chmod 0444 'dhcp/.git/objects/e9/d158fe37c5e3c5f2566359e91f8af0af92edae' +maybe chmod 0755 'dhcp/.git/objects/ee' +maybe chmod 0444 'dhcp/.git/objects/ee/8a0153b8c413b2ec6a23acba57da5a6619eadf' maybe chmod 0755 'dhcp/.git/objects/f0' maybe chmod 0444 'dhcp/.git/objects/f0/08ffdb9148b9d430c6806fb1c9b3caa11b6991' maybe chmod 0755 'dhcp/.git/objects/f3' @@ -4327,6 +4339,11 @@ maybe chmod 0644 'letsencrypt/csr/2958_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/2959_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/2960_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/2961_csr-certbot.pem' +maybe chmod 0644 'letsencrypt/csr/2962_csr-certbot.pem' +maybe chmod 0644 'letsencrypt/csr/2963_csr-certbot.pem' +maybe chmod 0644 'letsencrypt/csr/2964_csr-certbot.pem' +maybe chmod 0644 'letsencrypt/csr/2965_csr-certbot.pem' +maybe chmod 0644 'letsencrypt/csr/2966_csr-certbot.pem' maybe chmod 0700 'letsencrypt/keys' maybe chmod 0600 'letsencrypt/keys/0000_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/0001_key-certbot.pem' @@ -7290,6 +7307,11 @@ maybe chmod 0600 'letsencrypt/keys/2958_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/2959_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/2960_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/2961_key-certbot.pem' +maybe chmod 0600 'letsencrypt/keys/2962_key-certbot.pem' +maybe chmod 0600 'letsencrypt/keys/2963_key-certbot.pem' +maybe chmod 0600 'letsencrypt/keys/2964_key-certbot.pem' +maybe chmod 0600 'letsencrypt/keys/2965_key-certbot.pem' +maybe chmod 0600 'letsencrypt/keys/2966_key-certbot.pem' maybe chmod 0700 'letsencrypt/live' maybe chmod 0755 'letsencrypt/live/5f3b42dd7a0ab1cb.natalieandjoshua.com' maybe chmod 0644 'letsencrypt/live/5f3b42dd7a0ab1cb.natalieandjoshua.com/README' diff --git a/.pihole b/.pihole index 1a741f69..e41c4b5b 160000 --- a/.pihole +++ b/.pihole @@ -1 +1 @@ -Subproject commit 1a741f696eec2ee148fc59bc0dc98e862475e6ef +Subproject commit e41c4b5bb691cea1f5b950d39518d8c404b5846e diff --git a/cron.d/pihole b/cron.d/pihole index 9915fb4f..a0ccca16 100644 --- a/cron.d/pihole +++ b/cron.d/pihole @@ -18,7 +18,7 @@ # early morning. Download any updates from the adlists # Squash output to log, then splat the log to stdout on error to allow for # standard crontab job error handling. -9 4 * * 7 root PATH="$PATH:/usr/local/bin/" pihole updateGravity >/var/log/pihole_updateGravity.log || cat /var/log/pihole_updateGravity.log +33 3 * * 7 root PATH="$PATH:/usr/local/bin/" pihole updateGravity >/var/log/pihole_updateGravity.log || cat /var/log/pihole_updateGravity.log # Pi-hole: Flush the log daily at 00:00 # The flush script will use logrotate if available @@ -32,5 +32,5 @@ */10 * * * * root PATH="$PATH:/usr/local/bin/" pihole updatechecker local # Pi-hole: Grab remote version every 24 hours -51 17 * * * root PATH="$PATH:/usr/local/bin/" pihole updatechecker remote +1 16 * * * root PATH="$PATH:/usr/local/bin/" pihole updatechecker remote @reboot root PATH="$PATH:/usr/local/bin/" pihole updatechecker remote reboot diff --git a/dhcp b/dhcp index 1a33681e..e4a249d0 160000 --- a/dhcp +++ b/dhcp @@ -1 +1 @@ -Subproject commit 1a33681e0d296a41a5ba92bc1bec2cffe360e3e7 +Subproject commit e4a249d00465924f4acac2a290680374e5b47c08 diff --git a/dnsmasq.d/01-pihole.conf b/dnsmasq.d/01-pihole.conf index 69072f98..a64613a3 100644 --- a/dnsmasq.d/01-pihole.conf +++ b/dnsmasq.d/01-pihole.conf @@ -38,11 +38,6 @@ log-facility=/var/log/pihole.log local-ttl=2 log-async - -# If a DHCP client claims that its name is "wpad", ignore that. -# This fixes a security hole. see CERT Vulnerability VU#598349 -dhcp-name-match=set:wpad-ignore,wpad -dhcp-ignore-names=tag:wpad-ignore server=127.0.0.1#53 server=127.0.0.1#53 domain-needed diff --git a/letsencrypt/csr/2962_csr-certbot.pem b/letsencrypt/csr/2962_csr-certbot.pem new file mode 100644 index 00000000..9671f6e0 --- /dev/null +++ b/letsencrypt/csr/2962_csr-certbot.pem @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICiDCCAXACAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM8Q +GzoDwqQsHtYkfimTAyZtlWMZxEEVRhnfRUXhVKdQYh9FRGizlGTMBnEn4r03xK2S +ea5BuuCgiQMInCpvmslvf++IVo1PQqHn47/ZXtgo9pGEhKgZDeh9xwDtZIdRrN9s +FS2ECQNYY13ZtuKCUPMck6p62s4cmLc05tXEOedqd4JRi0tRX6ZhsURBL/fA68YU +cMSkw/xNMSngJQt5sdPNvHQUvp/DENOcLIjnqCsgckiw8/jsPcMjqPagPlxS4+xj +1oQQweneNsSt/lOQ4SKV1ghOzMMB20cz7zWO6gzO4BbXKVvLlpQZQH7gIcd4sRMX +5vm9sBn5YAX/IJPdG5sCAwEAAaBDMEEGCSqGSIb3DQEJDjE0MDIwMAYDVR0RBCkw +J4IlNWYzYjQyZGQ3YTBhYjFjYi5uYXRhbGllYW5kam9zaHVhLmNvbTANBgkqhkiG +9w0BAQsFAAOCAQEAG8BpUQS3gWV+jae4EyLKt9ngy4pF81y2L7D+XC9tOCZKroVb +Wz30Q2BaaLyWvyUCCf5/10Vw1tVKApXDhxApXYPATCux3HO7JgWruXgq0gI/bA9P +TpQ1Mq0zTI87GFah9oW6rpwmPcXoQRodkrNSiSnHQMwwJdcoYx+GKjxwpg4O5ViB +r1v40DCPoA8eS6PvIPN96/C9yrDFvF2fUPu9L1ONU9r6NMiSqq1KzI7eovMOW+rZ +Rz23iGIjG5MjcC8rxtJeIT3J6Qni3+eaG9r863i7q5fKALt1hr97qh8U4d3aPNuv +NRB9EhORe7t5jDaCUGvCFaCLSbPi8qSk85ugGQ== +-----END CERTIFICATE REQUEST----- diff --git a/letsencrypt/csr/2963_csr-certbot.pem b/letsencrypt/csr/2963_csr-certbot.pem new file mode 100644 index 00000000..bc1932bf --- /dev/null +++ b/letsencrypt/csr/2963_csr-certbot.pem @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICezCCAWMCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOB9 +lJFmnHIu2TUZe2ddjhKQug6D4w6ZZoVYfTmJCsuYCMOYgYNKfCBrwdRgDeUQobmB +5DUIEcjPLoRJyeb6KiACuA9s7lKMbDK5FCY18yFc9tCT0jDvCDCqDnpJSRradAIZ +RJCIihiFBCafS41PvhPhRxFG6CUX9wATPFyJiXYIyL9U4zn087dCsVIdzCLQ9wY8 +K6k+pvO/o8jqokRfPoRzJZToereasxHVB0tycniY2uuCJ3KCW2Z5efpIKuOtr9PV +V5xUPiwrf8ew6cBH0MP26vM9dwSKmw0044RqvSHLguImg+S8+eaga4gKKWMDBlvS +z/owSNFNvhGJzPfNQjMCAwEAAaA2MDQGCSqGSIb3DQEJDjEnMCUwIwYDVR0RBBww +GoIYcnNzLm5hdGFsaWVhbmRqb3NodWEuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQAH +m6fE4lADnuCqx36Ncc4PX8lg3wDpW45vciO6iXRDFBBjyFLyMu2tJO/ccWW+tcSd +QC9pawZv4isTNRqClQP4G+uFUuHwO5I1Lxe/zhS6dIPUpVVa/C3HmztIv1VLvsVX +HORgwuNLOAQaiJVziy0TTfr1znbgvvKIz6l3TmUbOSV8Gw3lh6n8oWa4UnXLDHIJ +GuRZNByLC4pGw784YdrtJP8fxIqlYD2uzsBvN5YvRVH3y3nA4PLK0tICyMeZgQJ1 +JdpAzL+fbpF+iSa5uoGlm/Ke54JIrSHBbLDq4nCnVnYqQy65XslrkPeIOiFbhu87 +JMeRXmnPeEYT2GPhojFj +-----END CERTIFICATE REQUEST----- diff --git a/letsencrypt/csr/2964_csr-certbot.pem b/letsencrypt/csr/2964_csr-certbot.pem new file mode 100644 index 00000000..827415f5 --- /dev/null +++ b/letsencrypt/csr/2964_csr-certbot.pem @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICdTCCAV0CAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM3s ++ZxlPEoOFZbQoAgroY2igFyEEcP17Mx3pP6scjZCDWemCWOZs8LXRwZmAXFEXTBa +7F3PrMrAasRyZdJNhKdpAsZvYS2F8SSFrPQwrGFnvZKu3l2KKkWCtRzYNcTp7FZ0 +nHyxv73QbWK3eSe7Xj8DVJ8fqiKXWiwPWBfsvgR+SF/JUHaaQFXLXLXCNBeS68Sl +b2VHzd0xJh7gNrKVFzvkkyCy0p1w/tSjQW+Yfc3kAEnoEo7EqAhqoOFwRVugr7G4 +/zKVc1/e54EV4N4E8ajygrsMWFp8AOhNYaFTpi3zVCQMXHH36Lnj+y4nXxYhoImu +fn3Mlnr5IeF+jG09ZxkCAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0RBBYw +FIISdnBuLm92YWx3b25kZXIuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQAPtc9E4kXy +PnQgmroAdGiSf0rLXUNZ/bln23o8/Aq5CEAtJfpPnc7v3F4/GwlpVnvsQzpddSiY +17vpRSFCcV3oqUkdJxRWsPpxI7YuhmLv5KEoR1oUXarb4fgRxyypOLt97RZjYwWH +W8y9zTbDaM6K+xHMpbKLrhfAuvGWoRs89KCkQixSsWUmhYSRTRZ2K1b0F0ihHisb +pzNB942KzBNW/+ZL0CUW2xVir0PrkAUiIgEVRlRtx5TRQh0Ybmk1dXYmY2Ab+De5 +sIwVZmd6P5m3uqvjZ8wG6SQ3/3a9fEHarzGVdHv2lMHgd7LzQGKBD1/ILrQQWltb +ato0kQSSFi39 +-----END CERTIFICATE REQUEST----- diff --git a/letsencrypt/csr/2965_csr-certbot.pem b/letsencrypt/csr/2965_csr-certbot.pem new file mode 100644 index 00000000..4a9c9f4f --- /dev/null +++ b/letsencrypt/csr/2965_csr-certbot.pem @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICfDCCAWQCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALIr +pb295mG+WDoGS7taSUdEiACFzpGBZ0gKzJ2aunzTet5zpWUi9kGTydb5Mtmh2KbA +gP/xs+gUq2ihc0MU4qpv41/gnOOCTV+nVg6DDELbQ7joGbPZjX4fMcGAAvmrLUGZ +OuoN19UFaNp800cP0JTVIJi9Ucu/Ye5VPkH+P6i6q/9Lp6XpfyFDx+oaq43iTdcq +MH/pgzGcI+Y+rQV9sPn5oHsf1ZQjuVQ6jvjZ0zSEbeRLAWy7qzSfRNZ7EKAVg35r +qGcZY8Vbp1Xo+E2NhJLdpdjMqHHKLXaXe/R8uVu5wQFndhZTwMjCv0yeNQXyLkMf +AxKeYfcqoDJVQer18isCAwEAAaA3MDUGCSqGSIb3DQEJDjEoMCYwJAYDVR0RBB0w +G4IZd2lmaS5uYXRhbGllYW5kam9zaHVhLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEA +ZTQsTVOu7wVo900OevPnUVxW7PvWwVsK4TR2Kr7dp+0P9P30aIBiDJj25E8oW506 +/sohO1gSGL4kSc5DWHEEYGeVE0cxz3d0VZ1TBoy7n2p8mgqnMLsrFmOkkfclK4Dn +WSUg8RgzrBUY6lLu/Lrpcu/Fhq3TX1suqUXxLP/u/ObTeVhI4iWnedGIhRbZfMJX +nXswNXhiOMAesXXnT6BqXe3I1TA3Lo/ojjqaybC4my9gSqqvBu8eyw4WHcWlnEHA +CghuKZFgP7OLKzBDJjlUXmgnqHW7ZtP8ZsGMQEtOonOut5ciEvNto0UGZIZa8Oum +55u8kMCRX3xukkLwUh2Q5g== +-----END CERTIFICATE REQUEST----- diff --git a/letsencrypt/csr/2966_csr-certbot.pem b/letsencrypt/csr/2966_csr-certbot.pem new file mode 100644 index 00000000..8c14163a --- /dev/null +++ b/letsencrypt/csr/2966_csr-certbot.pem @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICfTCCAWUCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALEK +GyEHRGooQTsvBctvgVGb35f3Gkwc0tmpDpzuZTqO1c2dmqkLkjZgOl0yiqo4h/1X +rUKcc6GWydgSDs0u9GObkVBX+erTBu75bNc2corfEBzUi/CI1PCbokCG37gpWJOr +Qgg6M7J3yfkfJ+4FwM3NmrEStuPPqL4nDcoARReBSDS0ZJRoZZWb4Qru6nEgIlj5 +dcRfQSTmGVHD0vjh10xjc5X9Dm9up2KeJpTsLNB0iR3nEmUUCzJZ7d7mNQaZj+N8 +56/5PhlA9K+IdJ5G62k8amt4EP1OkglFvUl1I7P0ZPqflCNSG4NxvyoMZk33dBSJ +sKufaAwHqFIplNBN6ekCAwEAAaA4MDYGCSqGSIb3DQEJDjEpMCcwJQYDVR0RBB4w +HIIad2lmaTIubmF0YWxpZWFuZGpvc2h1YS5jb20wDQYJKoZIhvcNAQELBQADggEB +ACBQXLpd3/Ni6/M34nkCi7K4hoMKUtp6NceeLlDQm6785vtKxfelliALRBNQrLk5 +MUFjYyj+Y/pgDtMlTDdwITExpPyIs+U48eaPrLOHvIzG5Gj9vrLAiCs1XJS6SPXF +X604OcO3UMgfCH37tdaiAH7Zs+0DWNJKZhQXv0K+r3QZqZOnQGqm2+zZo2UHfwOT +t7ywK9BnKa5z5cK4a7Fm1TD6BSIRgNF49Yx6RHXqvRD1NNRds4UcLMi7+Lgh4iTJ +k5dFV5mhMmvII9fqFiauR6J9fdIDnMHtDiibiOyfMMykvWgoBW+yJE30y4QUZXf0 +ravZbHjG9hXmzwsJ58IcQ2g= +-----END CERTIFICATE REQUEST----- diff --git a/letsencrypt/keys/2962_key-certbot.pem b/letsencrypt/keys/2962_key-certbot.pem new file mode 100644 index 00000000..f0c82dcf --- /dev/null +++ b/letsencrypt/keys/2962_key-certbot.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDPEBs6A8KkLB7W +JH4pkwMmbZVjGcRBFUYZ30VF4VSnUGIfRURos5RkzAZxJ+K9N8StknmuQbrgoIkD +CJwqb5rJb3/viFaNT0Kh5+O/2V7YKPaRhISoGQ3ofccA7WSHUazfbBUthAkDWGNd +2bbiglDzHJOqetrOHJi3NObVxDnnaneCUYtLUV+mYbFEQS/3wOvGFHDEpMP8TTEp +4CULebHTzbx0FL6fwxDTnCyI56grIHJIsPP47D3DI6j2oD5cUuPsY9aEEMHp3jbE +rf5TkOEildYITszDAdtHM+81juoMzuAW1ylby5aUGUB+4CHHeLETF+b5vbAZ+WAF +/yCT3RubAgMBAAECggEAX/3JgXWo0E8b5I56Zm+e8DuxG4Ygc0OXgfr9tE2n3wDm +3DRSaG+IBcqH2gFxneKyrPzQqDYUmnoRynQ9YXbnvSaRmswLw+rQqxpDfPcafv9O +f1t93CfxSKy2ivmCtzDoAZOrpbQmMYTSW/nITO249Vt0IX5e3VpoedZuhP85EMx2 +A0B7qBVGoA3DYZg2CM5+k4NNSDCXcRsPLYTi5TYguyI4C0cxq45S62p6ntTb7nOF +Oh9fGoz9Ubh1zOeLgg4lZIFVFlyHXaU/VRjb2vWcU7zNNFt1FW4Bdkgo5aJedJPV +OL5wRmNfoAnOaILDfMYPjNTme3pmwY1xt3bDKpbQYQKBgQD/npkUKCSFYR7nxqpA +288pXLfzWlJ2srmqVT2JcS39FRmEpyKzCSXnIQ05TTvWL7wY+X1dZoHr6+YtUH1S +zak2fjLoF1InWckfcDWU76QwnDMKcORyMLqF4j0pqIZ9nfwm2IWjwCSRR4jP2eyY +I0q+yxo8LmQxED1vMZyEJUuvKQKBgQDPXwGYhECQR1jm2jH577ylmC1qU4E88YUZ +UiYihQlgcLALq1Ctt0X3WH00X0i06v/hI+L5bUoVLyR6giVX5xaub6JiDKyOtt7n +SCINt25fUfu4Udx/Zw+LsHs4GKRJqLl2ynJGFeaAnFjGGTzYIBi+ZynXniDFKPFI +o2AT880BIwKBgQDHXEFVeC1rnSCGceoM5aI/RyHsePBBxQiK8SoqTIwqi084p0Wn +zqWyCpQOsc7OMLKJ4+NDehQwFO6TPuhPMTkc1/YKD04yhJMYouIXQ4ORqfEg3oU9 +DgYbLyS2ncoupI2pGku4N74NVHY+bV9aFIRSI4NVlnTr0xem5lGEurW5aQKBgEYx +urCN0+0Cua0rHs+jvw+uu3DKY2zltFAl5pK4xbvHaVAJ5X1oFF7trTQVLN9QzNzA +8QvNWs5g7tApTcq7hon1b9oQwDhu3nUbjatm9A2ACt0RmLnngPOgAZWzgakNW/pB +/PyMXUIbqlEkKdxewQFymk9KT31tpn8YDmWymSpRAoGAOcYr8Zga7RB2zA+KD7tC +nkIObfSQ3xI0LLWqWof8MYZXSOkZdtnEu+lofy/LPEpD2I65GieggyaOAY1KV3+V +159Kd4yKjKHbNQ4Y3org0Y3eGWriuFGsli0bahC/d4M+9QiaHU0mb+62Ll9uO1Dp +iZuNbEWj+KY3V99ry0A3jlM= +-----END PRIVATE KEY----- diff --git a/letsencrypt/keys/2963_key-certbot.pem b/letsencrypt/keys/2963_key-certbot.pem new file mode 100644 index 00000000..954f58fd --- /dev/null +++ b/letsencrypt/keys/2963_key-certbot.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDgfZSRZpxyLtk1 +GXtnXY4SkLoOg+MOmWaFWH05iQrLmAjDmIGDSnwga8HUYA3lEKG5geQ1CBHIzy6E +Scnm+iogArgPbO5SjGwyuRQmNfMhXPbQk9Iw7wgwqg56SUka2nQCGUSQiIoYhQQm +n0uNT74T4UcRRuglF/cAEzxciYl2CMi/VOM59PO3QrFSHcwi0PcGPCupPqbzv6PI +6qJEXz6EcyWU6Hq3mrMR1QdLcnJ4mNrrgidygltmeXn6SCrjra/T1VecVD4sK3/H +sOnAR9DD9urzPXcEipsNNOOEar0hy4LiJoPkvPnmoGuICiljAwZb0s/6MEjRTb4R +icz3zUIzAgMBAAECggEAGZkYRNAvjLGc4Por4SiA18sa/Ca70GFbmF7zwIjI61hF +v4/3TLJEnynKa14cl38jAdU24XkvFffR9RG47RafkRDeThv8vPr4J3yFOKo0NBy2 +pCgG8r9+7pWlmvoaVO6OBeM9t0Fqhcs9Iu5NHir2oKuyf9zXAcvOxXpsCp1ASG4X +T3EEPz99WoYGyYFF71lW6mG2YS/uaNdTdalFRSD5h7gIlgBP5PNfiXLTVJRyQkBI +HFl3s4dzWMPefHEJWMifaGiiK8uozAw4WaEHT+oWlvOiQDquJ8ILMzWQyZzVAzYH +eCLWPxkNH9EpaVCUhVgsPudb95MYlj5RkGG+Mr4rKQKBgQD0XDOg/+5i9bp2EZwd ++YfgRQuVa3pT0taDgzXNiA6J2jdiKo7aosf2P9ofsBcnRQsL9qwaJf1DrCijEOSe +lFC75JqwwFcl15IjAKV3hazWRBl9KYBKtcCZn2t7oXAEeocmM5zLuT8vRq2wYH7R +xF/5w9JffpwVoXNaOv53/var7QKBgQDrLxU2BbDEI/kHKeUlhj+oxB1GOJ4kccy3 +jNUaZmQkE/+qrlGc4u+zts1Z1sPrSwkV8uXgdQGNJvhy3yDSyDi8rWuv/by9oP2m ++4wU+/hymhkQEQeH9qyUnvzBs5TJTPcOQzxSDZM6gvUNfbv+CoWIs/f7f554rpsf +4hQHxm8inwKBgQCilbpQVBjzxRWkO0FJfF6YrLfxWgqRPUY3SJUCxJUPyZ5x9WkJ +NaegQ4nI7avqF/kqo5yM5Vvmq+R54uKKVJqG+aqnEcKqTg1QtrxhkxKVmcfvzC4t +B1M3o6erIZXblP7ZPxwDPKU6umcUZI/c2DEXiOAvY5lMlxieH4RyqLTNXQKBgGi8 +ZRPT4O7YnlSEYdoeOUdtXyQgnrzYOTUc8OJ66unuRhO64fmeTuWX6UezDzlAB2HQ +9HLLaM91pXtyxulX5XyRNr3/oAhLI+szZyUJOZG/8p1nGBWC00S0sReKZB5pujSN +2NUp2oFaRMunTQtLoEBK9Yr5QJe6GrdONWFpC6E9AoGBANNe3V4f8R9zTh/cVLhu +XBUBpUMYgdqAsbcUS6UBtfE+6Qa5WVwHR5LBATyx336OvSZk9P/2Q6K8E0Ta3gkK +UTtQz7/XFNWMpJAjW0Bq3+ktXRdjyF+5WWyUCN/MirgUYslDZIbnl41BiNTji9Vw +MQ5mUrh8ir5GFCr8AYLGgyKX +-----END PRIVATE KEY----- diff --git a/letsencrypt/keys/2964_key-certbot.pem b/letsencrypt/keys/2964_key-certbot.pem new file mode 100644 index 00000000..869aa649 --- /dev/null +++ b/letsencrypt/keys/2964_key-certbot.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDN7PmcZTxKDhWW +0KAIK6GNooBchBHD9ezMd6T+rHI2Qg1npgljmbPC10cGZgFxRF0wWuxdz6zKwGrE +cmXSTYSnaQLGb2EthfEkhaz0MKxhZ72Srt5diipFgrUc2DXE6exWdJx8sb+90G1i +t3knu14/A1SfH6oil1osD1gX7L4EfkhfyVB2mkBVy1y1wjQXkuvEpW9lR83dMSYe +4DaylRc75JMgstKdcP7Uo0FvmH3N5ABJ6BKOxKgIaqDhcEVboK+xuP8ylXNf3ueB +FeDeBPGo8oK7DFhafADoTWGhU6Yt81QkDFxx9+i54/suJ18WIaCJrn59zJZ6+SHh +foxtPWcZAgMBAAECggEADXLEempCHbP9xPOq/92Zl15dc61MW7fb1x6ZL+ijLNfz +eClnw5FuI/NbOBfBUFxemaHWfenqJvOaBWpTLADUAPriq4LqncZ5kSEJwojLOTFF +OCcjbohvakq2+UNFf66nOJ40+g/BrevGuQOybd3WsdbN1/aBbfDkeqwl3KohXrmi +hmtq0VuInqZz3m/ojiP41t4ZUddw7wsVgKQoYByDSl/psCwMrWhtK9cE+xvHyBAG +GOKlfaARZgBTltDNnwDMcToKHxOQRqZ3IE1QMkehcHfAm3E1DWIOiDXpaW0ifg7M +E3xeZB07fSmpqkpWrjNdH4AcPX4z0NvR983D7GG0AQKBgQDzKVUGm7DgqDeoDvAz +skjdYf1tgr5iW5gpARlXIjThaWj9xwid/Y5SoLCGBt+elXHuRF/TbiKAsII7v1yj +SbbStIZ9fwraS1IoBU1AwhfG4pEVLAGXHJRUuJmGDTqMICInbkAyblq30qOV8Vqj +PqTMEGsvqIPOPK/xCuR5sQBW8QKBgQDYzFlrEJpNXT5hk+7FqAJXbT80IadmVVW5 +5yDFeCiADpUt/Phj6MqX2b0XJ5mYpoNoGRs+ofnHR4kT1rBRNtpYUnZBCVULT3st +IoQrYNdpdAGpqMXSEuSRQSQ1k7TcIstOEaTQgT54iSgP08SKhgUBSCR1vEGGvowD +KeCrP/giqQKBgBrDKM2CYzRGr2F6y2sVKznaaBceda/DnvqcWVqitCk+/cQ4nLUu +y/RCJUuLBB+jGRf9RIKzs25wftTumdaK7WlBXy/+xIYEFjW7Z6ZB9nX4R7mJz17/ +UUAF1TfQyunTO48VblFenfNvZnvBRZWD9oVTJUjohiEzwrWH2l+eYIgxAoGAPyWe +cfn/B8O+FMvzA22BaRewDi4zRTJb6u8wc3QhT9NvjlqduvQmdn58fk8RhQ4TPnH5 +po+lYm8qtTWWW8F/bbRvL1hZhhbbiPUBzGTDubqJdXJsVFkebFSuCFECoBAeaZno +CLdsi81fduS23aZVtN7fh8+Swn2j6JP9FcRnMSkCgYAuBMYcnkK84yQr2RetpuYi +mUgMZDVauzjp4wFks7mAM5fwYy0OOhpQsSwOm+veMTPALxmA5A4Fs8GY6EDMdW7i +jHqTtNtkbCx0dZuQYTZGBnsbbCQ64XBLYVks2x3yIMy10SBfpfRFsyil6p4lLtuu +ZN5GYbGSbgtQ3Tw8CplSkg== +-----END PRIVATE KEY----- diff --git a/letsencrypt/keys/2965_key-certbot.pem b/letsencrypt/keys/2965_key-certbot.pem new file mode 100644 index 00000000..aeee6d67 --- /dev/null +++ b/letsencrypt/keys/2965_key-certbot.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCyK6W9veZhvlg6 +Bku7WklHRIgAhc6RgWdICsydmrp803rec6VlIvZBk8nW+TLZodimwID/8bPoFKto +oXNDFOKqb+Nf4Jzjgk1fp1YOgwxC20O46Bmz2Y1+HzHBgAL5qy1BmTrqDdfVBWja +fNNHD9CU1SCYvVHLv2HuVT5B/j+ouqv/S6el6X8hQ8fqGquN4k3XKjB/6YMxnCPm +Pq0FfbD5+aB7H9WUI7lUOo742dM0hG3kSwFsu6s0n0TWexCgFYN+a6hnGWPFW6dV +6PhNjYSS3aXYzKhxyi12l3v0fLlbucEBZ3YWU8DIwr9MnjUF8i5DHwMSnmH3KqAy +VUHq9fIrAgMBAAECggEBAJHbX4S0eGyeGbXuv4Kxx/l65eefotrFV9rHVHjVWUOl +ERoZDFZ+R6Cprvu45+L4NtdUEob0xLYCbcxrF2PcLi8fB8HOrEEnw9XBtJaOu7Pj +sk4mXBw6xjVwrhfdhxIDCzp/iZZgHMe79PmgZInxLW0aCORhYBvvIemtiRkXXd/v +C/Ii9y3lD7QAHYfnBBXnzr5bWLmB7jvWBfAcTsUpha6JkGpjydddzry+dp0XnnpB +/gxpthttS7CLZcs/4+LQjKQ9GGaOJf/A7I5lJjV9kVWvFezs0yRO1X1NY47UQkP1 +Dj3UZIoY4TmFFh+4LMCRTufjcpA2UDLmj8AKHw9c3xkCgYEA2V/TKFNg/+/tv2DV +aA+axkNaEn6yavAnLhFNOerYE3a6gyWZh/02A5Uad+dAcqD9T3pdrxVssqpe/Tc0 +eoO/a7TvQ5A90IU0t3Dzj45GnO4j1qZPjT2MaWjJxQGareyM6x7MprNSW6kSceLv +3hnF5/Sp+5ywdAJYIfqZvtFhpU0CgYEA0dR5TCcTx/pkZx5Nr3+T6iq/Q3s+xznQ +/GztJDacnK/Zn5HdczoffchqJyHK8kvPCNqVzbqJTE+G36kipDPbrQYjgrmw8rJs +GEn+UwnIDtrntEuFhxzZ4iIgVdAL62p7r1TUGv/nC3kzt9k9NnLLENXQzHxOCWWM +E2ODJ44LWVcCgYAn3IyqTm/xPxxIBgfcZ1Aon107GwS424Uzy3Rv9ILfPtyBBDod +V++5xHPwHPYSjzckhfn8C1+9e8SjhqYW+WX26F0f9KmBPYwnP41Ke/qy+HCWAjWA +XxMKmW62s86bqk9FJoa84xFtQZniTI1UG0HRgWpSe69X9r4WrQ/YkCjp2QKBgGNQ +SLUVjdRKHDl+a1CUdsMPxoU/ESCkqdjACaHpQ0kaJkvTc1g1e3BCapPo97Ck1vIe +22aLUq7OuUylNiM39FK5pBccorbMYkNAymItMAZv79kzIZkou6u/cUSMewfK143N +/bJlyspwbF0pMkLSJHDscq5Ga30hFiKbKBmRrqdzAoGABU3AzpWWf3HZmk2EV4O2 +DYDfiIiHpzkjQFR6Ssp2njdMgW+HpSxg+jRAo1pXZrzoSwkqmdTRdvBloHoZVgWr +95lAkR90y04MvZM6gE1mWCHD8MNUnVBLhlHNu5U3YDO+4pu+3h6xKEVtmOAe26vl +NuqLRV0b3wtXIaU5JjzQiwo= +-----END PRIVATE KEY----- diff --git a/letsencrypt/keys/2966_key-certbot.pem b/letsencrypt/keys/2966_key-certbot.pem new file mode 100644 index 00000000..1be39ecf --- /dev/null +++ b/letsencrypt/keys/2966_key-certbot.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCxChshB0RqKEE7 +LwXLb4FRm9+X9xpMHNLZqQ6c7mU6jtXNnZqpC5I2YDpdMoqqOIf9V61CnHOhlsnY +Eg7NLvRjm5FQV/nq0wbu+WzXNnKK3xAc1IvwiNTwm6JAht+4KViTq0IIOjOyd8n5 +HyfuBcDNzZqxErbjz6i+Jw3KAEUXgUg0tGSUaGWVm+EK7upxICJY+XXEX0Ek5hlR +w9L44ddMY3OV/Q5vbqdiniaU7CzQdIkd5xJlFAsyWe3e5jUGmY/jfOev+T4ZQPSv +iHSeRutpPGpreBD9TpIJRb1JdSOz9GT6n5QjUhuDcb8qDGZN93QUibCrn2gMB6hS +KZTQTenpAgMBAAECggEAdvXIdvAQK5jzBBa7uRArADBSFSXoWL6Be9paRF74TFnQ +FoLReseYrssITLl6bZjg3/37IShJlonhBTxVD9B+TTQqd6c1+nFkVk3psc8XNnNe +u1Ci27TGCQs7Akrepzu5FjjcfPTG6iQN5kTmKs1Y2bFPQa7Gj9tokqVhYZu+0WRh +2hm7scHt6sDd/7wdK5Jml5FemKW734EoziGEiShysdpmAWkYAzQQ9PNhRYbZxX9S +BK7rI/nn3CkPHrtbIk8xD695LOZmnD7VvfwCpuvKGfsQRXQ3SFQOoHfH2ZfWg3Fi +WNcWGgvmW8oFvfMpGRFrOdZ2ZO5TL5HpPF9As7BCgQKBgQDkNZMqd0+MP1bnTgxZ +Jvt9dqfDuGw581/VDyJnMpcytI7lTRJV4uxY3BgVWROZwS2MCaHG4t7ZkSnNnyXf +GOFl/lGCOEvRPkFfiAsDS8xVlDj/HxhEAo5eL1EkHsXpnBx768RllgWgp9Oxw+RQ +PauVpGeidNO3saMnCNPsM5mq8QKBgQDGmU/3kmTiB5rurW1EeAG3hA6KFIcf4ZF5 +Dg8eqcKQ9DtnyNT+gRpVxkmqeQTA9ZxvaMFx1hZoWYuhov+4AbElFR7JwxcGyySX +Et2qmdiZBOQDpm5Rai8P84Ub70HKgtrny5UM9MZ+Jmc34H93LGOV3oMIEqrsqqf7 +Jh1lrCH+eQKBgQCy9+EF+LOFxVad53N/pzarWhaPQ158xARvzoKoc+Bnf3phEWRD +vsajmVe5xjW86uaRYCxjESC7d0BVZW4J3DVIC35YpVWwLyaNiN86IoOIyck5KmWZ +UHfeHTWBIjEL18Xu2SMYl+Kp73PxgTLYSsT5gglUOlKfSMwunJm2L3FfwQKBgFNn +YXkEZw+xx/RCqyfdCkOK1xxQIKtX7OMc72aePpLnrucYJbM4ftnU620HY+Kxg2Aa +a1smYMS0Dnr0XFZnh4CeTQ7Iuqvktlon1yXldFxW/Hc39w6D/H3DdHxVz5h/ufUs +v0zwo0epUyHZS06+OphfGUJTrKq1xNQpnqDrWF9pAoGAL3U7B1VhAdj8nKpzPrt5 +1FfyXivM7/HBiggxeRVS86RIMtBtVkRlmc9OLq7sZKFV5m7tFNzHvv42VSlvHvwL +TUz+vWlIkyaU2lpXJg9W8C8D0mZCl5JeENmjOBl6M8WGLCwNQqynpf+PaB3ZF5iC +fDN/FEY5fy9cHllynWoEyCw= +-----END PRIVATE KEY----- diff --git a/pihole/dns-servers.conf b/pihole/dns-servers.conf index 67708d02..3a43a5e0 100644 --- a/pihole/dns-servers.conf +++ b/pihole/dns-servers.conf @@ -1,5 +1,5 @@ Google (ECS);8.8.8.8;8.8.4.4;2001:4860:4860:0:0:0:0:8888;2001:4860:4860:0:0:0:0:8844 -OpenDNS (ECS);208.67.222.222;208.67.220.220;2620:0:ccc::2;2620:0:ccd::2 +OpenDNS (ECS);208.67.222.222;208.67.220.220;2620:119:35::35;2620:119:53::53 Level3;4.2.2.1;4.2.2.2;; Comodo;8.26.56.26;8.20.247.20;; DNS.WATCH;84.200.69.80;84.200.70.40;2001:1608:10:25:0:0:1c04:b12f;2001:1608:10:25:0:0:9249:d69b diff --git a/pihole/localversions b/pihole/localversions index 8d640041..966d3a40 100644 --- a/pihole/localversions +++ b/pihole/localversions @@ -1 +1 @@ -v4.3.1-0-g1a741f6 v4.3-0-g44aff72 v4.3.1 \ No newline at end of file +v4.3.2-0-ge41c4b5 v4.3.2-0-g38d8e77 v4.3.1 \ No newline at end of file diff --git a/pihole/setupVars.conf b/pihole/setupVars.conf index 643f0705..16be85b3 100644 --- a/pihole/setupVars.conf +++ b/pihole/setupVars.conf @@ -1,17 +1,17 @@ BLOCKING_ENABLED=true -PIHOLE_INTERFACE=eth0 -IPV4_ADDRESS=10.3.14.92/10 -IPV6_ADDRESS= -QUERY_LOGGING=true -INSTALL_WEB_SERVER=false -INSTALL_WEB_INTERFACE=true -LIGHTTPD_ENABLED=false WEBPASSWORD=db7ee491a7432b842ef6fb2d7dd2cad174b223b9496da3552873dfb5cffc60fa DNSMASQ_LISTENING=single -PIHOLE_DNS_1=127.0.0.1#53 -PIHOLE_DNS_2=127.0.0.1#53 DNS_FQDN_REQUIRED=true DNS_BOGUS_PRIV=false DNSSEC=false CONDITIONAL_FORWARDING=false TEMPERATUREUNIT=F +PIHOLE_INTERFACE=eth0 +IPV4_ADDRESS=10.3.14.92/10 +IPV6_ADDRESS= +PIHOLE_DNS_1=127.0.0.1#53 +PIHOLE_DNS_2=127.0.0.1#53 +QUERY_LOGGING=true +INSTALL_WEB_SERVER=false +INSTALL_WEB_INTERFACE=true +LIGHTTPD_ENABLED=false diff --git a/pihole/setupVars.conf.update.bak b/pihole/setupVars.conf.update.bak index 51ed46b0..643f0705 100644 --- a/pihole/setupVars.conf.update.bak +++ b/pihole/setupVars.conf.update.bak @@ -1,11 +1,17 @@ +BLOCKING_ENABLED=true PIHOLE_INTERFACE=eth0 IPV4_ADDRESS=10.3.14.92/10 IPV6_ADDRESS= -PIHOLE_DNS_1=127.0.0.1 -PIHOLE_DNS_2=127.0.0.1 QUERY_LOGGING=true INSTALL_WEB_SERVER=false INSTALL_WEB_INTERFACE=true LIGHTTPD_ENABLED=false -WEBPASSWORD=4755d509df266ebbb1fe61d5363a2e71aea6a48f96907020e0e9464d1328a005 -BLOCKING_ENABLED=true +WEBPASSWORD=db7ee491a7432b842ef6fb2d7dd2cad174b223b9496da3552873dfb5cffc60fa +DNSMASQ_LISTENING=single +PIHOLE_DNS_1=127.0.0.1#53 +PIHOLE_DNS_2=127.0.0.1#53 +DNS_FQDN_REQUIRED=true +DNS_BOGUS_PRIV=false +DNSSEC=false +CONDITIONAL_FORWARDING=false +TEMPERATUREUNIT=F