From 6c605f55f9295629ba13eaf1f2113d60c835298a Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Sat, 9 Sep 2017 19:07:48 +0100 Subject: [PATCH 1/3] always overwrite default blockpage, so that changes can be rolled out Signed-off-by: Adam Warner --- automated install/basic-install.sh | 77 +++++++----------------------- 1 file changed, 18 insertions(+), 59 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 7292fdcc..76463348 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -1293,68 +1293,27 @@ CreateLogFile() { installPiholeWeb() { echo "" echo " ${INFO} Installing blocking page..." - # If the pihole Web directory exists, - if [[ -d "/var/www/html/pihole" ]]; then - local str="Installing index.php" - echo -ne " ${INFO} ${str}..." - # and if the index file exists, - if [[ -f "/var/www/html/pihole/index.php" ]]; then - # do not overwrite it, - echo -e " ${COL_LIGHT_GREEN}detected index.php, not overwriting${COL_NC}" - # if it doesn't exist - else - # install it by copying it from the repo - cp ${PI_HOLE_LOCAL_REPO}/advanced/index.php /var/www/html/pihole/ - echo -e "${OVER} ${TICK} ${str}" - fi - local str="Installing index.js" - echo -ne " ${INFO} ${str}..." - # and if the index file exists, - if [[ -f "/var/www/html/pihole/index.js" ]]; then - # do not overwrite it, - echo -e " ${COL_LIGHT_GREEN}detected index.js, not overwriting${COL_NC}" - else - # install it by copying it from the repo - cp ${PI_HOLE_LOCAL_REPO}/advanced/index.js /var/www/html/pihole/ - echo -e "${OVER} ${TICK} ${str}" - fi + local str="Creating directory for blocking page, and copying files" + echo -ne " ${INFO} ${str}..." + # Install the directory + install -d /var/www/html/pihole + # and the blockpage + install -D ${PI_HOLE_LOCAL_REPO}/advanced/{index,blockingpage}.* /var/www/html/pihole/ + echo -e "${OVER} ${TICK} ${str}" - local str="Installing blockingpage.css" - echo -ne " ${INFO} ${str}..." - # and if the index file exists, - if [[ -f "/var/www/html/pihole/blockingpage.css" ]]; then - # do not overwrite it, - echo -e " ${COL_LIGHT_GREEN}detected blockingpage.css, not overwriting${COL_NC}" - else - # install it by copying it from the repo - cp ${PI_HOLE_LOCAL_REPO}/advanced/blockingpage.css /var/www/html/pihole - echo -e "${OVER} ${TICK} ${str}" - fi - # If the pihole Web directory does not exist, - else - local str="Creating directory for blocking page, and copying files" - echo -ne " ${INFO} ${str}..." - # Install the directory - install -d /var/www/html/pihole - # and the blockpage - install -D ${PI_HOLE_LOCAL_REPO}/advanced/{index,blockingpage}.* /var/www/html/pihole/ + local str="Backing up index.lighttpd.html" + echo -ne " ${INFO} ${str}..." + # If the default index file exists, + if [[ -f "/var/www/html/index.lighttpd.html" ]]; then + # back it up + mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.orig echo -e "${OVER} ${TICK} ${str}" - - local str="Backing up index.lighttpd.html" - echo -ne " ${INFO} ${str}..." - # If the default index file exists, - if [[ -f "/var/www/html/index.lighttpd.html" ]]; then - # back it up - mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.orig - echo -e "${OVER} ${TICK} ${str}" - # Othwerwise, - else - # don't do anything - echo -e "${OVER} ${CROSS} ${str} - No default index.lighttpd.html file found... not backing up" - fi - + # Othwerwise, + else + # don't do anything + echo -e "${OVER} ${CROSS} ${str} + No default index.lighttpd.html file found... not backing up" fi # Install Sudoers file From 5f4be0de35a348e0fd287502f4145c3402f384cd Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Sat, 9 Sep 2017 19:30:53 +0100 Subject: [PATCH 2/3] adjust lighttpd config depending on whether or not custom.php exists Signed-off-by: Adam Warner --- automated install/basic-install.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 76463348..1786813d 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -1082,6 +1082,10 @@ installConfigs() { fi # and copy in the config file Pi-hole needs cp ${PI_HOLE_LOCAL_REPO}/advanced/${LIGHTTPD_CFG} /etc/lighttpd/lighttpd.conf + # if there is a custom block page in the html/pihole directory, replace 404 handler in lighttpd config + if [[ -f "/var/www/html/pihole/custom.php" ]]; then + sed -i 's/^\(server\.error-handler-404\s*=\s*\).*$/\1"pihole\/custom\.php"/' /etc/lighttpd/lighttpd.conf + fi # Make the directories if they do not exist and set the owners mkdir -p /var/run/lighttpd chown ${LIGHTTPD_USER}:${LIGHTTPD_GROUP} /var/run/lighttpd From 42b5574f9bfa065a0e5907cc0f7c9691e0f95f75 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Sat, 9 Sep 2017 19:41:05 +0100 Subject: [PATCH 3/3] remove no longer needed tests Signed-off-by: Adam Warner --- test/test_automated_install.py | 101 --------------------------------- 1 file changed, 101 deletions(-) diff --git a/test/test_automated_install.py b/test/test_automated_install.py index 7f1a86a1..3f0bd969 100644 --- a/test/test_automated_install.py +++ b/test/test_automated_install.py @@ -189,107 +189,6 @@ def test_installPiholeWeb_fresh_install_no_errors(Pihole): assert 'index.js' in web_directory assert 'blockingpage.css' in web_directory -def test_installPiholeWeb_empty_directory_no_errors(Pihole): - ''' confirms all web page assets from Core repo are installed in an emtpy directory ''' - installWeb = Pihole.run(''' - source /opt/pihole/basic-install.sh - mkdir -p /var/www/html/pihole - installPiholeWeb - ''') - assert info_box + ' Installing blocking page...' in installWeb.stdout - assert info_box + ' Installing index.php' in installWeb.stdout - assert info_box + ' Installing index.js' in installWeb.stdout - assert info_box + ' Installing blockingpage.css' in installWeb.stdout - assert 'No default index.lighttpd.html file found... not backing up' not in installWeb.stdout - assert tick_box + ' Installing sudoer file' in installWeb.stdout - web_directory = Pihole.run('ls -r /var/www/html/pihole').stdout - assert 'index.php' in web_directory - assert 'index.js' in web_directory - assert 'blockingpage.css' in web_directory - -def test_installPiholeWeb_index_php_no_errors(Pihole): - ''' confirms all web page assets from Core repo are installed when necessary ''' - installWeb = Pihole.run(''' - source /opt/pihole/basic-install.sh - mkdir -p /var/www/html/pihole - touch /var/www/html/pihole/index.php - installPiholeWeb - ''') - assert info_box + ' Installing blocking page...' in installWeb.stdout - assert info_box + ' Installing index.php' in installWeb.stdout - assert 'detected index.php, not overwriting' in installWeb.stdout - assert info_box + ' Installing index.js' in installWeb.stdout - assert info_box + ' Installing blockingpage.css' in installWeb.stdout - assert 'No default index.lighttpd.html file found... not backing up' not in installWeb.stdout - assert tick_box + ' Installing sudoer file' in installWeb.stdout - web_directory = Pihole.run('ls -r /var/www/html/pihole').stdout - assert 'index.php' in web_directory - assert 'index.js' in web_directory - assert 'blockingpage.css' in web_directory - -def test_installPiholeWeb_index_js_no_errors(Pihole): - ''' confirms all web page assets from Core repo are installed when necessary ''' - installWeb = Pihole.run(''' - source /opt/pihole/basic-install.sh - mkdir -p /var/www/html/pihole - touch /var/www/html/pihole/index.js - installPiholeWeb - ''') - assert info_box + ' Installing blocking page...' in installWeb.stdout - assert info_box + ' Installing index.php' in installWeb.stdout - assert info_box + ' Installing index.js' in installWeb.stdout - assert 'detected index.js, not overwriting' in installWeb.stdout - assert info_box + ' Installing blockingpage.css' in installWeb.stdout - assert 'No default index.lighttpd.html file found... not backing up' not in installWeb.stdout - assert tick_box + ' Installing sudoer file' in installWeb.stdout - web_directory = Pihole.run('ls -r /var/www/html/pihole').stdout - assert 'index.php' in web_directory - assert 'index.js' in web_directory - assert 'blockingpage.css' in web_directory - -def test_installPiholeWeb_blockingpage_css_no_errors(Pihole): - ''' confirms all web page assets from Core repo are installed when necessary ''' - installWeb = Pihole.run(''' - source /opt/pihole/basic-install.sh - mkdir -p /var/www/html/pihole - touch /var/www/html/pihole/blockingpage.css - installPiholeWeb - ''') - assert info_box + ' Installing blocking page...' in installWeb.stdout - assert info_box + ' Installing index.php' in installWeb.stdout - assert info_box + ' Installing index.js' in installWeb.stdout - assert info_box + ' Installing blockingpage.css' in installWeb.stdout - assert 'detected blockingpage.css, not overwriting' in installWeb.stdout - assert 'No default index.lighttpd.html file found... not backing up' not in installWeb.stdout - assert tick_box + ' Installing sudoer file' in installWeb.stdout - web_directory = Pihole.run('ls -r /var/www/html/pihole').stdout - assert 'index.php' in web_directory - assert 'index.js' in web_directory - assert 'blockingpage.css' in web_directory - -def test_installPiholeWeb_already_populated_no_errors(Pihole): - ''' confirms all web page assets from Core repo are installed when necessary ''' - installWeb = Pihole.run(''' - source /opt/pihole/basic-install.sh - mkdir -p /var/www/html/pihole - touch /var/www/html/pihole/index.php - touch /var/www/html/pihole/index.js - touch /var/www/html/pihole/blockingpage.css - installPiholeWeb - ''') - assert info_box + ' Installing blocking page...' in installWeb.stdout - assert info_box + ' Installing index.php' in installWeb.stdout - assert 'detected index.php, not overwriting' in installWeb.stdout - assert info_box + ' Installing index.js' in installWeb.stdout - assert 'detected index.js, not overwriting' in installWeb.stdout - assert info_box + ' Installing blockingpage.css' in installWeb.stdout - assert 'detected blockingpage.css, not overwriting' in installWeb.stdout - assert tick_box + ' Installing sudoer file' in installWeb.stdout - web_directory = Pihole.run('ls -r /var/www/html/pihole').stdout - assert 'index.php' in web_directory - assert 'index.js' in web_directory - assert 'blockingpage.css' in web_directory - def test_update_package_cache_success_no_errors(Pihole): ''' confirms package cache was updated without any errors''' updateCache = Pihole.run('''