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 02:42:58 +00:00
Code Issues Projects Releases Packages Wiki Activity
3247 commits 8 branches 109 tags 27 MiB
Commit graph

890 commits

Author SHA1 Message Date
Daniel (Fourdee)
3a483a1b20 install_web_server 
+ Splits web interface and server into two variables.
+ Option to disable forced install of Lighttpd.
 2018-04-15 02:08:16 +01:00
Adam Warner
310d33b8ee
Merge dev > FTLDNS fix merge conflicts 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-13 17:01:54 +01:00
Mark Drobnak
331472b592
Merge pull request #1999 from pi-hole/tweak/RedundantInstallCode 
adlists.default no longer used. No need to reference it.
 2018-04-06 00:17:45 -04:00
Adam Warner
f37b2bc7c1
move call to get_binary_name into FTLcheckUpdate() to avoid having to run that first 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-02 23:22:06 +01:00
Adam Warner
b1d6c03190
Break out binary name funtion to it's own function 
Remove duplicate code. get_binary_name is now in the install script
Add some "version" checking to ftl download when using an alt branch, uses checksum
Greatly simplify update process. Source pihole-FTL version checker from basic-install.sh
Always run install script to finalise changes.
Install script now outputs versions after an update
(This is a Squash of previous work into one commit)

Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-02 21:53:32 +01:00
Everett Southwick
a8b493cb7d Add support for public Cloudflare DNS servers. 
Signed-off-by: Everett Southwick <everett@everettsouthwick.com>
 2018-04-01 17:59:16 -05:00
Mark Drobnak
a1d6ef04ec
Merge pull request #1758 from mettacrawler/fix-for-RHELish-ifcfg 
basic-install.sh - no CIDR in ifcfg-*
 2018-03-30 17:28:52 -04:00
Adam Warner
238a56cac3
Remove CreateLogFile function, as this is handled by the FTL service 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-03-23 10:53:22 +00:00
Adam Warner
51765b1f65
chown pihole log to pihole:pihole, rather than pihole:root 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-03-23 10:15:40 +00:00
Mark Drobnak
e131395cce
Merge pull request #2037 from justinamcafee/master 
Adds FamilyShield DNS server address to the "Choose DNS" screen in installer.
 2018-03-21 17:47:24 -04:00
Adam Warner
d26ea2b948
remove trailing whitespace 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-03-18 00:38:34 +00:00
Adam Warner
e2e8b733a8
tidy up function 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-03-18 00:13:10 +00:00
Adam Warner
f18bf35b20
use systemctl is-enabled to check enabled status of service 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-03-17 22:56:50 +00:00
Adam Warner
44d8cb77e3
Kill off mask_service function 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-03-17 22:48:11 +00:00
Adam Warner
b92ccb2de4
Additionally mask the dnsmasq service on systems with systemctl 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-03-14 20:01:06 +00:00
justinamcafee
30af6e73be
added ;; to line 825 
Misformated case. Updated correct case
 2018-03-10 17:36:47 -06:00
justinamcafee
2895b9bfb7
Added support for FamilyShield from OpenDNS 
With a very minor code change, individuals can now implement restrictions on dangers, disturbing, or otherwise adult oriented content without the need for managed restrictions.
This is a fairly non-invasive change and will benefit users who intend to use VPN for home or small business uses where access to such material may be undesirable.
 2018-03-10 17:33:31 -06:00
Adam Warner
84bd86f1ee
- Test to see if dnsmasq service is enabled before stopping and disabling it. 
- Some formatting tweaks to the `start_service` `stop_`service` `disable_service` and `enable_service` commands

Signed-off-by: Adam Warner <adamw@rner.email>
 2018-03-07 23:31:28 +00:00
Adam Warner
7193f40b87
remove libnettle, missed a >/dev/null 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-03-07 22:23:05 +00:00
Adam Warner
acd69fa4b0
silence push/popd 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-03-07 22:21:09 +00:00
Adam Warner
6584933e92
fix stickler complaints 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-03-06 18:51:02 +00:00
Adam Warner
8cf8da4c78
- Check file /etc/pihole/ftlbranch for current FTL branch, download from github if master, or pi-hole.net if other 
- Check if downloaded binary file can resolve queries, if so stop and disable dnsmasq
- Add service_disable function
- Add dependency libcap2-bin on debian to enable setcap. Need to check other distos
-Always download FTL binary if /etc/pihole/ftlbranch does not contain "master"
- Change some strings/variables that reference dnsmasq and change them to pihole/pihole-FTL

Signed-off-by: Adam Warner <adamw@rner.email>
 2018-03-06 18:44:57 +00:00
Adam Warner
cadab61a21
Merge branch 'development' into FTLDNS 2018-03-05 21:33:53 +00:00
Dan Schaper
3425b9a82e
Fix mktmp > mktemp 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-03-02 12:28:53 -08:00
DL6ER
fcdc85eab8
Remove dnsmasq from dependencies 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-02-25 23:47:11 +01:00
Dan Schaper
4606693e62
Use pushd/popd and create random temporary directory to prevent potential backdoor binary injection. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-02-22 20:13:38 -08:00
Adam Warner
e61d8e4fb8
adlists.default no longer used. No need to reference it. 
Use --force switch of gravity to force the cache refresh

Signed-off-by: Adam Warner <adamw@rner.email>
 2018-02-22 14:45:31 +00:00
DL6ER
8b79017d0f
Always replace pihole-FTL.service 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-02-18 13:07:22 +01:00
DL6ER
5465ac9ba0
Merge pull request #1929 from pi-hole/fix/flushDB 
pihole -f: Flush database
 2018-02-17 17:45:15 +01:00
Mark Drobnak
3472241289
Merge pull request #1962 from floek/master 
Fixes https://github.com/pi-hole/pi-hole/issues/1772
 2018-02-14 13:02:56 -05:00
Florian Freund
a944b6ff79 Fixes https://github.com/pi-hole/pi-hole/issues/1772 2018-02-12 21:28:43 +01:00
Sebastian Pucilowski
c5a2ca5c98 Trivial spelling mistakes in basic-install.sh comments 
Signed-off-by: Sebastian Pucilowski <smopucilowski@gmail.com>
 2018-02-07 16:56:21 +11:00
Elias Ojala
2b6d9c34c9 Fixed a typo 
Signed-off-by: Elias Ojala <ojala.s.elias@gmail.com>
 2018-01-27 14:36:11 +02:00
DL6ER
158ea1d43b
Add sqlite3 dependency 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-21 11:54:49 +01:00
Mark Drobnak
535b8458d4
Merge pull request #1901 from bcambl/epel_check 
Fix epel-release install for CentOS
 2018-01-20 14:03:24 -05:00
Dan Schaper
9543203610
Echo the right location for the log. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-01-20 08:45:41 -08:00
Dan Schaper
cacfe4d387
Linting changes 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-01-20 07:39:11 -08:00
Dan Schaper
a7f0137e5f
Use more secure installation log process. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-01-20 05:55:48 -08:00
Dan Schaper
b2eb364a4b
Update header 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-01-20 05:36:28 -08:00
Dan Schaper
bb3b1bc6ba
Move ascii berry to after root check, stops the double berry for the sudo refire. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-01-20 05:13:55 -08:00
bcambl
cc47bf8f6c Fix epel-release install for CentOS 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-01-07 22:21:04 -06:00
DL6ER
a154f1540f
Merge pull request #1778 from loganaden/development 
Add secondary quad9 server
 2017-12-30 18:19:55 +01:00
DL6ER
677033afca
Force update of "remote" part in th update checker (may take up to 24hrs for new installs otherwise) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-28 18:41:22 +01:00
Adam Warner
95e5baa967
Source setup vars before we attempt to do anything on an update/repair 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-12-24 13:09:45 +00:00
DL6ER
f89f7ecd3e
Randomize GitHub API update check time 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-21 12:42:47 +01:00
Dan Schaper
29ee8250e9
Change package install notification from CROSS to TICK. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-12-11 09:45:30 -08:00
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
Loganaden Velvindron
9c8526db49 Add secondary quad9 server 2017-11-20 22:05:41 +04: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
Adam Warner
2c8dcd86e5
remove package_check to avoid situations like #1760 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-11-09 20:47:15 +00: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
mettacrawler
35dc4800e0
basic-install.sh - no CIDR in ifcfg-* 
Do not expect CIDR format IP addresses in /etc/sysconfig/network-scripts/ifcfg-* files as it is not a requirement.
Expect only:
IPADDR=10.10.10.10
Do not expect:
IPADDR=10.10.10.10/24
 2017-11-05 15:28:44 -05: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
Adam Warner
4316b15ae2 Merge pull request #1700 from pi-hole/fix/start-ftl 
Start and enable FTL prior to running Gravity
 2017-09-21 20:00:08 +01:00
Adam Warner
a643f40cce Merge pull request #1663 from pi-hole/new/UninstallCleanup 
Cleanup uninstall script
 2017-09-21 19:56:12 +01:00
WaLLy3K
909bc92c01 Tweak wording to fit on 80 character screen 
* Also move colour after $INFO
 2017-09-21 00:22:47 +10: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
774c6e8ac0
Merge branch 'development' into new/UninstallCleanup 
Signed-off-by: Adam Warner <adamw@rner.email>

# Conflicts:
#	automated install/uninstall.sh
 2017-09-09 18:56:17 +01:00
Adam Warner
c65c26b463 Merge branch 'development' into new/UninstallCleanup 2017-08-31 15:36:47 +01:00
Adam Warner
6b6d105c2f Merge branch 'development' into sqlite-dependency 2017-08-28 10:17:33 +01:00
Adam Warner
939c99cdbf
accidentally an entire group of letters. 2017-08-23 11:48:11 +01:00
WaLLy3K
2f36acae49 Remove errornous space 2017-08-23 11:51:16 +10:00
Adam Warner
e938132c53
accidentally a space 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-08-17 21:02:10 +01:00
Adam Warner
1b34286264
verbiage 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-08-17 20:33:53 +01:00
Adam Warner
54f4f6d2d7
Add "${INSTALLER_DEPS[@]}" to package array 
add `-f` to rm commands so that `set -e` is not kicked

Signed-off-by: Adam Warner <adamw@rner.email>
 2017-08-17 20:23:07 +01:00
Adam Warner
07e5e8e67a
need to include PH_TEST="true" so that the install script isn't run when sourcing it.. doh 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-08-17 20:03:19 +01:00
Adam Warner
3c25094495
No need to declare PKG_MANAGER, as it's already declared in basic-install 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-08-17 19:56:36 +01:00
Adam Warner
95e3a5944d
Initial overhaul of uninstall script sourcing distro_check() from basic-install.sh Totally untested as yet... 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-08-17 19:53:43 +01: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