36166c129a
Merge pull request #1253 from Skittels0/even_more_dns
...
Adds DNS.WATCH to default dns servers
2017-02-18 19:12:32 +00:00
4e7a485e23
Update basic-install.sh
2017-02-18 13:42:13 +01:00
9e5795bf55
Added DNS.WATCH to default dns servers
2017-02-18 13:03:40 +01:00
4035c933df
Moved echo to else block
2017-02-13 16:50:48 +01:00
abd44dd284
Add 32bit message
2017-02-13 16:33:22 +01:00
95d7fe76b5
Make comments more pretty
2017-02-13 14:50:25 +01:00
a052f397fe
Be more verbose during install
2017-02-13 14:47:06 +01:00
09d6e73b0a
Don't print error message on 32bit platforms
2017-02-13 14:42:11 +01:00
7fb6b71d52
Fix install path
2017-02-13 14:40:31 +01:00
07e37d7fc3
Proper error handling
2017-02-13 11:33:09 +01:00
fbe3dc0dcd
Have to get latest tag via GitHub API for downloading the binaries
2017-02-13 11:27:52 +01:00
6018c0c2fc
Add FTLinstall()
2017-02-13 11:07:29 +01:00
52a2f166fd
Add FTLdownload() subroutine
2017-02-13 10:29:27 +01:00
ba67144e34
Merge branch 'development' into adminPageAsOption
2017-02-09 16:27:07 -05:00
34f326c559
Update basic-install.sh
2017-02-08 14:13:49 -08:00
8fb6ba19a1
Remove double echos
2017-02-06 12:06:38 +01:00
314f7e7889
Merge pull request #1183 from pi-hole/tweak/update_cache_trap
...
Trap for package cache update failures.
2017-02-05 16:04:19 -08:00
4fcf8fd23f
Merge in `development` branch - resolve conflict in update.sh
2017-02-05 19:39:02 +00:00
1206dda347
testing putting `runGravity` at a different part of the script
2017-02-05 19:23:04 +00:00
e57425df5f
0.0.0.0 instead of pi-holes IP address for redirect purposes
2017-02-04 15:25:11 +00:00
b8d0e5e5a1
Merge pull request #1210 from pi-hole/fix/dhcpcd_int
...
Remove comment leaders from DHCPCD interface
2017-02-02 12:48:29 -08:00
26ad23f01e
Remove comment leaders from DHCPCD interface
...
We need to set the interface in DHCPCD, comments were inadvertently added a while ago.
2017-02-01 18:33:42 -08:00
18eb8a2159
Merge pull request #1185 from pi-hole/cleanup/git_functions
...
Move git functions to one script
2017-01-31 19:05:53 -05:00
8b22f435ad
Change how user and group are stored in the logrotate config file (necessary on Ubuntu 16.04.1)
2017-01-29 19:58:53 +01:00
3861b57dc6
Start moving reused utility functions to one script.
2017-01-28 17:32:42 -08:00
7291aa07ca
Silenc cache updater.
2017-01-28 16:46:37 -08:00
409f76aa34
Error check.
2017-01-28 16:37:31 -08:00
a281d87315
Eval variable. (Not a fan.)
2017-01-28 16:37:26 -08:00
2d18b2d784
Start test templates.
2017-01-28 16:37:04 -08:00
c31b4383e6
add back in code to stop `dnsmasq` and `lighttpd` during install.
2017-01-28 21:37:21 +00:00
35828f9cea
Source setupvars earlier in update/repair process
2017-01-28 19:05:55 +00:00
90af12fdb8
Remember the [@]
2017-01-28 18:41:37 +00:00
5fede23cf7
trying another tactic
2017-01-28 18:39:15 +00:00
bc4762f270
no need to stop dnsmasq/lighttpt if we're going to reload them at the end anyway.
2017-01-28 16:27:02 +00:00
01429d59bd
more web checks
2017-01-28 15:45:14 +00:00
731d15f9b5
don't display web admin info in final dialog if it's not selected
2017-01-28 15:43:33 +00:00
f0bd7fae5c
) not }
2017-01-28 15:32:07 +00:00
f8322cc2d4
use the web install flag. Could be optimised
2017-01-28 15:25:02 +00:00
dfdb9e393b
move repo clone to function
2017-01-28 15:15:42 +00:00
bd07d7f32e
Only install web dependenices if flag is true
2017-01-28 15:11:39 +00:00
f588c6f93c
introduce web toggle flag
2017-01-28 14:40:47 +00:00
d9ec3d2c22
spelling
2017-01-28 14:28:18 +00:00
e2b87759d8
split out web dependencies
2017-01-28 14:27:08 +00:00
52e0aa11af
Have install create directory
2017-01-27 22:06:48 -08:00
1421c31179
`install` index and blockingpage assets.
2017-01-27 21:41:17 -08:00
91bcc18e6a
Make full path to directory for pihole web page.
2017-01-27 21:40:52 -08:00
5b43f13935
Fresh install web page directory tests
2017-01-27 20:24:20 -08:00
2c16a75ef1
Use stat to get owner of /var/log
2017-01-27 14:28:59 +01:00
6fd7e0311c
Install customized version of logrotate script
2017-01-27 14:16:24 +01:00
cec214f900
User decline to install shouldn't be an error return.
2017-01-26 14:38:02 -08:00
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
8bba3a257c
Merge branch 'tweak/firewall_tests' into tweak/firewall_warning
2017-01-24 11:51:41 -08:00
31aa42c35e
Transparency in `sudo` refire.
2017-01-23 14:28:56 -08:00
f7a17248b7
Warn with whiptail if `firewall-cmd` is running.
2017-01-23 14:19:51 -08:00
77554fbd13
Merge pull request #1145 from pi-hole/cleanup/more_shellcheck
...
Cleanup/more shellcheck
2017-01-22 13:31:09 +00:00
eaf6938c35
DNS whiptail from radio to menu
2017-01-21 16:14:05 -08:00
0635309f23
Move distribution check to function.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-21 12:34:47 -08:00
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
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
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
00b28f0aed
IPTables Whiptal option to install.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-17 14:19:19 -08:00
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
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
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
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
9212eea8bd
Only ignore DOWN interfaces, `tun` interfaces are UNKNOWN.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-14 15:25:42 -08:00
0b72c639fb
Check for existance of iptables command. Fixes #1125
2017-01-13 18:13:10 +01:00
c58a95ca2e
`setDNS` whiptail direct, not in array.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-09 00:10:14 -08:00
80a3bce6d5
PI_HOLE_INSTALL_DIR global variable
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
`"${pw}"`
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Absolute path for pihole
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Debian PKG_INSTALL as array
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-09 00:10:06 -08:00
6f0289de49
Vestigial variable that was never populated.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-09 00:09:52 -08:00
0966d7660e
Take out some whiptail subshells that aren't needed.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Take out some whiptail subshells that aren't needed.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-09 00:09:45 -08:00
27e90cc4e6
Repetitive `ip route get` was resetting counts.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-09 00:09:39 -08:00
b785213c3a
Shellcheck for Test for $? -eq 0
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Shellcheck for Test for $? -eq 0
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-09 00:09:32 -08:00
0e4d5e9103
Bash splitting and globin
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-08 14:49:08 -08:00
76531da340
Merge pull request #1067 from pi-hole/fix/firewall_redux
...
Fix/firewall redux
2017-01-02 11:36:38 -05:00
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
85f0241c0d
Reprocess DHCP settings after update
2017-01-02 10:50:59 +01:00
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
de6ce276d0
Merge branch 'development' of github.com:pi-hole/pi-hole into fix/firewall_redux
2017-01-01 14:13:32 -08:00
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
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
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
7750e1344c
DRY `displayFinalMessage`
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-01 07:10:14 -08:00
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
fa055481a7
Shellcheck screen size
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-01 06:32:49 -08:00
ad07655630
Defensive git cloning
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-01 00:14:12 -08:00
7cceb8615a
`make_repo` more defensive.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-01 00:13:51 -08:00
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
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
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
a4a9879643
Restructure firewall detection and application.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-29 15:57:29 -08: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
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
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
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
Adam Warner
Skittels
DL6ER
Mcat12
Dan Schaper
Promofaux
Dan Schaper
Dan Schaper
DL6ER
Dominik G