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 10:43:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
1855 commits 8 branches 109 tags 27 MiB
Commit graph

1855 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Schaper
8ee2bdec4d
Plain grep, escape the special characters. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-01-01 14:38:10 -08:00
Dan Schaper
de6ce276d0
Merge branch 'development' of github.com:pi-hole/pi-hole into fix/firewall_redux 2017-01-01 14:13:32 -08:00
Dan Schaper
fbea81dcd7 Merge pull request #1068 from pi-hole/fix/anti_glob 
Misc tweaks to the installer script. Defensive git cloning, and ability to source the installer script.
 2017-01-01 14:10:55 -08:00
Dan Schaper
502c349b8b
Merge branches 'development' and 'fix/firewall_redux' of github.com:pi-hole/pi-hole into fix/firewall_redux 2017-01-01 13:47:56 -08:00
Adam Warner
5fb0aa70de Merge pull request #1008 from pi-hole/feature/track_pre-installed_packages 
Feature/track pre installed packages
 2017-01-01 20:29:02 +00:00
Dan Schaper
7750e1344c
DRY displayFinalMessage 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-01-01 07:10:14 -08:00
Dan Schaper
8be37130e9
Move first check to main(), basic-install.sh can now be sourced. 
Set `PH_TEST=true` then `source basic-install.sh`. Careful for `set -e`.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-01-01 06:45:03 -08:00
Dan Schaper
fa055481a7
Shellcheck screen size 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-01-01 06:32:49 -08:00
Dan Schaper
d080e5d7a8
Merge branch 'fix/anti_glob' of github.com:pi-hole/pi-hole into fix/anti_glob 2017-01-01 00:18:37 -08:00
Dan Schaper
ad07655630
Defensive git cloning 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-01-01 00:14:12 -08:00
Dan Schaper
7cceb8615a
make_repo more defensive. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-01-01 00:13:51 -08:00
Dan Schaper
ab9c8f4859
make_repo more defensive. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-01-01 00:00:48 -08:00
Dan Schaper
ffb8a74111
Defensive is_repo 
`is_repo` defended

Document return codes for `is_repo()`

`is_repo` tested for 128,1,0 return values.
 2017-01-01 00:00:20 -08:00
Dan Schaper
45587194e5
Regex fun 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-31 21:33:05 -08:00
Dan Schaper
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
Mcat12
7765efa6c4 Merge pull request #1063 from pi-hole/fix/chmod_scripts 
All scripts set executable
 2016-12-31 12:01:10 -05:00
DL6ER
02d4b6794c Merge pull request #1066 from dgnthr/patch-1 
Fixed a typo in the installation script
 2016-12-31 17:30:56 +01:00
Dominik G
836b717346 Fixed a typo in the installation script 2016-12-31 17:25:48 +01:00
Dan Schaper
fc596e41d4
All scripts set executable 2016-12-30 18:35:16 -08:00
Mcat12
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
Mcat12
7bcc15e416 Adjust blocking page paths from admin restructure 2016-12-30 15:36:53 -05:00
DL6ER
1a3bdbaabf Merge pull request #1057 from pi-hole/new/whitelistonblockingpage 
Allow whitelisting from blocking page
 2016-12-30 21:07:34 +01:00
Mcat12
5e35fdbc52 Save blocking page CSS to pihole directory instead of admin 2016-12-30 14:42:15 -05:00
Mcat12
ab2c486f25 Fix password Enter handling 
Also remove extranious form information, since JS handles that
 2016-12-30 14:13:15 -05:00
Mcat12
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
Mcat12
089b98430f Fix formatting 2016-12-30 12:59:05 -05:00
Mcat12
ced0d3c2c0 Merge pull request #1055 from pi-hole/fix/firewall_check 
Restructure firewall detection and application.
 2016-12-30 11:23:30 -05:00
Mcat12
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
DL6ER
09bbc81470 Add notice that the user might have to flush his DNS cache 2016-12-30 12:27:33 +00:00
Dan Schaper
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
DL6ER
09bfa2ef77 Add whitelisting on blocking page feature 2016-12-30 12:03:45 +00:00
Dan Schaper
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
Dan Schaper
a4a9879643
Restructure firewall detection and application. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-29 15:57:29 -08:00
Dan Schaper
d1ccd7a460 Merge pull request #1052 from pi-hole/fix/missing_modules 
Detect missing kernel modules
 2016-12-29 14:51:35 -08:00
Dan Schaper
ea9ec384c6
Disambiguate nested ifs. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-29 01:35:52 -08:00
Dan Schaper
bbb958b7ed
Detect RPF breaking kernel updates. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-29 01:34:49 -08:00
DL6ER
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
DL6ER
d0cd39a25f Added space behind :53 to only match port 53 2016-12-28 20:32:56 +01:00
DL6ER
9170488b0a Test if DNS service is listening on local port 53 2016-12-28 15:58:48 +00:00
Dan Schaper
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
Dan Schaper
73741f1518 Merge pull request #1046 from pi-hole/tweak/subshells 
Tweak/subshells
 2016-12-27 16:00:07 -08:00
Dan Schaper
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
Dan Schaper
6abd6d8879 Merge pull request #991 from pi-hole/webUIprivacymode 
Backend for privacyMode on webUI
 2016-12-27 12:46:54 -08:00
Dan Schaper
c3b51b4ceb Merge branch 'development' into feature/track_pre-installed_packages 2016-12-27 12:37:19 -08:00
DL6ER
321ea8a3a9 Merge branch 'development' into webUIprivacymode 2016-12-27 21:27:11 +01:00
Dan Schaper
4d6263872d
Merge branch 'development' of github.com:pi-hole/pi-hole into tweak/subshells 2016-12-27 12:25:49 -08:00
Dan Schaper
fcdd58ac94 Merge pull request #1033 from pi-hole/updater_rewrite 
update.sh code refactoring
 2016-12-27 12:22:17 -08:00
Dan Schaper
ef8292d371 Merge branch 'development' into updater_rewrite 2016-12-27 11:59:52 -08:00
Dan Schaper
bc6a985f7c
Merge branch 'development' of github.com:pi-hole/pi-hole into tweak/subshells 2016-12-27 11:53:46 -08:00
Dan Schaper
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