1
0
mirror of https://github.com/pi-hole/pi-hole synced 2024-11-18 14:18:15 +00:00
Commit Graph

750 Commits

Author SHA1 Message Date
Dan Schaper
863ea7294f
Merge pull request #1815 from pi-hole/release/3.2
Merge Release 3.2 in to development. GitFlow
2017-12-08 13:06:18 -08:00
bcambl
f89d69b081 check NetworkManager status prior to using the cli (#1653)
Closes #1653

Signed-off-by: bcambl <blayne@blaynecampbell.com>
2017-12-07 21:43:14 -06:00
Adam Warner
79aada0b87
travis didn't like that
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 22:57:05 +00:00
Adam Warner
69dc22c10f
fix some codacy and intelliJ idea complaints
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 22:31:12 +00:00
Adam Warner
dd6a9a0b84
supress output of which command on centos/fedora as per https://github.com/pi-hole/pi-hole/pull/1776#discussion_r155156819
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 15:28:58 +00:00
Adam Warner
945dcc6c2b
Indent two spaces as per https://github.com/pi-hole/pi-hole/pull/1776#discussion_r155157116
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 15:17:31 +00:00
Adam Warner
f60791ac7c
Add dependencies as per https://github.com/pi-hole/pi-hole/pull/1776#discussion_r155149349
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 14:42:01 +00:00
Adam Warner
b64155a165
Add in an extra check to enable lighttpd.
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 14:32:39 +00:00
Terror
616962200a
Update the list size to show all the options 2017-11-17 18:18:13 +13:00
Terror
eb9c44a347
Add support for Quad9 secure dns server
See www.quad9.net
2017-11-17 15:54:04 +13:00
Jacob Salmela
f63267a7f9
Merge pull request #1757 from Mausy5043/development
Various small fixes
2017-11-11 16:45:16 -06:00
Jacob Salmela
9631519eb1
Merge pull request #1752 from pi-hole/new/bashupdatechecker
Add bash / cron based update checker for Pi-hole
2017-11-08 20:38:40 -06:00
Mausy5043
ec4e4d3b72 fix indentation 2017-11-05 11:02:04 +01:00
Mausy5043
63312ac4b8 removed duplicate word 2017-11-05 10:18:39 +01:00
Mausy5043
d158a7d51e spelling corrected 2017-11-05 10:16:56 +01:00
Mausy5043
209a2ab3ec grammar corrected (double negative) 2017-11-05 10:05:25 +01:00
DL6ER
06764d0f36
Randomize gravity update time between 03:01 - 04:58 (excluding 04:00)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-29 15:37:39 +01:00
DL6ER
7362416afb
Force an update of the updatechecker after update/install
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-28 15:40:48 +02:00
DL6ER
c34c3eb016
Shift randomized time interval from 00:00-01:59 to 02:00-03:59 2017-10-21 15:58:37 +02:00
DL6ER
85d159bdd1
Randomize gravity update time
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-21 15:52:53 +02:00
WaLLy3K
a9ad8d67aa Remove superseded index.js
Signed off by WaLLy3K <wally3k@pi-hole.net>
2017-10-04 01:13:02 +11:00
Mcat12
7884423e05 Merge pull request #1719 from 19wolf/patch-1
Update basic-install.sh
2017-10-01 12:51:20 -04:00
Eric Wolf
1615fa63e3 Update basic-install.sh
Fixed comment line 40
2017-09-30 16:34:38 -04:00
WaLLy3K
feb2150d9b Fix LIGHTTPD_ENABLED dupes in setupVars.conf
* Fix issue merged [here](fdf2649f2f (diff-689793e68cde6270d074695b71c969afL1488))
2017-09-22 19:14:11 +10:00
Adam Warner
a0bd517380 Merge pull request #1694 from pi-hole/fix/qf-opt
Slow query fix & queryFunc optimisation
2017-09-21 20:05:42 +01:00
WaLLy3K
911596daf8 Start and enable FTL prior to running Gravity 2017-09-20 17:29:11 +10:00
WaLLy3K
d56beedd7a Add idn2 dependency 2017-09-18 00:41:53 +10:00
Adam Warner
5f4be0de35
adjust lighttpd config depending on whether or not custom.php exists
Signed-off-by: Adam Warner <adamw@rner.email>
2017-09-09 19:30:53 +01:00
Adam Warner
6c605f55f9
always overwrite default blockpage, so that changes can be rolled out
Signed-off-by: Adam Warner <adamw@rner.email>
2017-09-09 19:07:48 +01:00
Adam Warner
6b6d105c2f Merge branch 'development' into sqlite-dependency 2017-08-28 10:17:33 +01:00
WaLLy3K
2f36acae49 Remove errornous space 2017-08-23 11:51:16 +10:00
Adam Warner
64f29120c8
indent nested function in basic-install.sh
fix dependency in uninstall.sh

Signed-off-by: Adam Warner <adamw@rner.email>
2017-08-17 19:43:07 +01:00
Adam Warner
d92434b1e9
Merge branch 'development' into sqlite-dependency
Signed-off-by: Adam Warner <adamw@rner.email>

# Conflicts:
#	automated install/basic-install.sh
2017-08-16 16:31:47 +01:00
Adam Warner
01cd056bcc
Work out correct SQLITE version for php-sqlite
Signed-off-by: Adam Warner <adamw@rner.email>
2017-08-16 16:27:50 +01:00
Adam Warner
56f2ea3ec2
Add Fedora/Centos dependency
Signed-off-by: Adam Warner <adamw@rner.email>
2017-08-16 15:56:39 +01:00
WaLLy3K
fdf2649f2f Clean up known remaining colour output issues (#1613)
* Print newline on error message

* Output last three lines of error if update fails

* Consistent error messages & housekeeping

* Add shellcheck directive to ignore COL_TABLE
* Quoted and braced variables for codebase consistency
* Escaped newlines correctly
* Made error messages consistent (indenting and wording)
* Removed consecutive echos

* Conditional formatting consistency

* Braced, quoted and used [[ on conditionals

* Fix specific ShellCheck issues

* Fixed issues that could be safely changed without extensive testing

* Update SELinux whiptail behaviour & more

* Colourised some strings
* Fixed multiple line string indenting
* Made output consistent with existing codebase
* Removed sequential echos
* Make SELinux whiptail use "--defaultno", and change text wording

* Add help text for hostrecord, and colourise output

* this should fix the tests...

Signed-off-by: Adam Warner <adamw@rner.email>

* revert changes to `update_package_cache()` to prove tests

Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-26 18:00:08 +01:00
Mcat12
b09c660833 Always process DNS and DHCP settings in installer (#1630)
* Always process DNS and DHCP settings in installer

* Make sure dnsmasq config exists before modifying it

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>

* Make sure the dnsmasq config directory exists

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>

* Only remove the DHCP config if it exists (fixes tests, hopefully)

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2017-07-26 17:15:23 +01:00
Adam Warner
c02a24cf71 Fix/unbreak development (#1635)
* Always process DNS and DHCP settings in installer

* change where finalExports is called and where LIGHTTPD_ENABLED is set.

Signed-off-by: Adam Warner <adamw@rner.email>

* this may or may not work. If it does, can be functionised to reduce code duping

Signed-off-by: Adam Warner <adamw@rner.email>

* This will fix the tests, but break the patch

Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-26 14:34:40 +01:00
Mcat12
a77136bd1d Merge pull request #1600 from pi-hole/tweak/OnlyDownloadFTLNew
Only download FTL if a newer version than currently installed is detected (or if no version is detected)
2017-07-25 22:11:31 -04:00
Adam Warner
a293b5a371
prevent ./automated install/basic-install.sh: line 1886: /usr/bin/pihole-FTL: No such file or directory on new install, or if pihole-FTL is missing for whatever reason.
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-25 22:49:06 +01:00
Adam Warner
1c93868ae1
Adjust wording of echos
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-24 23:22:04 +01:00
WaLLy3K
c9a98b68c8 Avoid reactivating a deactivated lighttpd service (#1485)
* Do not activate disabled lighttpd upon update

* Fixes #1362

* Use systemctl when available

* Move `finalexports` to the very end of the install script
set value of LIGHTTPD_ENABLED to 1 or 0 depending on whether or not lighttpd is enabled or disabled.
actually save LIGHTTPD_ENABLED value to setupvars.conf

Signed-off-by: Adam Warner <adamw@rner.email>

* add [[ -z "${LIGHTTPD_ENABLED}" ]] back in!

Signed-off-by: Adam Warner <adamw@rner.email>

* Ensure "Loaded:" is the line being checked

* Colourise disabled lighttpd message

* Prevent disabled lighttpd triggering error

* change of plan, don't need that [[ -z "${LIGHTTPD_ENABLED}" ]]

Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-16 16:44:14 +01:00
Adam Warner
edb594461d
Remove CIDR from IPv6 address when detecting it in the install script
Signed-off-by: Adam Warner <adamw@rner.email>

# Conflicts:
#	automated install/basic-install.sh
2017-07-14 22:31:43 +01:00
Adam Warner
bf70c2c660
initial changes to tests to take into account changes to strings
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-12 22:57:57 +01:00
Adam Warner
74b912a0b7
Check if FTL is already installed, do not download if it is detected, and the sha1sum matches the remote
This will probably break some tests. I'll work that out in a bit
Signed-off-by: Adam Warner <adamw@rner.email>

Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-12 22:37:51 +01:00
Dan Schaper
2778d88e8a Fix missing then clause 2017-07-12 00:12:54 -07:00
Jacob Salmela
e7ad972783
fix thre spelling errors 2017-07-10 14:12:30 -05:00
Jacob Salmela
2f939d8c56
fix two spelling errors 2017-07-07 09:05:19 -05:00
Jacob Salmela
aad39c5ffc
add comments for nearly every line of code. 2017-07-06 19:25:56 -05:00
WaLLy3K
c6ba03802f Add "php5-sqlite" to dependencies 2017-07-05 17:18:21 +10:00