pi@raspberry:/var/log $ pihole checkout master
Please note that changing branches severely alters your Pi-hole subsystems
Features that work on the master branch, may not on a development branch
This feature is NOT supported unless a Pi-hole developer explicitly asks!
Have you read and understood this? [y/N] y
[i] Shortcut "master" detected - checking out master branches...
[i] Pi-hole core
fatal: ref HEAD is not a symbolic ref
[✓] Switching to branch: 'master' from ''
Updating 1e87850..ddbdb51
Fast-forward
.editorconfig | 2 +-
.github/dco.yml | 2 +
.gitignore | 5 +
.idea/codeStyles/Project.xml | 6 -
.pullapprove.yml | 38 -
.stickler.yml | 3 +
.travis.yml | 4 +-
CONTRIBUTING.md | 2 -
README.md | 71 +-
adlists.default | 23 -
advanced/Scripts/chronometer.sh | 950 ++++---
advanced/Scripts/list.sh | 365 +--
advanced/Scripts/piholeCheckout.sh | 470 +---
advanced/Scripts/piholeDebug.sh | 1821 ++++++------
advanced/Scripts/piholeLogFlush.sh | 70 +-
advanced/Scripts/query.sh | 239 ++
advanced/Scripts/setupLCD.sh | 34 +-
advanced/Scripts/update.sh | 303 +-
advanced/Scripts/updatecheck.sh | 64 +-
advanced/Scripts/version.sh | 224 +-
advanced/Scripts/webpage.sh | 662 ++---
advanced/Scripts/wildcard_regex_converter.sh | 28 +
advanced/{ => Templates}/logrotate | 0
advanced/Templates/pihole-FTL.conf | 84 +
advanced/{ => Templates}/pihole-FTL.service | 23 +-
advanced/{ => Templates}/pihole.cron | 0
advanced/{ => Templates}/pihole.sudo | 0
advanced/bash-completion/pihole | 74 +-
advanced/index.php | 31 +-
automated install/basic-install.sh | 3833 ++++++++++++++------------
automated install/uninstall.sh | 328 ++-
gravity.sh | 159 +-
manpages/pihole-FTL.8 | 112 +
manpages/pihole-FTL.conf.5 | 102 +
manpages/pihole.8 | 361 +++
pihole | 286 +-
requirements.txt | 1 +
setup.py | 6 +
test/README.md | 25 +
test/conftest.py | 113 +-
test/fedora.Dockerfile | 16 +
test/test_000_build_containers.py | 9 +-
test/test_automated_install.py | 497 +++-
test/test_centos_fedora_support.py | 209 ++
test/test_shellcheck.py | 11 +-
tox.ini | 10 +
46 files changed, 6641 insertions(+), 5035 deletions(-)
create mode 100644 .github/dco.yml
delete mode 100644 .pullapprove.yml
delete mode 100644 adlists.default
create mode 100644 advanced/Scripts/query.sh
create mode 100644 advanced/Scripts/wildcard_regex_converter.sh
rename advanced/{ => Templates}/logrotate (100%)
create mode 100644 advanced/Templates/pihole-FTL.conf
rename advanced/{ => Templates}/pihole-FTL.service (75%)
rename advanced/{ => Templates}/pihole.cron (100%)
rename advanced/{ => Templates}/pihole.sudo (100%)
create mode 100644 manpages/pihole-FTL.8
create mode 100644 manpages/pihole-FTL.conf.5
create mode 100644 manpages/pihole.8
create mode 100644 setup.py
create mode 100644 test/README.md
create mode 100644 test/fedora.Dockerfile
create mode 100644 test/test_centos_fedora_support.py
create mode 100644 tox.ini
[i] Web interface
fatal: ref HEAD is not a symbolic ref
[✓] Switching to branch: 'master' from ''
Updating e48aa295..af8c926c
Fast-forward
README.md | 194 ++++++++-
api.php | 40 +-
api_FTL.php | 528 +++++++++++-----------
api_PHP.php | 93 ----
api_db.php | 95 +++-
gravity.php | 4 +-
help.php | 42 +-
index.php | 80 ++--
list.php | 12 +-
queries.php | 30 +-
queryads.php | 2 +-
scripts/pi-hole/js/db_queries.js | 8 +-
scripts/pi-hole/js/index.js | 219 +++++++++-
scripts/pi-hole/js/list.js | 77 ++--
scripts/pi-hole/js/queries.js | 128 ++++--
scripts/pi-hole/js/settings.js | 13 +-
scripts/pi-hole/js/taillog-FTL.js | 11 +-
scripts/pi-hole/js/taillog.js | 11 +-
scripts/pi-hole/php/FTL.php | 104 +----
scripts/pi-hole/php/add.php | 15 +-
scripts/pi-hole/php/api_token.php | 3 +
scripts/pi-hole/php/auth.php | 11 +-
scripts/pi-hole/php/data.php | 822 -----------------------------------
scripts/pi-hole/php/func.php | 17 +
scripts/pi-hole/php/get.php | 55 +--
scripts/pi-hole/php/gravity.php | 51 +++
scripts/pi-hole/php/header.php | 17 +-
scripts/pi-hole/php/loginpage.php | 3 +
scripts/pi-hole/php/password.php | 27 +-
scripts/pi-hole/php/queryads.php | 2 +-
scripts/pi-hole/php/savesettings.php | 76 +++-
scripts/pi-hole/php/sub.php | 26 +-
scripts/pi-hole/php/teleporter.php | 68 ++-
settings.php | 217 ++++++---
style/pi-hole.css | 62 ++-
taillog-FTL.php | 2 +-
taillog.php | 2 +-
37 files changed, 1492 insertions(+), 1675 deletions(-)
delete mode 100644 api_PHP.php
delete mode 100644 scripts/pi-hole/php/data.php
create mode 100644 scripts/pi-hole/php/gravity.php
[✓] Detected 32bit (i686) architecture
[i] Running installer to upgrade your installation
[✓] Root user check
.;;,.
.ccccc:,.
:cccclll:. ..,,
:ccccclll. ;ooodc
'ccll:;ll .oooodc
.;cll.;;looo:.
.. ','.
.',,,,,,'.
.',,,,,,,,,,.
.',,,,,,,,,,,,....
....''',,,,,,,'.......
......... .... .........
.......... ..........
.......... ..........
......... .... .........
........,,,,,,,'......
....',,,,,,,,,,,,.
.',,,,,,,,,'.
.',,,,,,'.
..'''.
[i] Existing PHP installation detected : PHP version 7.0.30-0+deb9u1
[i] Performing unattended setup, no whiptail dialogs will be displayed
[✓] Disk space check
[✓] Update local cache of available packages
[✓] Checking apt-get for upgraded packages... 40 updates available
[i] It is recommended to update your OS after installing the Pi-hole!
[i] Installer Dependency checks...
[✓] Checking for apt-utils
[✓] Checking for dialog
[✓] Checking for debconf
[✓] Checking for dhcpcd5
[✓] Checking for git
[✓] Checking for iproute2
[✓] Checking for whiptail
[✓] Check for existing repository in /etc/.pihole
[✓] Update repo in /etc/.pihole
[✓] Check for existing repository in /var/www/html/admin
[✓] Update repo in /var/www/html/admin
[i] Main Dependency checks...
[✓] Checking for bc
[✓] Checking for cron
[✓] Checking for curl
[✓] Checking for dnsutils
[✓] Checking for iputils-ping
[✓] Checking for lsof
[✓] Checking for netcat
[✓] Checking for psmisc
[✓] Checking for sudo
[✓] Checking for unzip
[✓] Checking for wget
[✓] Checking for idn2
[✓] Checking for sqlite3
[✓] Checking for libcap2-bin
[✓] Checking for dns-root-data
[✓] Checking for resolvconf
[✓] Checking for lighttpd
[✓] Checking for php7.0-common
[✓] Checking for php7.0-cgi
[✓] Checking for php7.0-sqlite3
[✓] Enabling lighttpd service to start on reboot
[✓] Installing scripts from /etc/.pihole
[i] Installing configs from /etc/.pihole...
[i] Existing dnsmasq.conf found... it is not a Pi-hole file, leaving alone!
[✓] Copying 01-pihole.conf to /etc/dnsmasq.d/01-pihole.conf
[i] Installing blocking page...
[✓] Creating directory for blocking page, and copying files
[✗] Backing up index.lighttpd.html
No default index.lighttpd.html file found... not backing up
[✓] Installing sudoer file
[✓] Installing latest Cron script
[✓] Installing latest logrotate script
[i] FTL Checks...
[✓] Detected 32bit (i686) architecture
[i] Checking for existing FTL binary...
[i] Latest FTL Binary already installed (v4.0). Confirming Checksum...
[i] Checksum correct. No need to download!
[✓] man pages installed and database updated
[i] Systemd-resolved is not enabled
[✓] Starting lighttpd service
[✓] Enabling lighttpd service to start on reboot
[i] Restarting services...
[✓] Starting pihole-FTL service
[✓] Enabling pihole-FTL service to start on reboot
[✓] Deleting existing list cache
[i] Neutrino emissions detected...
[✓] Pulling blocklist source list into range
[i] Target: raw.githubusercontent.com (hosts)
[✓] Status: Retrieval successful
[i] Target: mirror1.malwaredomains.com (justdomains)
[✓] Status: Retrieval successful
[i] Target: sysctl.org (hosts)
[✓] Status: Retrieval successful
[i] Target: zeustracker.abuse.ch (blocklist.php?download=domainblocklist)
[✓] Status: Retrieval successful
[i] Target: s3.amazonaws.com (simple_tracking.txt)
[✓] Status: Retrieval successful
[i] Target: s3.amazonaws.com (simple_ad.txt)
[✓] Status: Retrieval successful
[i] Target: hosts-file.net (ad_servers.txt)
[✓] Status: Retrieval successful
[✓] Consolidating blocklists
[✓] Extracting domains from blocklists
[i] Number of domains being pulled in by gravity: 161888
[✓] Removing duplicate domains
[i] Number of unique domains trapped in the Event Horizon: 138706
[i] Number of whitelisted domains: 6
[i] Number of regex filters: 0
[✓] Parsing domains into hosts format
[✓] Cleaning up stray matter
[✓] Force-reloading DNS service
[✓] DNS service is running
[✓] Pi-hole blocking is Enabled
[i] The install log is located at: /etc/pihole/install.log
Update Complete!
Current Pi-hole version is v4.0
Current AdminLTE version is v4.0
Current FTL version is v4.0