45587194e5
Regex fun
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2016-12-31 21:33:05 -08:00
ccbf391913
More intelligence in iptables rulesets. Account for Policy ACCEPT, with
...
default rule DROP or REJECT as last rule.
Regex the conditions to make sure we are getting the right conditions.
Reframe the logic to simplify the chains and rules
Reframe the logic to simplify the chains and rules
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2016-12-31 21:16:22 -08:00
ebf0db4bbf
Typo fixed
2016-12-31 17:17:46 +00:00
7765efa6c4
Merge pull request #1063 from pi-hole/fix/chmod_scripts
...
All scripts set executable
2016-12-31 12:01:10 -05:00
02d4b6794c
Merge pull request #1066 from dgnthr/patch-1
...
Fixed a typo in the installation script
2016-12-31 17:30:56 +01:00
836b717346
Fixed a typo in the installation script
2016-12-31 17:25:48 +01:00
9ac265980f
Add .conf to filename
2016-12-31 13:41:19 +00:00
40798da6b1
Add blacklisting wildcard support
2016-12-31 12:49:04 +00:00
fc596e41d4
All scripts set executable
2016-12-30 18:35:16 -08:00
1f9b0f7cef
Merge pull request #1061 from pi-hole/fix/blockpage-whitelist-path
...
Adjust blocking page paths from admin restructure
2016-12-30 15:43:39 -05:00
7bcc15e416
Adjust blocking page paths from admin restructure
2016-12-30 15:36:53 -05:00
1a3bdbaabf
Merge pull request #1057 from pi-hole/new/whitelistonblockingpage
...
Allow whitelisting from blocking page
2016-12-30 21:07:34 +01:00
5e35fdbc52
Save blocking page CSS to pihole directory instead of admin
2016-12-30 14:42:15 -05:00
ab2c486f25
Fix password Enter handling
...
Also remove extranious form information, since JS handles that
2016-12-30 14:13:15 -05:00
7fd7430d38
Use pi.hole when getting js and css
...
If a user is able to get to this page, they must be using Pi-hole
2016-12-30 13:43:29 -05:00
089b98430f
Fix formatting
2016-12-30 12:59:05 -05:00
5c7fc05a32
Enable DHCP logging by default
2016-12-30 16:31:57 +00:00
ced0d3c2c0
Merge pull request #1055 from pi-hole/fix/firewall_check
...
Restructure firewall detection and application.
2016-12-30 11:23:30 -05:00
1afc5d351d
Merge pull request #1058 from pi-hole/cleanup/remove_swap
...
Delete swapfile generator, haven't used this in a long time.
2016-12-30 11:12:28 -05:00
09bbc81470
Add notice that the user might have to flush his DNS cache
2016-12-30 12:27:33 +00:00
f7274addcd
Delete swapfile generator, haven't used this in a long time.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2016-12-30 04:08:32 -08:00
09bfa2ef77
Add whitelisting on blocking page feature
2016-12-30 12:03:45 +00:00
a48518d234
Update test rig for new firewalld
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2016-12-29 16:11:13 -08:00
a4a9879643
Restructure firewall detection and application.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2016-12-29 15:57:29 -08:00
d1ccd7a460
Merge pull request #1052 from pi-hole/fix/missing_modules
...
Detect missing kernel modules
2016-12-29 14:51:35 -08:00
9181a4a1d8
Apply dhcp lease time also for IPv6
2016-12-29 14:26:23 +00:00
3268e1611a
Backend accept and apply dhcp lease time
2016-12-29 14:19:44 +00:00
ea9ec384c6
Disambiguate nested ifs.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2016-12-29 01:35:52 -08:00
bbb958b7ed
Detect RPF breaking kernel updates.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2016-12-29 01:34:49 -08:00
cf724176dc
Do stateful DHCPv6 and SLAAC
2016-12-28 20:02:48 +00:00
18d1c98f08
Merge pull request #1051 from pi-hole/fix/status
...
Test if DNS service is listening on local port 53 when reporting status
2016-12-28 20:47:37 +01:00
d0cd39a25f
Added space behind :53 to only match port 53
2016-12-28 20:32:56 +01:00
03d4fcd17d
Don't actually have to reapply DHCP settings since we are going to save it in a different file we don't replace by a template
2016-12-28 16:32:24 +00:00
02d658be65
Look for DHCP / DNS server settings which would have to be reapplied after updating (since we overwrite 01-pihole.conf)
2016-12-28 16:31:55 +00:00
1e627c7e8f
Make webpage.sh fully library style
2016-12-28 16:25:14 +00:00
9170488b0a
Test if DNS service is listening on local port 53
2016-12-28 15:58:48 +00:00
b02730a5ad
Merge branches 'development' and 'feature/track_pre-installed_packages' of github.com:pi-hole/pi-hole into feature/track_pre-installed_packages
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
# Conflicts:
# automated install/basic-install.sh
2016-12-27 22:50:00 -08:00
9af26cbaac
Major simplification of webpage.sh
2016-12-28 02:14:47 +00:00
73741f1518
Merge pull request #1046 from pi-hole/tweak/subshells
...
Tweak/subshells
2016-12-27 16:00:07 -08:00
9a9cb61345
Shift epel-release to installer dependencies for CentOS
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2016-12-27 12:59:53 -08:00
6abd6d8879
Merge pull request #991 from pi-hole/webUIprivacymode
...
Backend for privacyMode on webUI
2016-12-27 12:46:54 -08:00
c3b51b4ceb
Merge branch 'development' into feature/track_pre-installed_packages
2016-12-27 12:37:19 -08:00
321ea8a3a9
Merge branch 'development' into webUIprivacymode
2016-12-27 21:27:11 +01:00
4d6263872d
Merge branch 'development' of github.com:pi-hole/pi-hole into tweak/subshells
2016-12-27 12:25:49 -08:00
fcdd58ac94
Merge pull request #1033 from pi-hole/updater_rewrite
...
update.sh code refactoring
2016-12-27 12:22:17 -08:00
ef8292d371
Merge branch 'development' into updater_rewrite
2016-12-27 11:59:52 -08:00
bc6a985f7c
Merge branch 'development' of github.com:pi-hole/pi-hole into tweak/subshells
2016-12-27 11:53:46 -08:00
7320fc11d2
Check command -v directly, instead of subshelling out.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2016-12-27 11:53:23 -08:00
51f6d75db4
Merge pull request #1045 from pi-hole/tweak/always_update
...
Always update package cache where we can.
2016-12-27 11:51:00 -08:00
a328326e39
Formatting
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2016-12-27 11:41:07 -08:00
