Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 18:53:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
2342 commits 8 branches 109 tags 27 MiB
Commit graph

2342 commits

This branch
This branch
All branches
Author SHA1 Message Date
DL6ER
4301b9a12a
Add static DHCP leases to new file 2017-01-25 10:33:25 +01:00
Dan Schaper
0bbe0aed83
Last of the IPTables tests, new test rig is operating. 2017-01-24 20:09:10 -08:00
Dan Schaper
b16f797317
firewall-cmd --state returns 0 on 'running' non 0 on 'not running', 
so check retval and not text returned.

FirewallD conversion to multicall

IPTables test
 2017-01-24 19:57:31 -08:00
Dan Schaper
4bb71ae046
IPtables tests. 
mock commands for iptables check.

Test setting IPTables ruleset.

Test setting IPTables ruleset.

Test for already configured IPTables rules.

Test for addition of iptables rules.

Can only mock so deep in the commands.
 2017-01-24 13:42:51 -08:00
Dan Schaper
679b098aa7
No firewall enabled test. 2017-01-24 12:04:45 -08:00
Dan Schaper
e0e88fdb52
Start IPTables test, get baseline for commands in the container. See 
what we have to mock to start testing.
 2017-01-24 11:58:22 -08:00
Dan Schaper
8bba3a257c
Merge branch 'tweak/firewall_tests' into tweak/firewall_warning 2017-01-24 11:51:41 -08:00
Dan Schaper
8529c1287f
Full test suite for firewallD configuration. 2017-01-24 11:03:37 -08:00
Dan Schaper
9c7f7756b4
Revert second test. 2017-01-23 19:03:00 -08:00
Dan Schaper
f1cfb16bf9
Test firewallD enabled and disabled. 2017-01-23 18:59:48 -08:00
Dan Schaper
95796e1978
Only expect text output, not the leader ::: 2017-01-23 18:52:05 -08:00
Dan Schaper
968b981ecb
Try mocking whiptail 2017-01-23 18:47:52 -08:00
Dan Schaper
3aeb378b56
Fix moved incorrect blocks. 2017-01-23 18:21:50 -08:00
Dan Schaper
28bafe7427
Rename test for firewallD, running state. 2017-01-23 18:14:40 -08:00
Dan Schaper
1317b67657
Attempt at modifying firewall rules for testing. 2017-01-23 18:13:18 -08:00
Dan Schaper
3f462c771f Merge pull request #1166 from pi-hole/tweak/momentOfClarity 
Transparency in `sudo` refire.
 2017-01-23 16:41:21 -08:00
Dan Schaper
31aa42c35e
Transparency in sudo refire. 2017-01-23 14:28:56 -08:00
Dan Schaper
f7a17248b7
Warn with whiptail if firewall-cmd is running. 2017-01-23 14:19:51 -08:00
DL6ER
b60e6310bf Merge pull request #1164 from pi-hole/tweak/slience_rm 
Silence rm warning if no DHCP server is used
 2017-01-23 16:25:50 +01:00
DL6ER
6a89c6bf3b
Silence rm warning if no DHCP server is used 2017-01-23 15:06:36 +01:00
Dan Schaper
b3b7aae7d7 Merge pull request #1160 from pi-hole/logSizeToDebugLog 
Log size to debug log
 2017-01-22 13:13:33 -08:00
Promofaux
fe8c365d17 codacy never lies 2017-01-22 20:53:30 +00:00
Promofaux
9acc3aac01 pipe du -h output to awk to ensure we only get the file size, and not the filename too. Yeah that's right Dom, pipe. 2017-01-22 20:44:07 +00:00
Promofaux
1ad23a065e switch out wc -l with grep -c ^ 2017-01-22 20:38:46 +00:00
Promofaux
de102fde5c Add line count and size check for pihole.log 2017-01-22 20:38:09 +00:00
Adam Warner
77554fbd13 Merge pull request #1145 from pi-hole/cleanup/more_shellcheck 
Cleanup/more shellcheck
 2017-01-22 13:31:09 +00:00
Mcat12
6863bff7c5 Merge pull request #1156 from pi-hole/tweak/whiptail_dns 
DNS whiptail from radio to menu
 2017-01-21 19:54:16 -05:00
Dan Schaper
eaf6938c35
DNS whiptail from radio to menu 2017-01-21 16:14:05 -08:00
Mcat12
34ad2157dd Merge pull request #1155 from pi-hole/tweak/root_first 
Move distribution check to function.
 2017-01-21 17:59:30 -05:00
Dan Schaper
0635309f23
Move distribution check to function. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-01-21 12:34:47 -08:00
DL6ER
2661ef53a2 Merge pull request #1152 from jwiebalk/patch-2 
Correct path for automated installer
 2017-01-20 10:35:31 +01:00
John Wiebalk
eddca8f127 Correct path for automated installer 
basic-install.sh is in the `automated install` dir instead of `automated_installer`
 2017-01-19 21:40:52 -05:00
Dan Schaper
cef0211c00 Merge pull request #1151 from pi-hole/fix/CIDR 
Include CIDR notation for IPv4 non-natural blocks.
 2017-01-19 14:02:28 -08:00
Dan Schaper
86052540d9
Add back CIDR notation for non-natural blocks. Includes multi-address 
configs.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-01-19 13:50:42 -08:00
DL6ER
930cb15e2c Merge pull request #1150 from pi-hole/tweak/DHCPdomain 
Be able to disable the DHCP domain name
 2017-01-18 14:23:30 +01:00
DL6ER
8bb9dd460b
Be able to disable the DHCP domain name 2017-01-18 12:22:03 +01:00
Mcat12
8a3c78ca0a Merge pull request #1148 from pi-hole/fix/installer_array 
Fedora dependency installer fix
 2017-01-17 17:44:21 -05:00
Dan Schaper
62a5e36afd
Remove firewall configuration from update portion of script. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-01-17 14:40:30 -08:00
Dan Schaper
00b28f0aed
IPTables Whiptal option to install. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-01-17 14:19:19 -08:00
Dan Schaper
7c94aa9f07
Merge branches 'development' and 'fix/installer_array' of https://github.com/pi-hole/pi-hole into fix/installer_array 2017-01-17 13:05:51 -08:00
Dan Schaper
ec8c40b69b
Fix array declaration for Fedora package management. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-01-17 13:00:17 -08:00
Mcat12
2981f3cbd1 Merge pull request #1147 from pi-hole/uncommentLine391 
Uncomment gravity.sh line 391
 2017-01-17 15:26:43 -05:00
Promofaux
c2e1819098 This should not have been commented out. It's stopping any changes we make to the default lists getting out. 2017-01-17 19:48:20 +00:00
Mcat12
58f3ff69d8 Align comment with referenced line 2017-01-16 18:51:13 -05:00
DL6ER
72d8d10e64
Show most recently blocked domain in chronometer (using FTL). Fixes #717 2017-01-16 22:39:58 +01:00
Mcat12
63d02df0bc Merge pull request #1130 from pi-hole/new/logrotate 
Use logrotate for pihole.log
 2017-01-16 15:11:11 -05:00
Mcat12
f579fd3895 Merge pull request #1143 from pi-hole/fix/ignore_down 
Only ignore DOWN interfaces, `tun` interfaces are UNKNOWN.
 2017-01-15 19:19:07 -05:00
Dan Schaper
34df34ba27
Actually rm the Pi-hole scripts. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-01-14 20:16:27 -08:00
Dan Schaper
2689b37c35
Combine multiple calls to interface length code. 
&& ||

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-01-14 19:40:29 -08:00
Dan Schaper
9b6427144f
|| && conversion. 
Fedora deps array.

Use full name of `source`

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-01-14 19:39:37 -08:00