Adam Warner
77554fbd13
Merge pull request #1145 from pi-hole/cleanup/more_shellcheck
...
Cleanup/more shellcheck
8 years ago
Dan Schaper
eaf6938c35
DNS whiptail from radio to menu
8 years ago
Dan Schaper
0635309f23
Move distribution check to function.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
cef0211c00
Merge pull request #1151 from pi-hole/fix/CIDR
...
Include CIDR notation for IPv4 non-natural blocks.
8 years ago
Dan Schaper
86052540d9
Add back CIDR notation for non-natural blocks. Includes multi-address
...
configs.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
62a5e36afd
Remove firewall configuration from update portion of script.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
00b28f0aed
IPTables Whiptal option to install.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
ec8c40b69b
Fix array declaration for Fedora package management.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
34df34ba27
Actually rm the Pi-hole scripts.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
2689b37c35
Combine multiple calls to interface length code.
...
&& ||
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
9b6427144f
|| && conversion.
...
Fedora deps array.
Use full name of `source`
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
9212eea8bd
Only ignore DOWN interfaces, `tun` interfaces are UNKNOWN.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
DL6ER
0b72c639fb
Check for existance of iptables command. Fixes #1125
8 years ago
Dan Schaper
c58a95ca2e
`setDNS` whiptail direct, not in array.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
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>
8 years ago
Dan Schaper
6f0289de49
Vestigial variable that was never populated.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
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>
8 years ago
Dan Schaper
27e90cc4e6
Repetitive `ip route get` was resetting counts.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
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>
8 years ago
Dan Schaper
0e4d5e9103
Bash splitting and globin
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Mcat12
76531da340
Merge pull request #1067 from pi-hole/fix/firewall_redux
...
Fix/firewall redux
8 years ago
Adam Warner
12bec1df68
Merge pull request #1048 from pi-hole/tweak/simplify_webpage.sh
...
Major simplification of webpage.sh + extend DHCP to IPv6
8 years ago
DL6ER
85f0241c0d
Reprocess DHCP settings after update
8 years ago
Dan Schaper
8ee2bdec4d
Plain grep, escape the special characters.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
de6ce276d0
Merge branch 'development' of github.com:pi-hole/pi-hole into fix/firewall_redux
8 years ago
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.
8 years ago
Dan Schaper
502c349b8b
Merge branches 'development' and 'fix/firewall_redux' of github.com:pi-hole/pi-hole into fix/firewall_redux
8 years ago
Adam Warner
5fb0aa70de
Merge pull request #1008 from pi-hole/feature/track_pre-installed_packages
...
Feature/track pre installed packages
8 years ago
Dan Schaper
7750e1344c
DRY `displayFinalMessage`
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
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>
8 years ago
Dan Schaper
fa055481a7
Shellcheck screen size
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
ad07655630
Defensive git cloning
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
7cceb8615a
`make_repo` more defensive.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
45587194e5
Regex fun
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
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>
8 years ago
DL6ER
02d4b6794c
Merge pull request #1066 from dgnthr/patch-1
...
Fixed a typo in the installation script
8 years ago
Dominik G
836b717346
Fixed a typo in the installation script
8 years ago
DL6ER
1a3bdbaabf
Merge pull request #1057 from pi-hole/new/whitelistonblockingpage
...
Allow whitelisting from blocking page
8 years ago
Mcat12
5e35fdbc52
Save blocking page CSS to pihole directory instead of admin
8 years ago
Dan Schaper
a4a9879643
Restructure firewall detection and application.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
ea9ec384c6
Disambiguate nested ifs.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
bbb958b7ed
Detect RPF breaking kernel updates.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
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
8 years ago
DL6ER
02d658be65
Look for DHCP / DNS server settings which would have to be reapplied after updating (since we overwrite 01-pihole.conf)
8 years ago
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
8 years ago
Dan Schaper
9a9cb61345
Shift `epel-release` to installer dependencies for CentOS
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
c3b51b4ceb
Merge branch 'development' into feature/track_pre-installed_packages
8 years ago
Dan Schaper
bc6a985f7c
Merge branch 'development' of github.com:pi-hole/pi-hole into tweak/subshells
8 years ago
Dan Schaper
7320fc11d2
Check command -v directly, instead of subshelling out.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
a328326e39
Formatting
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
4eedf8a746
Always update package cache where we can.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
c5f5252145
Merge pull request #961 from pi-hole/customblockpage
...
Custom Pi-Hole block page
8 years ago
Mcat12
7fadd469c9
Merge pull request #1038 from pi-hole/fix/IPV6_detection
...
Check IPv6 routing
8 years ago
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>
8 years ago
Dan Schaper
f458780ba7
Rebase onto development
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
8ad52806de
Quiet DNF
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
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>
8 years ago
Dan Schaper
852341c601
Check for installation status within the parent function.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
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>
8 years ago
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>
8 years ago
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>
8 years ago
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>
8 years ago
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>
8 years ago
Adam Warner
d12efccd0b
Merge pull request #1028 from pi-hole/bcambl-selinux_notification
...
Bcambl selinux notification
8 years ago
Mcat12
54afffed19
Remove newline
...
Issue was already fixed
8 years ago
Mcat12
fc8fcdbece
Add newline
8 years ago
Promofaux
abd1fedc9d
.
8 years ago
Promofaux
9725985037
printf to echo. idgaf
8 years ago
Promofaux
754f3359ec
too many echos spoil the branch
8 years ago
Promofaux
4c131b8c28
newlines
8 years ago
Promofaux
15c674ba29
verbosity
8 years ago
Promofaux
00aff6a906
maybe
8 years ago
Promofaux
c45c3a72b5
words words words
8 years ago
Promofaux
662d450651
adjust size of whiptail dialog
8 years ago
Promofaux
a8897becd2
Make sure whiptail is installed...
8 years ago
Promofaux
fdb64a5702
untested convert user prompt to whiptail
8 years ago
Mcat12
73a80ff7dc
Align installer output for updating repo
8 years ago
Promofaux
a795fd698d
Merge branch 'selinux_notification' of https://github.com/bcambl/pi-hole into bcambl-selinux_notification
8 years ago
bcambl
2fb0dc0a4a
add warning if SELinux is Enforcing
8 years ago
DL6ER
aa8e1497a3
Fixed error
8 years ago
DL6ER
afabf30ec6
Fix Fedora web UI support
8 years ago
DL6ER
420158494d
Merge pull request #1022 from pi-hole/fix/adlists.default
...
Internal (/etc/pihole/adlists.default)
8 years ago
DL6ER
6b7b0e0eb3
Test if /etc/pihole/adlists.default exists
8 years ago
Adam Warner
ad70db7e0e
Merge pull request #1020 from bcambl/setDNS_before_ifcfg
...
Set dns before ifcfg (Fixes #1019 )
8 years ago
bcambl
1e7e3259b5
choose dns servers prior to interface configuration
...
upstream DNS servers must be chosen prior interface configuration.
Fixes #1019
8 years ago
bcambl
513bc32d87
is_repo: ensure directory exists
8 years ago
Dan Schaper
9355a8ad0e
Merge pull request #1011 from pi-hole/fix/sudoers
...
Fix: Dynamic instead of static sudoers file
8 years ago
Dan Schaper
ea5ee7b0f9
Execute gravity in same shell as installer, don't subshell it.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
DL6ER
bc8cf1b2d8
Fixed wrong indentation
8 years ago
DL6ER
bb28d94884
Merge branch 'development' into customblockpage
...
Conflicts:
automated install/basic-install.sh
8 years ago
Blayne Campbell
8f402f5c77
Merge pull request #1009 from bcambl/fix_1004
...
replace 'git -C' with long version
8 years ago
DL6ER
60054da582
Add lighttpd user (OS dependent) to sudoers file
8 years ago
bcambl
cbf84c1840
replace subshell with command chain
8 years ago
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
8 years ago
Dan Schaper
4244f716e0
Create /opt/pihole before trying to install into it.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
DL6ER
c48e6c91f5
Merge pull request #999 from pi-hole/fix/install_deps_exit
...
Fix/install deps exit
8 years ago
DL6ER
8841bdd252
Reset the if's
8 years ago
DL6ER
58261098fb
We should not call a function that Dan deleted
8 years ago
DL6ER
9432d3035a
Merge branch 'development' into cleanup/remove_legacy_detect
...
Conflicts:
automated install/basic-install.sh
8 years ago
DL6ER
9907fc2770
Merge branch 'development' into fix/install_deps_exit
...
Conflicts:
automated install/basic-install.sh
8 years ago