Commit graph

136 commits

Author SHA1 Message Date
Adam Warner
fdc2c624bd
Create mock_command_passthrough that allows intercepting of specific arguments - everything else is passed through to the proper command. Use this new command instead of making changes in basic-install.sh to make the tests pass.
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-11-11 16:28:16 +00:00
Adam Warner
66d1aa5243
Merge branch 'development' into pr/pvogt09/3191 2021-10-05 02:39:09 +01:00
Adam Warner
5b03160295
Install script comment tweaks (#4361) 2021-10-04 11:40:53 +01:00
Christian König
466520366d Fogot to save...
Signed-off-by: Christian König <ckoenig@posteo.de>
2021-10-02 23:47:13 +02:00
Christian König
9dbcbdbe66 Adjust tests
Signed-off-by: Christian König <ckoenig@posteo.de>
2021-10-02 23:43:08 +02:00
yubiuser
1c286c7bc4
Select proper PHP version on RPM based OS after INSTALLER_DEPS have been installed (#4325)
* Select proper PHP version on RPM based OS after INSTALLER_DEPS have been installed

* Remove check for unsupported RPM distros as it is checked in os_check already

* Add select_rpm_php function to tox tests

Signed-off-by: Christian König <ckoenig@posteo.de>
2021-09-12 13:40:37 -07:00
Adam Warner
d68a2ffaf3
Install only minimal requiered package before performing os_check
Co-authored-by: Christian König <ckoenig@posteo.de>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-08-05 19:02:36 +01:00
Adam Warner
1358209a9a
rename distro_check to package_manager_detect, as it is more in keeping with what the function actually does
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-08-05 19:02:36 +01:00
pvogt09
1526f2b6db domain name resolution does not work reliably in docker container
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2021-07-19 18:48:57 +02:00
pvogt09
023f243a2a use only first result from dig
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2021-07-19 18:48:56 +02:00
pvogt09
2c0a08a261 adds trailing slash to domain
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2021-07-19 18:48:56 +02:00
pvogt09
28ffa7522b removes TODOs and stickler warnings
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2021-07-19 18:48:55 +02:00
Adam Warner
4ac4bc5c18
Merge branch 'development' into fix/gravity_no_locallist 2021-07-04 00:48:09 +01:00
Adam Warner
87f2ae82cd
Stickler gonna stickle...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-07-03 00:07:37 +01:00
Adam Warner
469b715442
Add three new tests (one for each dependecy array) to check packages are available in supported OS package repos
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-07-03 00:00:54 +01:00
DL6ER
aa88be335e
Acknowledge that IPV{4,6}_ADDRESS may not exist
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-04-16 11:44:54 +02:00
DL6ER
74948ae5c1
The correct port separator is '#' not ':' in dnsmasq style. This should not have been changed in #4083 in the first place.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-04-14 22:53:12 +02:00
jbzdarkid
8090071eff Update regex to disallow leading zeros
Also updated a comment to point to a non-experimental RFC.

Signed-off-by: jbzdarkid <jbzdarkid@gmail.com>
2021-03-21 16:27:08 -07:00
Joseph Blackman
89c80947df Improve regexes for ipv4 matching
Signed-off-by: jbzdarkid <jbzdarkid@gmail.com>
2021-03-21 16:24:35 -07:00
pvogt09
68a6ff9bf4 remove debug code
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2020-12-27 21:36:21 +01:00
pvogt09
af9f550e50 fix stickler errors
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2020-12-27 21:35:23 +01:00
Adam Warner
fb454ebe14
fix stickler complaints
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-10-23 23:09:07 +01:00
Adam Warner
ee556088b5
Fake OS details in /etc/os-release and confirm install fails
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-10-23 23:05:41 +01:00
bcambl
a7c58e7112
E302 expected 2 blank lines, found 1
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2020-10-23 22:20:36 +01:00
Adam Warner
5aab68ab41
Update test/test_automated_install.py
Co-authored-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2020-10-23 22:20:36 +01:00
Adam Warner
c9edcfa335
add test to check "os_check" works
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-10-23 22:18:42 +01:00
DL6ER
01c9bbd3ca
Improve processor detection to use the new dedicated ARMv4T, ARMv5TE and ARMv8-A binaries we provide for FTL.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-10-14 20:31:22 +02:00
pvogt09
41a78b95b3 fix stickler errors
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2020-05-27 12:26:55 +02:00
pvogt09
81275623c9 resolve domain with dig and remove debug output
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2020-05-27 11:58:13 +02:00
pvogt09
9ebfba7820 set IP to 127.0.0.1 in setupVars.conf for blockpage tests
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2020-05-27 11:58:13 +02:00
pvogt09
47658cec51 resolve with dig instead of relying on /etc/resolv.conf
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2020-05-27 11:58:12 +02:00
pvogt09
8ad746c1d4 reorder code and change nameserver in /etc/resolv.conf
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2020-05-27 11:58:12 +02:00
pvogt09
4f28be3416 check files created by FTL
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2020-05-27 11:58:11 +02:00
pvogt09
e3a5744a0b specify DNS server for cURL
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2020-05-27 11:58:11 +02:00
pvogt09
e665998160 add --add-cap=NET_ADMIN to enable FTL start
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2020-05-27 11:58:10 +02:00
pvogt09
e82b136b8a revert "set permission for /var/cache if it did not exist before" and make lighttpd start work
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2020-05-27 11:58:09 +02:00
pvogt09
45fe918516 fix stickler errors
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2020-05-27 11:57:47 +02:00
pvogt09
0dad970904 add test case for pihole files
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2020-05-27 11:57:35 +02:00
pvogt09
eef312d9cb set permission for /var/cache if it did not exist before
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2020-05-27 11:57:34 +02:00
pvogt09
f7e80e9ce7 fix stickler and codefactor warnings
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2020-05-27 11:57:10 +02:00
pvogt09
dc9f139c92 test all files and directories in $webroot
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2020-05-27 11:57:09 +02:00
pvogt09
7555a6814a start lighttpd and make webpage test optional
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2020-05-27 11:57:09 +02:00
pvogt09
bf68eeaf35 removes stickler errors
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2020-05-27 11:57:08 +02:00
pvogt09
e35d49c950 mock systemctl
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2020-05-27 11:57:08 +02:00
pvogt09
ff77aa8da3 try installation process with main
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2020-05-27 11:57:07 +02:00
pvogt09
e7f7780ddd use installPihole instead of installPiholeWeb in test
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2020-05-27 11:57:07 +02:00
pvogt09
002d4ed774 changes stdout to rc
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2020-05-27 11:57:06 +02:00
pvogt09
81e717256e installs PIHOLE_WEB_DEPS to create LIGHTTPD_USER
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2020-05-27 11:57:06 +02:00
pvogt09
8e8e1a4e0a changes sudo to su for running command as user www-data
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2020-05-27 11:57:05 +02:00
pvogt09
3bbba82280 add test for file permissions of $webroot
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2020-05-27 11:57:05 +02:00