mirror of
https://github.com/pi-hole/pi-hole
synced 2024-12-22 23:08:07 +00:00
Make full path to directory for pihole web page.
This commit is contained in:
parent
5b43f13935
commit
91bcc18e6a
@ -815,7 +815,7 @@ installPiholeWeb() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
else
|
else
|
||||||
mkdir /var/www/html/pihole
|
mkdir -p /var/www/html/pihole
|
||||||
if [ -f /var/www/html/index.lighttpd.html ]; then
|
if [ -f /var/www/html/index.lighttpd.html ]; then
|
||||||
mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.orig
|
mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.orig
|
||||||
else
|
else
|
||||||
|
@ -180,6 +180,41 @@ def test_installPiholeWeb_fresh_install_no_errors(Pihole):
|
|||||||
assert 'index.js' in web_directory
|
assert 'index.js' in web_directory
|
||||||
assert 'blockingpage.css' 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 'Installing pihole custom index page...' in installWeb.stdout
|
||||||
|
assert 'No default index.lighttpd.html file found... not backing up' not in installWeb.stdout
|
||||||
|
assert 'index.php missing, replacing...' in installWeb.stdout
|
||||||
|
assert 'index.js missing, replacing...' in installWeb.stdout
|
||||||
|
assert 'blockingpage.css missing, replacing...' 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 in an emtpy directory '''
|
||||||
|
installWeb = Pihole.run('''
|
||||||
|
source /opt/pihole/basic-install.sh
|
||||||
|
mkdir -p /var/www/html/pihole
|
||||||
|
touch /var/www/html/index.php
|
||||||
|
installPiholeWeb
|
||||||
|
''')
|
||||||
|
assert 'Installing pihole custom index page...' in installWeb.stdout
|
||||||
|
assert 'No default index.lighttpd.html file found... not backing up' not in installWeb.stdout
|
||||||
|
assert 'Existing index.php detected, not overwriting' in installWeb.stdout
|
||||||
|
assert 'index.js missing, replacing...' in installWeb.stdout
|
||||||
|
assert 'blockingpage.css missing, replacing...' 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
|
||||||
|
|
||||||
|
|
||||||
# Helper functions
|
# Helper functions
|
||||||
def mock_command(script, args, container):
|
def mock_command(script, args, container):
|
||||||
|
Loading…
Reference in New Issue
Block a user