Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-04-04 06:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity
4392 commits 15 branches 116 tags 33 MiB
Commit graph

105 commits

Author SHA1 Message Date
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
Adam Warner
9e96ff37de
Fix merge conflicts 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-12 22:16:43 +01:00
Adam Warner
a37dba2c81
remove configureFirewall function, the call to it, and related tests 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-04-19 14:52:01 +01:00
pvogt09
25c5661c1b fix stickler errors 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2020-04-03 19:22:30 +02:00
pvogt09
a993b8b34d fixes #3217 by checking for existing pihole group 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2020-04-03 13:18:32 +02:00
XhmikosR
7b8611ced0
Assorted typo fixes. (#3126) 
* Assorted typo fixes.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>

Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
 2020-03-08 16:53:14 -07:00
jnozsc
4a711340ef
use py3 instead py2 (#3153) 
* use py3 instead py2

Signed-off-by: jnozsc <jnozsc@gmail.com>

* use python 3.6

Signed-off-by: jnozsc <jnozsc@gmail.com>
 2020-03-02 23:30:44 -08:00
Adam Warner
12817c09bb
(Squashed commits) 
Always ensure we have the correct machine arch by storing to/reading from a file rather than depending on global variable that for some reason is not always populated...

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

no need for global variable

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Use a file in the temporary FTL download directory

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

Local binary variable named to l_binary. Disambiguate from global binary.

Allow 'binary' to be shadowed for testing.

Use ./ftlbinary in all operations.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

Revert shadow ability on binary variable.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

Remove unused tests, binary variable can not be overridden.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

This should work here, too

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

binary name is passed through from pihole checkout

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Add comments

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

OK, let's try it this way again

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

we might be getting somewhere.. squash after this I think!

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

This is a test to see if it fixes the aarch64 test (we are definitely squashing these commits

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

fix the rest of the tests

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Remove trailing whitespace in the files we've touched here

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-11-15 19:49:09 +00:00
bcambl
cd9b1fcb8c update tests for SELinux changes 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2019-10-14 13:02:44 -06:00
Adam Warner
9a6deb5a1a
Fix tests 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-09-17 21:16:49 +01:00
Mcat12
1d5755a4c2
Add tests for valid_ip 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-07-10 21:18:58 -07:00
bcambl
218476fab0 ensure installation dependencies for FTL tests which rely on /etc/init.d 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2019-07-06 11:06:08 -06:00
pvogt09
efbd42f7b5 Moves creation of pihole user before FTL installation 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2019-05-12 11:27:25 +02:00
DL6ER
7479485d45
Add test for the case the binary variable is unset (defaults to "tbd" in this case) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-01-31 20:00:26 +01:00
DL6ER
d26f2dcb2c
Use global binary variable in tests for automated install 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-01-24 09:47:28 +01:00
Mcat12
c22e94c9c7
Update test to include empty FTL config 
The installer ensures that an FTL config will exist, and creates an
empty file if it doesn't.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-08-20 19:33:15 -04:00
DL6ER
f5c3dc5d9d
Improve download error message that is shown when downloading or verifying the binary failed 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-07 16:51:58 +02:00
Adam Hill
8ca4c66e3c
make smarter assertions rathe than largestring not in string 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-07-12 00:03:25 -05:00
bcambl
fff31558a0 assert REMI repository is not installed for Fedora 
- fix whiptail mock comments to clarify continue vs cancel

Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-07-08 14:02:31 -06:00
bcambl
09d40679c0 add test for unsupported distro checking 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-07-06 10:07:43 -06:00
bcambl
5ca2ad6148 move test globals & mock commands to conftest 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-07-05 18:10:43 -06:00
bcambl
40537e1522 python linting: missing whitespace after ',' (E231) 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-07-03 00:43:24 -06:00
bcambl
064a75b21b python linting: missing whitespace around operator (E225) 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-07-03 00:43:18 -06:00
bcambl
79232d02c9 python linting: 'pytest' imported but unused (F401) 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-07-03 00:30:00 -06:00
bcambl
9bd4986781 python linting: whitespace before ':' (E203) 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-07-03 00:21:57 -06:00
bcambl
c3d443aaff python linting: lines > 79 characters (E501) 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-07-03 00:09:56 -06:00
bcambl
da3dfd0998 python linting: missing whitespace after ':' (E231) 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-07-02 15:25:51 -06:00
bcambl
4468d81472 python linting: 2 lines prior to defs (E302) 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-07-02 14:54:19 -06:00
bcambl
9d3d33b6a2 add tests for selinux checking 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-06-26 00:09:30 -06:00
Adam Warner
8cf8da4c78
- Check file /etc/pihole/ftlbranch for current FTL branch, download from github if master, or pi-hole.net if other 
- Check if downloaded binary file can resolve queries, if so stop and disable dnsmasq
- Add service_disable function
- Add dependency libcap2-bin on debian to enable setcap. Need to check other distos
-Always download FTL binary if /etc/pihole/ftlbranch does not contain "master"
- Change some strings/variables that reference dnsmasq and change them to pihole/pihole-FTL

Signed-off-by: Adam Warner <adamw@rner.email>
 2018-03-06 18:44:57 +00:00
WaLLy3K
26afe04926 Remove index.js test 2017-09-19 01:04:04 +10:00
Adam Warner
42b5574f9b
remove no longer needed tests 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-09-09 19:41:05 +01:00