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
2097 commits 8 branches 109 tags 27 MiB
Commit graph

601 commits

Author SHA1 Message Date
Dan Schaper
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
Dan Schaper
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
Dan Schaper
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
DL6ER
0b72c639fb
Check for existance of iptables command. Fixes #1125 2017-01-13 18:13:10 +01:00
Dan Schaper
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
Dan Schaper
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
Dan Schaper
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
Dan Schaper
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
Dan Schaper
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
Dan Schaper
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
Dan Schaper
0e4d5e9103
Bash splitting and globin 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-01-08 14:49:08 -08: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
85f0241c0d
Reprocess DHCP settings after update 2017-01-02 10:50:59 +01: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
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
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
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
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
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
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
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
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
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
c3b51b4ceb Merge branch 'development' into feature/track_pre-installed_packages 2016-12-27 12:37:19 -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
Dan Schaper
a328326e39
Formatting 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-27 11:41:07 -08:00
Dan Schaper
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
Dan Schaper
c5f5252145 Merge pull request #961 from pi-hole/customblockpage 
Custom Pi-Hole block page
 2016-12-27 10:25:03 -08:00
Mcat12
7fadd469c9 Merge pull request #1038 from pi-hole/fix/IPV6_detection 
Check IPv6 routing
 2016-12-27 11:42:23 -05:00
Dan Schaper
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
Dan Schaper
f458780ba7
Rebase onto development 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-24 16:56:31 -08:00
Dan Schaper
8ad52806de
Quiet DNF 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-24 16:54:23 -08:00
Dan Schaper
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
Dan Schaper
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
Dan Schaper
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
Dan Schaper
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
Dan Schaper
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
Dan Schaper
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
Dan Schaper
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
Adam Warner
d12efccd0b Merge pull request #1028 from pi-hole/bcambl-selinux_notification 
Bcambl selinux notification
 2016-12-23 17:36:33 +00:00
Mcat12
54afffed19 Remove newline 
Issue was already fixed
 2016-12-23 12:30:33 -05:00
Mcat12
fc8fcdbece Add newline 2016-12-23 12:28:18 -05:00
Promofaux
abd1fedc9d . 2016-12-23 17:25:55 +00:00
Promofaux
9725985037 printf to echo. idgaf 2016-12-23 17:24:33 +00:00
Promofaux
754f3359ec too many echos spoil the branch 2016-12-23 17:22:31 +00:00
Promofaux
4c131b8c28 newlines 2016-12-23 17:21:23 +00:00
Promofaux
15c674ba29 verbosity 2016-12-23 17:20:33 +00:00
Promofaux
00aff6a906 maybe 2016-12-23 17:16:03 +00:00
Promofaux
c45c3a72b5 words words words 2016-12-23 17:06:33 +00:00
Promofaux
662d450651 adjust size of whiptail dialog 2016-12-23 16:58:58 +00:00
Promofaux
a8897becd2 Make sure whiptail is installed... 2016-12-23 16:55:56 +00:00
Promofaux
fdb64a5702 untested convert user prompt to whiptail 2016-12-23 16:53:42 +00:00
Mcat12
73a80ff7dc Align installer output for updating repo 2016-12-23 11:51:34 -05:00
Promofaux
a795fd698d Merge branch 'selinux_notification' of https://github.com/bcambl/pi-hole into bcambl-selinux_notification 2016-12-23 16:48:16 +00:00
bcambl
2fb0dc0a4a add warning if SELinux is Enforcing 2016-12-23 10:27:52 -06:00
DL6ER
aa8e1497a3
Fixed error 2016-12-23 17:12:38 +01:00
DL6ER
afabf30ec6
Fix Fedora web UI support 2016-12-23 16:57:51 +01:00
DL6ER
420158494d Merge pull request #1022 from pi-hole/fix/adlists.default 
Internal (/etc/pihole/adlists.default)
 2016-12-23 16:08:06 +01:00
DL6ER
6b7b0e0eb3
Test if /etc/pihole/adlists.default exists 2016-12-23 16:00:48 +01:00
Adam Warner
ad70db7e0e Merge pull request #1020 from bcambl/setDNS_before_ifcfg 
Set dns before ifcfg (Fixes #1019)
 2016-12-23 12:12:05 +00:00
bcambl
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
bcambl
513bc32d87 is_repo: ensure directory exists 2016-12-22 20:00:45 -06:00
Dan Schaper
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
Dan Schaper
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
DL6ER
bc8cf1b2d8
Fixed wrong indentation 2016-12-22 19:23:06 +01:00
DL6ER
bb28d94884
Merge branch 'development' into customblockpage 
Conflicts:
	automated install/basic-install.sh
 2016-12-22 19:22:09 +01:00
Blayne Campbell
8f402f5c77 Merge pull request #1009 from bcambl/fix_1004 
replace 'git -C' with long version
 2016-12-22 11:44:08 -06:00
DL6ER
60054da582
Add lighttpd user (OS dependent) to sudoers file 2016-12-22 13:26:11 +01:00
bcambl
cbf84c1840 replace subshell with command chain 2016-12-22 04:32:42 -06:00
bcambl
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
Dan Schaper
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
DL6ER
c48e6c91f5 Merge pull request #999 from pi-hole/fix/install_deps_exit 
Fix/install deps exit
 2016-12-21 16:00:48 +01:00
DL6ER
8841bdd252
Reset the if's 2016-12-21 12:57:02 +01:00
DL6ER
58261098fb
We should not call a function that Dan deleted 2016-12-21 12:07:44 +01:00
DL6ER
9432d3035a
Merge branch 'development' into cleanup/remove_legacy_detect 
Conflicts:
	automated install/basic-install.sh
 2016-12-21 12:01:58 +01:00
DL6ER
9907fc2770
Merge branch 'development' into fix/install_deps_exit 
Conflicts:
	automated install/basic-install.sh
 2016-12-21 11:54:52 +01:00
Dan Schaper
8117ec8e20
Remove v1 legacy detection code. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-20 17:50:44 -08:00
Dan Schaper
ff2783f9fc
Tabs to spaces and formatting. 
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
 2016-12-20 17:22:57 -08:00
Dan Schaper
156a51c945
Remove extra display only variable. 
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
 2016-12-20 17:04:46 -08:00
Dan Schaper
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
Dan Schaper
7f3b0030ea
LF 
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
 2016-12-20 16:47:43 -08:00
Dan Schaper
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
Dan Schaper
5c43df66a8
Remove spinner function, masked return values. 
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
 2016-12-20 16:22:08 -08:00
Dan Schaper
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
Dan Schaper
8cb01cdd29
One step to rename variables. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-16 15:08:30 -08:00