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-28 00:53:19 +00:00
Code Issues Projects Releases Packages Wiki Activity
6037 commits 8 branches 109 tags 27 MiB
Commit graph

6037 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Schaper
a2bc86fbcb Merge pull request #1085 from pi-hole/development 
[RELEASE] Pi-hole Core 2.11.1
 2017-01-04 12:30:29 -08:00
Dan Schaper
26c6446252
Merge branch 'master' into development 2017-01-04 12:29:42 -08:00
Dan Schaper
e5e44db5ac
Merge branches 'development' and 'master' of github.com:pi-hole/pi-hole into development 2017-01-04 12:26:34 -08:00
DL6ER
d4f833c739 Merge pull request #1090 from pi-hole/fix/dead-led-link 
replace dead link to another LED blink project page
 2017-01-04 16:19:32 +01:00
Jacob Salmela
806f44abe6
replace dead link to another LED blink project page 2017-01-04 09:01:03 -06:00
Mcat12
900bdc5ee2 Merge pull request #1083 from pi-hole/fix/DHCP 
Improvements to DHCP settings
 2017-01-03 17:06:17 -05:00
DL6ER
200995bf29
Make IPv6 features of Pi-hole DHCP server switchable 2017-01-03 14:24:33 +01:00
DL6ER
3a90c1c192
Source setupVars.conf before trying to access variables 2017-01-03 13:34:01 +01:00
Dan Schaper
cc68155dfa
Merge remote-tracking branch 'origin/master' 2017-01-02 14:12:30 -08:00
Mcat12
b8545eb1df Merge pull request #1074 from pi-hole/development 
[RELEASE] Pi-hole Core 2.11
 2017-01-02 16:36:55 -05:00
Mcat12
76531da340 Merge pull request #1067 from pi-hole/fix/firewall_redux 
Fix/firewall redux
 2017-01-02 11:36:38 -05:00
Adam Warner
12bec1df68 Merge pull request #1048 from pi-hole/tweak/simplify_webpage.sh 
Major simplification of webpage.sh + extend DHCP to IPv6
 2017-01-02 14:28:26 +00:00
DL6ER
2b778695b1
Implement querying ad lists support for wildcards (what hell of a bash experience) 2017-01-02 14:27:13 +01:00
DL6ER
ad61852804
Test against empty string 2017-01-02 11:10:38 +01:00
DL6ER
dbd8aee4ee
Add 'local' domain if not set in setupVers.conf 2017-01-02 11:08:54 +01:00
DL6ER
677694b01a
Set 24h lease time if settings was empty before 2017-01-02 11:05:40 +01:00
DL6ER
85f0241c0d
Reprocess DHCP settings after update 2017-01-02 10:50:59 +01:00
Dan Schaper
ade2185a9f Merge pull request #1073 from pi-hole/tweak/quidsup 
Comment out QuidsUp
 2017-01-01 15:35:55 -08:00
Dan Schaper
0d27005dda
Comment out QuidsUp 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-01-01 15:31:17 -08:00
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
DL6ER
ebf0db4bbf Typo fixed 2016-12-31 17:17:46 +00: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
DL6ER
9ac265980f Add .conf to filename 2016-12-31 13:41:19 +00:00
DL6ER
40798da6b1 Add blacklisting wildcard support 2016-12-31 12:49:04 +00: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
DL6ER
5c7fc05a32 Enable DHCP logging by default 2016-12-30 16:31:57 +00: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