Commit graph

1871 commits

Author SHA1 Message Date
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
Dan Schaper
73741f1518 Merge pull request #1046 from pi-hole/tweak/subshells
Tweak/subshells
2016-12-27 16:00:07 -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
6abd6d8879 Merge pull request #991 from pi-hole/webUIprivacymode
Backend for privacyMode on webUI
2016-12-27 12:46:54 -08:00
Dan Schaper
c3b51b4ceb Merge branch 'development' into feature/track_pre-installed_packages 2016-12-27 12:37:19 -08:00
DL6ER
321ea8a3a9 Merge branch 'development' into webUIprivacymode 2016-12-27 21:27:11 +01:00
Dan Schaper
4d6263872d
Merge branch 'development' of github.com:pi-hole/pi-hole into tweak/subshells 2016-12-27 12:25:49 -08:00
Dan Schaper
fcdd58ac94 Merge pull request #1033 from pi-hole/updater_rewrite
update.sh code refactoring
2016-12-27 12:22:17 -08:00
Dan Schaper
ef8292d371 Merge branch 'development' into updater_rewrite 2016-12-27 11:59:52 -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
51f6d75db4 Merge pull request #1045 from pi-hole/tweak/always_update
Always update package cache where we can.
2016-12-27 11:51:00 -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
Mcat12
823e874d20 Merge pull request #1037 from pi-hole/tweak/IPv4_multi_address
Smarter pick of IPv4 address
2016-12-27 11:42:00 -05:00
Adam Warner
739aaafa9a Merge pull request #1041 from pi-hole/development
[RELEASE] Pi-Hole Core 2.10.2
2016-12-25 23:43:35 +00:00
Dan Schaper
62d001225a Merge pull request #1040 from pi-hole/fix/updater_git-C
Remove git -C from update.sh
2016-12-25 12:28:42 -08:00
DL6ER
e50947eb58
mend 2016-12-25 21:26:06 +01:00
DL6ER
ca056d32d2
Remove git -C 2016-12-25 21:22:59 +01:00
DL6ER
63a455f4f7 Merge pull request #1039 from pi-hole/revert_crontab_change
Revert PR #1018
2016-12-25 18:35:59 +01:00
DL6ER
a0e0465036
Revert "Merge pull request #1018 from pi-hole/diginc-patch-1"
This reverts commit ff3c36a7a2, reversing
changes made to 9355a8ad0e.
2016-12-25 17:32:59 +01:00
Dan Schaper
d174a9d015
Merge branch 'feature/track_pre-installed_packages' of github.com:pi-hole/pi-hole into feature/track_pre-installed_packages 2016-12-24 17:01:38 -08: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
DL6ER
e15548cbf5
Add --quiet to git fetch in GitCheckUpdateAvail() 2016-12-25 01:18:58 +01:00
DL6ER
5e28e6b9ac
Removed remaining git -C 2016-12-25 01:17:46 +01:00
DL6ER
c78d43f640 Merge pull request #1032 from pi-hole/fix/emptypassword
Save empty password
2016-12-25 00:51:21 +01: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
Dan Schaper
3365ef7aaa
is_repo() returns values to caller, silence function.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 11:54:04 -08:00
Dan Schaper
68c17b26dc
Bashisms
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 11:41:42 -08:00
Dan Schaper
e647efd471
Shell script, not javascript
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 11:24:20 -08:00
DL6ER
15db1ffdd5
Remove variables not needed any more 2016-12-24 15:48:43 +01:00
DL6ER
4632b0f797
Updated updater logic 2016-12-24 15:40:31 +01:00
DL6ER
65c35a5530
Use new subroutine to determine if updates are available 2016-12-24 15:32:25 +01:00
DL6ER
c449a1c0e0
Added GitCheckUpdateAvail() 2016-12-24 15:19:39 +01:00
DL6ER
b020010f0d
Removed some of the &> /dev/null 2016-12-24 15:08:30 +01:00