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
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
DL6ER
|
9181a4a1d8
|
Apply dhcp lease time also for IPv6
|
2016-12-29 14:26:23 +00:00 |
|
DL6ER
|
3268e1611a
|
Backend accept and apply dhcp lease time
|
2016-12-29 14:19:44 +00: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
|
cf724176dc
|
Do stateful DHCPv6 and SLAAC
|
2016-12-28 20:02:48 +00: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
|
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 |
|
DL6ER
|
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 |
|
DL6ER
|
1e627c7e8f
|
Make webpage.sh fully library style
|
2016-12-28 16:25:14 +00: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 |
|
DL6ER
|
9af26cbaac
|
Major simplification of webpage.sh
|
2016-12-28 02:14:47 +00:00 |
|