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
c3b51b4ceb
Merge branch 'development' into feature/track_pre-installed_packages
2016-12-27 12:37:19 -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
a328326e39
Formatting
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-27 11:41:07 -08:00
4eedf8a746
Always update package cache where we can.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-27 10:59:24 -08:00
c5f5252145
Merge pull request #961 from pi-hole/customblockpage
...
Custom Pi-Hole block page
2016-12-27 10:25:03 -08:00
7fadd469c9
Merge pull request #1038 from pi-hole/fix/IPV6_detection
...
Check IPv6 routing
2016-12-27 11:42:23 -05:00
7eb6124721
Don't call for package installs if there are no packages to install.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 16:57:07 -08:00
f458780ba7
Rebase onto development
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 16:56:31 -08:00
8ad52806de
Quiet DNF
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 16:54:23 -08:00
dc22a50dcc
Fedora dependency installer overhaul
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Modify Fedora dependency installer
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Fedora now installs and arrays only non-installed packages. Fedora also noops the cache update, since it updates at every dnf call anyays.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 16:54:20 -08:00
852341c601
Check for installation status within the parent function.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 16:54:16 -08:00
d5ed6c1901
Find which packages already exist and only install new packages. Set up for unintall to know what packages we installed for later removal.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 16:54:13 -08:00
da41383476
Check IPv6 to see if the route is reachable, if not, don't use.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 15:26:05 -08:00
6ff79835da
If only one interface available, don't show whiptail, just use that interface.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 15:08:39 -08:00
1d608b204a
Only allow UP interfaces to be selected. (DOWN interfaces would have not given IP addresses anyways.)
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 14:50:50 -08:00
c2b8bed3a8
Get the IP address that is the source for the default route out. Fixes interfaces with multiple IP's assigned getting the wrong IPv4 chosen.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 14:43:57 -08:00
d12efccd0b
Merge pull request #1028 from pi-hole/bcambl-selinux_notification
...
Bcambl selinux notification
2016-12-23 17:36:33 +00:00
54afffed19
Remove newline
...
Issue was already fixed
2016-12-23 12:30:33 -05:00
fc8fcdbece
Add newline
2016-12-23 12:28:18 -05:00
abd1fedc9d
.
2016-12-23 17:25:55 +00:00
9725985037
printf to echo. idgaf
2016-12-23 17:24:33 +00:00
754f3359ec
too many echos spoil the branch
2016-12-23 17:22:31 +00:00
4c131b8c28
newlines
2016-12-23 17:21:23 +00:00
15c674ba29
verbosity
2016-12-23 17:20:33 +00:00
00aff6a906
maybe
2016-12-23 17:16:03 +00:00
c45c3a72b5
words words words
2016-12-23 17:06:33 +00:00
662d450651
adjust size of whiptail dialog
2016-12-23 16:58:58 +00:00
a8897becd2
Make sure whiptail is installed...
2016-12-23 16:55:56 +00:00
fdb64a5702
untested convert user prompt to whiptail
2016-12-23 16:53:42 +00:00
73a80ff7dc
Align installer output for updating repo
2016-12-23 11:51:34 -05:00
a795fd698d
Merge branch 'selinux_notification' of https://github.com/bcambl/pi-hole into bcambl-selinux_notification
2016-12-23 16:48:16 +00:00
2fb0dc0a4a
add warning if SELinux is Enforcing
2016-12-23 10:27:52 -06:00
aa8e1497a3
Fixed error
2016-12-23 17:12:38 +01:00
afabf30ec6
Fix Fedora web UI support
2016-12-23 16:57:51 +01:00
420158494d
Merge pull request #1022 from pi-hole/fix/adlists.default
...
Internal (/etc/pihole/adlists.default)
2016-12-23 16:08:06 +01:00
6b7b0e0eb3
Test if /etc/pihole/adlists.default exists
2016-12-23 16:00:48 +01:00
ad70db7e0e
Merge pull request #1020 from bcambl/setDNS_before_ifcfg
...
Set dns before ifcfg (Fixes #1019 )
2016-12-23 12:12:05 +00:00
1e7e3259b5
choose dns servers prior to interface configuration
...
upstream DNS servers must be chosen prior interface configuration.
Fixes #1019
2016-12-22 22:42:32 -06:00
513bc32d87
is_repo: ensure directory exists
2016-12-22 20:00:45 -06:00
9355a8ad0e
Merge pull request #1011 from pi-hole/fix/sudoers
...
Fix: Dynamic instead of static sudoers file
2016-12-22 12:20:01 -08:00
ea5ee7b0f9
Execute gravity in same shell as installer, don't subshell it.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-22 11:30:36 -08:00
bc8cf1b2d8
Fixed wrong indentation
2016-12-22 19:23:06 +01:00
bb28d94884
Merge branch 'development' into customblockpage
...
Conflicts:
automated install/basic-install.sh
2016-12-22 19:22:09 +01:00
8f402f5c77
Merge pull request #1009 from bcambl/fix_1004
...
replace 'git -C' with long version
2016-12-22 11:44:08 -06:00
60054da582
Add lighttpd user (OS dependent) to sudoers file
2016-12-22 13:26:11 +01:00
cbf84c1840
replace subshell with command chain
2016-12-22 04:32:42 -06:00
c9c28cb59a
replace 'git -C' with long version
...
The -C argument was introduced in git 1.8.4. CentOS 7.3 at the time of this commit provides v1.8.3.1.
see: https://git.kaarsemaker.net/git/commit/44e1e4d67d5148c245db362cc48c3cc6c2ec82ca/
Fixes #1004
2016-12-22 03:37:34 -06:00
4244f716e0
Create /opt/pihole before trying to install into it.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-21 23:04:57 -08:00
c48e6c91f5
Merge pull request #999 from pi-hole/fix/install_deps_exit
...
Fix/install deps exit
2016-12-21 16:00:48 +01:00
8841bdd252
Reset the if's
2016-12-21 12:57:02 +01:00
58261098fb
We should not call a function that Dan deleted
2016-12-21 12:07:44 +01:00
9432d3035a
Merge branch 'development' into cleanup/remove_legacy_detect
...
Conflicts:
automated install/basic-install.sh
2016-12-21 12:01:58 +01:00
9907fc2770
Merge branch 'development' into fix/install_deps_exit
...
Conflicts:
automated install/basic-install.sh
2016-12-21 11:54:52 +01:00
8117ec8e20
Remove v1 legacy detection code.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-20 17:50:44 -08:00
ff2783f9fc
Tabs to spaces and formatting.
...
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
2016-12-20 17:22:57 -08:00
156a51c945
Remove extra display only variable.
...
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
2016-12-20 17:04:46 -08:00
c72ffae4a2
Don't install extra packages (openresolv was installed over resolvconf). No longer need --fix-missing.
...
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
2016-12-20 17:02:51 -08:00
7f3b0030ea
LF
...
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
2016-12-20 16:47:43 -08:00
9a626948f8
Use debconf for Deb/Ubu package installations.
...
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
Alphabetic sort of dependency names
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
2016-12-20 16:22:31 -08:00
5c43df66a8
Remove spinner function, masked return values.
...
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
2016-12-20 16:22:08 -08:00
d0e3c546f8
CRLF to CR (Win to Unix line endings)
...
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
2016-12-20 15:00:37 -08:00
8cb01cdd29
One step to rename variables.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-16 15:08:30 -08:00
10982a0f45
Merge pull request #990 from pi-hole/dontkillsetupVars.conf
...
Don't kill setupVars.conf on update/fresh install
2016-12-16 13:55:33 +00:00
d4c378ed5d
Remove PIHOLE_INTERFACE if already set (not PIHOLE_DOMAIN)
2016-12-16 13:20:25 +01:00
7872f68a45
Only try to remove parts inthe file if the file already exists
2016-12-16 13:13:35 +01:00
ec8c848106
Don't kill already existing setupVars.conf on update (and fresh install)
2016-12-16 12:53:00 +01:00
3b50ce8c54
Merge pull request #977 from pi-hole/activatewebUIpw
...
Add password to webUI after update if there is none
2016-12-15 14:05:11 -05:00
1eeaa01234
Always put the information that we added a password if we did (not only on update but also on fresh install)
2016-12-15 15:22:44 +01:00
e2898217d2
Made message shorter
2016-12-15 15:20:41 +01:00
f81dadc5d0
Fix final message
2016-12-15 14:10:55 +01:00
c10ec5548f
remove code that replaces tokens in 01-pihole.conf
2016-12-14 19:29:44 +00:00
92f4824884
Automatically enable IPv6
2016-12-14 13:52:14 -05:00
a00034a6a7
Add password to webUI after update if there is none
2016-12-12 17:03:53 +01:00
0a423ffd40
Fix check for lighttpd install before configuration directory removal
2016-12-07 20:31:34 -07:00
5374f652dd
No need to modify lighttpd config file, since we overwrite it anyways
2016-12-06 08:43:24 +01:00
a866c4e388
Place blockingpage.css (former index.css) unter admin/ so we can load it also from some blocked sub-directories
2016-12-05 10:50:19 +01:00
e7241a989c
Include CSS file
2016-12-04 22:20:51 +01:00
Dan Schaper
Promofaux
DL6ER
Adam Warner
Dan Schaper
Dan Schaper
Mcat12
DL6ER
Dominik G
bcambl
DL6ER
trinapicot