Dan Schaper
|
f32ad7699d
|
Merge pull request #1320 from georou/development
Use Firewalld --add-service instead of port
|
2017-03-21 04:49:59 -07:00 |
|
Dan Schaper
|
79294bb6ca
|
Merge pull request #1332 from pi-hole/varChanges
replace instances of "/etc/.pihole" with ${PI_HOLE_LOCAL_REPO}
|
2017-03-21 04:49:10 -07:00 |
|
Dan Schaper
|
2834f2ccc2
|
Let ip determine which links are candidates.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-15 22:05:48 -07:00 |
|
georou
|
0d794226ab
|
Removed unsupported POSIX brace expansion
|
2017-03-16 09:29:33 +11:00 |
|
Adam Warner
|
83662c9e50
|
additional requested changes
|
2017-03-15 19:50:22 +00:00 |
|
Adam Warner
|
6c1d52199f
|
Merge branch 'master' of https://github.com/jftuga/pi-hole into jftuga-master
|
2017-03-15 19:47:31 +00:00 |
|
John Taylor
|
76bd53ef1f
|
replace instances of "/etc/.pihole" with ${PI_HOLE_LOCAL_REPO}
|
2017-03-13 20:24:04 -04:00 |
|
georou
|
e45559da20
|
Use Firewalld services instead of ports
|
2017-03-14 01:13:23 +11:00 |
|
Jacob Salmela
|
5e16487ef6
|
add ascii berry to beginning of installer
|
2017-03-08 21:14:21 -06:00 |
|
DL6ER
|
f2fe84c9d3
|
Merge pull request #1292 from pi-hole/master
Merge patches back into devel
|
2017-03-03 23:45:29 +01:00 |
|
DL6ER
|
f626406685
|
Revert #1273
|
2017-03-03 23:14:12 +01:00 |
|
Dan Schaper
|
8776b822db
|
Merge pull request #1287 from pi-hole/fix/update_fail
Exit script immediately if we can't update package cache.
|
2017-03-03 12:20:29 -08:00 |
|
DL6ER
|
fc76b1a6a3
|
Merge pull request #1244 from pi-hole/new/FTL-binary
FTL
|
2017-03-03 13:41:27 +01:00 |
|
DL6ER
|
9502356980
|
Move test_dpkg_lock to initial UPDATE_PKG_CACHE. There was unpredictable interference with debconf-apt-progress
|
2017-03-03 11:55:15 +01:00 |
|
DL6ER
|
a535ca9db4
|
Some tweaks to the new dpkg lock detector
|
2017-03-03 11:55:13 +01:00 |
|
DL6ER
|
2c762899de
|
Add loop to wait if package manager is blocked externally
|
2017-03-03 11:55:10 +01:00 |
|
Dan Schaper
|
24fd23493d
|
Exit script immediately if we can't update package cache.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-02 15:54:58 -08:00 |
|
DL6ER
|
66b7d04b82
|
Merge branch 'development' into new/FTL-binary
|
2017-03-01 12:42:48 +01:00 |
|
Technicalpyro
|
93dea7b942
|
Moved to installers dependencies
|
2017-02-27 15:21:59 -05:00 |
|
Dan Schaper
|
ca24f7c143
|
Merge pull request #1273 from pi-hole/new/no_fixed_interface
Don't save `interface=` line to `dnsmasq`s config file
|
2017-02-27 11:50:28 -08:00 |
|
Technicalpyro
|
697b0295f3
|
fixes missing dialog package from some ditros
|
2017-02-26 14:24:08 -06:00 |
|
DL6ER
|
ae24f1255f
|
Bugfix: Delete INSTALL_WEB line before adding new one
|
2017-02-25 11:29:12 +01:00 |
|
DL6ER
|
ec7e75a6e3
|
Don't save interface= line to dnsmasqs config file
|
2017-02-24 16:02:24 +01:00 |
|
Flo
|
2a881a90ac
|
Update old install command to new
|
2017-02-24 11:29:19 +01:00 |
|
Jacob Salmela
|
7a1a2dec67
|
update license to EUPL on core files
|
2017-02-22 11:55:20 -06:00 |
|
DL6ER
|
af2893d2ce
|
Updater implementation for FTL
|
2017-02-22 10:43:13 +01:00 |
|
Dan Schaper
|
4dcee5cd84
|
arch is not portable.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-02-21 09:14:49 -08:00 |
|
DL6ER
|
1645677c3a
|
Cosmetics
|
2017-02-21 16:42:52 +01:00 |
|
DL6ER
|
77b3764481
|
Remove resundant code (FTL will later be enabled by enable_service)
|
2017-02-21 11:23:01 +01:00 |
|
DL6ER
|
90ccbef431
|
pihole-FTL init.d script
|
2017-02-21 11:18:47 +01:00 |
|
Dan Schaper
|
4cd598ae10
|
Check support files installed and permissions.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-02-20 18:12:51 -08:00 |
|
Dan Schaper
|
2ffb103acb
|
Move binary to final home.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-02-20 15:44:33 -08:00 |
|
Dan Schaper
|
a0c17368ed
|
cd to directory to sha1sum
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-02-20 15:27:24 -08:00 |
|
Dan Schaper
|
6023984703
|
Silence sha check
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-02-20 15:13:54 -08:00 |
|
Dan Schaper
|
cde7b53de3
|
Check sha1 of transferred file.
Sha1sum file in temp directory.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-02-20 15:13:26 -08:00 |
|
Dan Schaper
|
e087797edc
|
Test for format of tag version.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-02-20 11:49:20 -08:00 |
|
Dan Schaper
|
5e6f8489a9
|
Find 404 errors and relay message.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-02-20 11:45:58 -08:00 |
|
Dan Schaper
|
48351fed79
|
Remove trailing newline from curl'd variable.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-02-20 11:33:55 -08:00 |
|
Dan Schaper
|
875a5d309d
|
Check downloaded file for binary or text.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-02-20 11:28:36 -08:00 |
|
Dan Schaper
|
70e876ee13
|
Download tests.
Make sure we download a binary and not just get the GitHub page.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-02-20 11:11:16 -08:00 |
|
Dan Schaper
|
7a269e757e
|
Debian buildpack image for docker (Need curl for testing, using scm version to add curl and git.)
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-02-20 09:24:47 -08:00 |
|
Dan Schaper
|
87edbeaf58
|
Factor out downloader from detector function.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-02-20 08:40:17 -08:00 |
|
Dan Schaper
|
339f95b00c
|
Change from uname -m to straight arch
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-02-20 08:13:46 -08:00 |
|
DL6ER
|
70a6a79b8c
|
Detect library differently
|
2017-02-20 13:40:32 +01:00 |
|
DL6ER
|
f24f77c5bd
|
Detect if architecture is *aarch* + use hf binary only if ARMv7+ is detected
|
2017-02-20 11:14:23 +01:00 |
|
DL6ER
|
378338c684
|
Install pihole-FTL to /usr/bin instead of /usr/local/bin
|
2017-02-20 10:42:07 +01:00 |
|
Adam Warner
|
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 |
|
Skittels
|
4e7a485e23
|
Update basic-install.sh
|
2017-02-18 13:42:13 +01:00 |
|
Skittels
|
9e5795bf55
|
Added DNS.WATCH to default dns servers
|
2017-02-18 13:03:40 +01:00 |
|
DL6ER
|
4035c933df
|
Moved echo to else block
|
2017-02-13 16:50:48 +01:00 |
|
DL6ER
|
abd44dd284
|
Add 32bit message
|
2017-02-13 16:33:22 +01:00 |
|
DL6ER
|
95d7fe76b5
|
Make comments more pretty
|
2017-02-13 14:50:25 +01:00 |
|
DL6ER
|
a052f397fe
|
Be more verbose during install
|
2017-02-13 14:47:06 +01:00 |
|
DL6ER
|
09d6e73b0a
|
Don't print error message on 32bit platforms
|
2017-02-13 14:42:11 +01:00 |
|
DL6ER
|
7fb6b71d52
|
Fix install path
|
2017-02-13 14:40:31 +01:00 |
|
DL6ER
|
07e37d7fc3
|
Proper error handling
|
2017-02-13 11:33:09 +01:00 |
|
DL6ER
|
fbe3dc0dcd
|
Have to get latest tag via GitHub API for downloading the binaries
|
2017-02-13 11:27:52 +01:00 |
|
DL6ER
|
6018c0c2fc
|
Add FTLinstall()
|
2017-02-13 11:07:29 +01:00 |
|
DL6ER
|
52a2f166fd
|
Add FTLdownload() subroutine
|
2017-02-13 10:29:27 +01:00 |
|
Mcat12
|
ba67144e34
|
Merge branch 'development' into adminPageAsOption
|
2017-02-09 16:27:07 -05:00 |
|
Dan Schaper
|
34f326c559
|
Update basic-install.sh
|
2017-02-08 14:13:49 -08:00 |
|
DL6ER
|
8fb6ba19a1
|
Remove double echos
|
2017-02-06 12:06:38 +01:00 |
|
Dan Schaper
|
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 |
|
Promofaux
|
4fcf8fd23f
|
Merge in development branch - resolve conflict in update.sh
|
2017-02-05 19:39:02 +00:00 |
|
Promofaux
|
1206dda347
|
testing putting runGravity at a different part of the script
|
2017-02-05 19:23:04 +00:00 |
|
Promofaux
|
e57425df5f
|
0.0.0.0 instead of pi-holes IP address for redirect purposes
|
2017-02-04 15:25:11 +00:00 |
|
Dan Schaper
|
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 |
|
Dan Schaper
|
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 |
|
Mcat12
|
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 |
|
DL6ER
|
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 |
|
Dan Schaper
|
3861b57dc6
|
Start moving reused utility functions to one script.
|
2017-01-28 17:32:42 -08:00 |
|
Dan Schaper
|
7291aa07ca
|
Silenc cache updater.
|
2017-01-28 16:46:37 -08:00 |
|
Dan Schaper
|
409f76aa34
|
Error check.
|
2017-01-28 16:37:31 -08:00 |
|
Dan Schaper
|
a281d87315
|
Eval variable. (Not a fan.)
|
2017-01-28 16:37:26 -08:00 |
|
Dan Schaper
|
2d18b2d784
|
Start test templates.
|
2017-01-28 16:37:04 -08:00 |
|
Promofaux
|
c31b4383e6
|
add back in code to stop dnsmasq and lighttpd during install.
|
2017-01-28 21:37:21 +00:00 |
|
Promofaux
|
35828f9cea
|
Source setupvars earlier in update/repair process
|
2017-01-28 19:05:55 +00:00 |
|
Promofaux
|
90af12fdb8
|
Remember the [@]
|
2017-01-28 18:41:37 +00:00 |
|
Promofaux
|
5fede23cf7
|
trying another tactic
|
2017-01-28 18:39:15 +00:00 |
|
Promofaux
|
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 |
|
Promofaux
|
01429d59bd
|
more web checks
|
2017-01-28 15:45:14 +00:00 |
|
Promofaux
|
731d15f9b5
|
don't display web admin info in final dialog if it's not selected
|
2017-01-28 15:43:33 +00:00 |
|
Promofaux
|
f0bd7fae5c
|
) not }
|
2017-01-28 15:32:07 +00:00 |
|
Promofaux
|
f8322cc2d4
|
use the web install flag. Could be optimised
|
2017-01-28 15:25:02 +00:00 |
|
Promofaux
|
dfdb9e393b
|
move repo clone to function
|
2017-01-28 15:15:42 +00:00 |
|
Promofaux
|
bd07d7f32e
|
Only install web dependenices if flag is true
|
2017-01-28 15:11:39 +00:00 |
|
Promofaux
|
f588c6f93c
|
introduce web toggle flag
|
2017-01-28 14:40:47 +00:00 |
|
Promofaux
|
d9ec3d2c22
|
spelling
|
2017-01-28 14:28:18 +00:00 |
|
Promofaux
|
e2b87759d8
|
split out web dependencies
|
2017-01-28 14:27:08 +00:00 |
|
Dan Schaper
|
52e0aa11af
|
Have install create directory
|
2017-01-27 22:06:48 -08:00 |
|
Dan Schaper
|
1421c31179
|
install index and blockingpage assets.
|
2017-01-27 21:41:17 -08:00 |
|
Dan Schaper
|
91bcc18e6a
|
Make full path to directory for pihole web page.
|
2017-01-27 21:40:52 -08:00 |
|
Dan Schaper
|
5b43f13935
|
Fresh install web page directory tests
|
2017-01-27 20:24:20 -08:00 |
|
DL6ER
|
2c16a75ef1
|
Use stat to get owner of /var/log
|
2017-01-27 14:28:59 +01:00 |
|
DL6ER
|
6fd7e0311c
|
Install customized version of logrotate script
|
2017-01-27 14:16:24 +01:00 |
|
Dan Schaper
|
cec214f900
|
User decline to install shouldn't be an error return.
|
2017-01-26 14:38:02 -08:00 |
|
Dan Schaper
|
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 |
|
Dan Schaper
|
8bba3a257c
|
Merge branch 'tweak/firewall_tests' into tweak/firewall_warning
|
2017-01-24 11:51:41 -08:00 |
|
Dan Schaper
|
31aa42c35e
|
Transparency in sudo refire.
|
2017-01-23 14:28:56 -08:00 |
|
Dan Schaper
|
f7a17248b7
|
Warn with whiptail if firewall-cmd is running.
|
2017-01-23 14:19:51 -08:00 |
|