arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 14:58:08 +00:00
Code Issues Releases Wiki Activity
4,083 Commits 9 Branches 109 Tags 20 MiB
edcdf9f619
Commit Graph

1094 Commits

Author SHA1 Message Date
Mcat12
c73b5456eb
Fix "which" error leaking 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-28 21:12:05 -04:00
Mcat12
3d87398721
Fix check_service_active leaking error output 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-28 20:50:04 -04:00
Mark Drobnak
47b56d6123
Fix wrong git command flag 
I could not find documentation on a `--head` flag, but there is a `--heads` flag which does the same thing.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-27 23:27:44 -04:00
Dan Schaper
512d2dd5f8
Source git repo and not /opt location. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-27 15:47:20 -07:00
Dan Schaper
ad20d5ac1c
Remove -t SOURCE and DIRECTORY reversal flag on install. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-27 15:39:37 -07:00
Dan Schaper
b79ff05e29
Move template files to own subdir. Include pihole-FTL.conf in templates. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-27 15:21:25 -07:00
Borats Nolan
32b50f8188 Change the word "folder" to "directory" since the pi-hole is intended to run on rpi with Linux on it. 
Signed-off-by: Borats Nolan <borats@i.dont.use.email>
 2018-07-28 02:35:39 +10:00
Dan Schaper
32cf94fc74
Merge pull request #2297 from pi-hole/bugfix/locales 
Fixed locale issue, do not parse for string.
 2018-07-26 16:44:52 -07:00
Adam Warner
9b1356ad01
Revert #2282 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-07-27 00:27:06 +01:00
Peter Robinson
45521b377a Use ip route rather than old net-tools route in chronometer.sh 
The only use of net-tools is the use of route in chronometer.sh so
instead use the same method as used in piholeDebug.sh to get the
default gateway so there's no need to depend on net-tools anylonger.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
 2018-07-26 17:46:51 +01:00
Dan Schaper
46a366635c
Fixed locale issue, do not parse for string. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-26 05:30:05 -07:00
Dan Schaper
1877128fc4
Removes empty comment lines in basic-install.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-20 10:38:13 -07:00
Mark Drobnak
9cd674b528
Merge pull request #2282 from RamSet/tweak/Port53 
Updated port 53 check #2
 2018-07-18 22:56:33 -04:00
RamSet
5aea7eb860 corrected function indentation 
Signed-off-by: RamSet <RamSet@gmail.com>
 2018-07-17 20:46:18 -06:00
Mark Drobnak
ec30df2020
Merge pull request #2277 from bcambl/centos_fedora_fixes 
Installer fixes for Fedora & CentOS
 2018-07-17 22:06:25 -04:00
RamSet
bb33427c79 fixed parsing error 
Signed-off-by: RamSet <RamSet@gmail.com>
 2018-07-17 18:09:25 -06:00
RamSet
28a16cebda Addressed lint errors. 
Signed-off-by: RamSet <RamSet@gmail.com>
 2018-07-17 18:06:32 -06:00
RamSet
49c79405bc changed flag and variable name 
Signed-off-by: RamSet <RamSet@gmail.com>
 2018-07-17 18:04:50 -06:00
RamSet
3098f32a07 Fixed intentation and corrected comments. 
Signed-off-by: RamSet <RamSet@gmail.com>
 2018-07-17 17:56:13 -06:00
Dan Schaper
69e06d89ff
Added missing for sourced file. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-16 22:36:58 -07:00
RamSet
56b04017e7 Port 53 check updated with 4 spaces. 
Signed-off-by: RamSet <RamSet@gmail.com>
 2018-07-16 11:29:12 -06:00
bcambl
fa9ecbdb81 add php-json to Fedora web deps 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-07-15 15:41:04 -06:00
bcambl
2bf6b29b8f trigger an install/upgrade of PHP after enabling the Remi repository 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-07-15 15:40:44 -06:00
Dan Schaper
9dba9fb366
Convert multiline echos to individual echo statements so they don't lead with different amounts of space. 
Signed-off-by: Dan Schaper <dan.schaper@pihole.net>
 2018-07-06 21:29:20 -07:00
Dan Schaper
a323b126e5
Finished space conversion 
Signed-off-by: Dan Schaper <dan.schaper@pihole.net>
 2018-07-05 23:47:55 -07:00
Mark Drobnak
0651f1bcd4
Merge pull request #2220 from rrobgill/installedphpcheck 
Bugfix - Check version of installed php
 2018-06-08 23:31:40 -04:00
Rob Gill
11f0ade921
comments 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-09 13:18:36 +10:00
Rob Gill
6381bdbf33
don't use major.minor for PHP 5 
Signed-off-by: <rrobgill@protonmail.com>
 2018-06-09 11:35:30 +10:00
Mcat12
4a75566a3b
Merge remote-tracking branch 'origin/development' into tweak/32bitOS_on_64bitCPU 2018-06-08 20:20:57 -04:00
Rob Gill
52aa52c3b1
remove duplicate declaration 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-07 08:19:26 +10:00
Mark Drobnak
6689e00e6a
Merge pull request #2212 from rrobgill/man-pages 
Man page for pilhole-FTL
 2018-06-05 21:33:54 -04:00
Rob Gill
a3569d88c9
Version strings & bash. 
Fixed up the version checking. Thanks for your help @dschaper.

No longer uses the version string as returned, but uses the major and minor version numbers extracted from it, against the minimum of 5.5. 

Tested against real install of php 7.0, (and the version check logic separately tested against a variety of artificial version numbers, of multiple digits for both major and minor version. - Lesson learned, I'm never trusting bash again)

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-05 21:42:42 +10:00
Adam Warner
f2f6b6ede9
stickler complaints 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-06-05 09:29:03 +01:00
Adam Warner
7f81cfd45a
Stats can still be generated without logging, no need for this sentence 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-06-05 09:09:35 +01:00
Rob Gill
13b8e1a2ae
quotes. 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-05 15:09:07 +10:00
Rob Gill
36dbdf955d
Update basic-install.sh 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-05 14:48:24 +10:00
Rob Gill
714b6c98ef
codacy 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-05 14:45:01 +10:00
Rob Gill
7181d7ae6a
Left that fi 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-05 14:30:18 +10:00
Rob Gill
9422d57283
Check version of installed php 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-05 12:08:27 +10:00
Dan Schaper
feba4da0b8
Merge pull request #2161 from pi-hole/centos_remi-php7 
CentOS install re-worked to provide PHP7 via Remi Repository
 2018-06-03 10:54:32 -07:00
Rob Gill
ed7ebfd58d man page for pihole-FTL 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-03 22:15:26 +10:00
Mark Drobnak
23fbb3cf22
Merge pull request #2205 from rrobgill/manual-page 
Manual page
 2018-06-02 21:11:21 -04:00
Rob Gill
9970f3786f
Requested change 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-02 14:14:55 +10:00
Rob Gill
ef65bac79b
change status from INFO to CROSS 
Signed-Off-By: Rob Gill <rrobgill@protonmail.com>
 2018-06-02 11:27:35 +10:00
Rob Gill
c0837c726f
blank space 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-02 11:18:13 +10:00
Rob Gill
ce5429aba7
stickler 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-02 11:02:06 +10:00
Rob Gill
aa191e9202
Update basic-install.sh 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-02 10:46:07 +10:00
Rob Gill
a8f0283e93
Update basic-install.sh 
This hands checking of lighttpd's status over to the existing check_service_active() function.

All other checks of service status within the install script are handled by this function.

Use of existing function:
Avoids duplication of service detection logic.
Uses return code to determine status, thereby avoids parsing text to determine status, and reliance on English language locale to determine activity, (which may also be broken on some systems (# 2204)

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-02 10:11:11 +10:00
Rob Gill
999e47a26c
Remove manual page 
Tests for presence of pihole man page.
If it is present, deletes it and runs man-db to rebuild manual database.

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-02 09:50:52 +10:00
Rob Gill
a8103ca22d
Manual page install function 
Function to install man page.
Verifies that man pages are installed, and correct directory for the pihole manpage is present.
Copies file, and runs man-db to update man page database.

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-02 09:45:04 +10:00
Mark Drobnak
1a30043776
Merge pull request #1768 from Al2Klimov/bugfix/install-invalid-user 
basic-install.sh: fix "install: invalid user ''"
 2018-06-01 19:27:51 -04:00
Alexander A. Klimov
3be1904653 basic-install.sh: fix "install: invalid user ''" 
refs #1767
 2018-06-01 10:20:40 +02:00
Rob Gill
cadd0e4244
move code back to correct location 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-01 14:03:13 +10:00
Rob Gill
f35ea9a3ca
replace code i missed during merge 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-01 11:57:59 +10:00
Rob Gill
0971630e01
Merge branch 'development' into uninstall-formatting 2018-06-01 07:17:02 +10:00
Rob Gill
b60a9fa371
merge (#2) 
* remove package_check to avoid situations like #1760

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

* Prevent redundant entries in to adlists.list

Grep ${args[3]} and only add if grep -c -eq 0

Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>

* lan to local

Reduced differences.

Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>

* Require exact match

Updated to require an exact match to reduce false-positives, as suggested by DL6ER.

Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>

* fix empty ports on some systems

Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>

* debug user locale; improve function to parse variables and files

Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>

* Split declaration and population for stickler.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

* implement dschapers suggestions--better command, less subshells, and finer formatting

Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>

* flip uninstall compatability check

Signed-off-by: bcambl <blayne@blaynecampbell.com>

* Update index.php

Avoiding calling empty() on a function allows this to work under PHP5. Making the check for blocklist generation in this way instead is compatible with both PHP5 and PHP7.

Signed-off-by: Rob Gill <rrobgill@protonmail.com>

* Update index.php

thanks stickler-ci  .......

Signed-off-by: Rob Gill <rrobgill@protonmail.com>

* changes as requested 

changes as requested 

Signed-off-by: Rob Gill <rrobgill@protonmail.com>

* oh stickler bot...

accidentally a space

Signed-off-by: Rob Gill <rrobgill@protonmail.com>

* linting: Double quote to prevent globbing and word splitting

Signed-off-by: bcambl <blayne@blaynecampbell.com>

* unbind resolved on ubuntu 18.04

Stop systemd-resolved from interfering with dnsmasq/ftl
Signed-off-by: Rob Gill <rrobgill@protonmail.com>

* restore resolvd.conf

If dnsmasq is removed, resolved will need to be restored.

Signed-off-by: Rob Gill <rrobgill@protonmail.com>

* Update uninstall.sh

Signed-off-by: Rob Gill <rrobgill@protonmail.com>>

* Minor correction for double instance of the word "found".

Signed-off-by: RamSet <RamSet@gmail.com>

* message text

Signed-off-by: Rob Gill <rrobgill@protonmail.com>>

* relocate as function

The check for systemd-resolved DNSStubListener, and disabling as necessary is a new function, called just prior to start_service pihole-FTL.
The check for ubuntu bionic 18.04 specifically is removed.
The check if resolved is enabled is made with check_service_active()
An additional check that the dnsstublistener is enabled is made.

Signed-off-by: Rob Gill <rrobgill@protonmail.com>

* Regex & case fix

grep & sed regexes  match commented or uncommented

Signed-off-by: Rob Gill <rrobgill@protonmail.com>

* Update basic-install.sh

Force reloading of relsolved config where available

Signed-off-by: Rob Gill <rrobgill@protonmail.com>

* reload resloved

reload resolved config if possible, restart otherwise

Signed-off-by: Rob Gill <rrobgill@protonmail.com>

* user-facing messages

Signed-off-by: Rob Gill <rrobgill@protonmail.com>

* move & clarify comments
 2018-06-01 07:14:54 +10:00
Mark Drobnak
8523c0da32
Merge pull request #2180 from rrobgill/resolved/ubuntu-bionic 
Disable SystemD's DNS Stub Resolver On Install
 2018-05-31 09:32:49 -04:00
Rob Gill
f0dfa4d53d
Stickler-bot... 
Signed-Off-By: Rob Gill <rrobgill@protonmail.com>
 2018-05-31 13:43:49 +10:00
Rob Gill
f2bedddce4
Changes from #2167 converted to spaces 
Signed-Off-By: Rob Gill <rrobgill@protonmail.com>
 2018-05-31 13:37:52 +10:00
Rob Gill
552138e851
Appease stickler-bot. 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-05-31 13:24:09 +10:00
Rob Gill
ff71379a8e
Convert from two to four space indetation 
Signed-Off-By: Rob Gill <rrobgill@protonmail.com>
 2018-05-31 13:14:18 +10:00
Mcat12
34f5db9ed4
Merge branch 'development' into uninstall_compat_check 
# Conflicts:
#	automated install/uninstall.sh
 2018-05-30 22:08:20 -04:00
Mark Drobnak
87506852d1
Merge pull request #1761 from pi-hole/tweak/Uninstall 
Tweak/uninstall
 2018-05-30 21:19:59 -04:00
Rob Gill
e6893bc419
Update uninstall.sh 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-05-29 19:03:00 +10:00
Rob Gill
ebeab06710
Appease Stickler-bot 
So... originally no changes were made to the code, but Stickler-bot was unimpressed, so I've followed its suggestions.

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-05-29 18:59:55 +10:00
Rob Gill
1911c3690d
Style/Tabs to spaces 
uninstall.sh contains a mix of tabs and spaces for indentation in different parts of the file.

Everywhere that used tabs has been converted to spaces, compatible with the indentation style used in basic_install.sh

No code has been altered, only the use of tabs and spaces in indention.

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-05-29 17:59:39 +10:00
Rob Gill
20ccb7b558
move & clarify comments 2018-05-21 08:16:53 +10:00
Rob Gill
8cfe89604a
user-facing messages 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-05-17 07:44:07 +10:00
Rob Gill
15f0ba839f
reload resloved 
reload resolved config if possible, restart otherwise

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-05-16 07:35:22 +10:00
Rob Gill
c400b914e5
Update basic-install.sh 
Force reloading of relsolved config where available

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-05-16 07:28:32 +10:00
Rob Gill
a431c829cb
Regex & case fix 
grep & sed regexes  match commented or uncommented

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-05-16 07:11:23 +10:00
Rob Gill
25d0e125e5
relocate as function 
The check for systemd-resolved DNSStubListener, and disabling as necessary is a new function, called just prior to start_service pihole-FTL.
The check for ubuntu bionic 18.04 specifically is removed.
The check if resolved is enabled is made with check_service_active()
An additional check that the dnsstublistener is enabled is made.

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-05-15 20:23:36 +10:00
Rob Gill
b89a78ce17
message text 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>>
 2018-05-15 19:42:18 +10:00
Rob Gill
97809277df
Update uninstall.sh 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>>
 2018-05-14 19:50:58 +10:00
Rob Gill
3d3e7a330c
restore resolvd.conf 
If dnsmasq is removed, resolved will need to be restored.

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-05-14 19:44:23 +10:00
Rob Gill
adf2275018
unbind resolved on ubuntu 18.04 
Stop systemd-resolved from interfering with dnsmasq/ftl
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-05-14 19:38:12 +10:00
bcambl
c1ecfbfe63 linting: Double quote to prevent globbing and word splitting 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-05-12 19:39:17 -06:00
bcambl
d3dda443cd flip uninstall compatability check 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-05-04 00:02:47 -06:00
bcambl
ec3802c180 add 'which' dependency (missing on Fedora minimal) 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-05-03 23:41:42 -06:00
Adam Warner
76654c7856
Actually check for dnsmasq's existence before attempting to interact with it's service 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-05-03 21:16:31 +01:00
Adam Warner
a6e4b0fea5
- Test for existence of remote non-master branch of FTL before attemtping to check for update 
- Move some functions from checkout to basic-install
- provide helpful error message on downlaod not existing

Signed-off-by: Adam Warner <adamw@rner.email>
 2018-05-01 23:15:26 +01:00
bcambl
8ad37af70e CentOS install re-worked to include PHP7 via Remi repository 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-05-01 00:58:21 -06:00
Adam Warner
a07891e3e6
0 is not 1!! 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-30 23:53:51 +01:00
Adam Warner
e946a35b18
Move dnsmasq check into FTLcheckUpdate 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-30 23:50:35 +01:00
Adam Warner
68d7337f98
switch up dnsmasq detection logic 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-30 23:42:41 +01:00
Adam Warner
8b4198fd8d
Merge pull request #1835 from Fauxsys/development 
Fix for unattended installations #1767 #1768 #1834
 2018-04-30 23:06:46 +01:00
Adam Warner
e17e69604c
Merge branch 'development' into new/RemoveDefaultBlocklists 2018-04-29 18:40:53 +01:00
Adam Warner
0c8a32b9ae
No need to stop services 
This causes issues on a `pihole -r reconfigure`

Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-29 18:27:10 +01:00
Adam Warner
d8c60aaae7
Merge pull request #2142 from bcambl/fix_fedora_ip_check 
Fix static IP checking on Fedora
 2018-04-29 14:36:07 +01:00
Adam Warner
3216d65353
Merge branch 'development' into new/RemoveDefaultBlocklists 2018-04-29 13:39:17 +01:00
bcambl
1d8ea9e869 Fix static IP checking on Fedora 
This bug was introduced by #1758 where the CIDR was removed from the static IP check.
The CIDR was acting as a boundary so we need to test for a boundary or a slash character.

Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-04-23 06:42:36 -06:00
Adam Warner
8ead0b5483
@fourdee dropped this: / 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-23 11:59:39 +01:00
Fauxsys
72c081cfd6 Fix for unattended installations #1767 #1768 #1834 
Removed updatePihole() function and updated if/then statements in installPihole() and main(). Corrected minor typos.

Signed-off-by: Fauxsys <fiber.cipher@gmail.com>
 2018-04-23 04:53:57 -04:00
Dan
acfc49fd41
Merge branch 'development' into Install-Web-Server 2018-04-22 09:23:11 +01:00
Daniel (Fourdee)
60bcca54eb Minor 
+ indentation
 2018-04-21 08:29:21 +01:00
Daniel (Fourdee)
eccea8a911 Minor 
+ Fix indentation
+ Stick with case, add "On" to provide INFO print out, although its not
technically required as INSTALL_WEB_SERVER=true is default value.
 2018-04-21 08:27:31 +01:00
Michele Bologna
55fce489bc Fix: add psmisc as dependency 
Debian 9.4 does not install `psmisc` by default and the following error will happen during installation:

```
  [✗] /usr/local/bin/pihole: line 353: killall: command not found
/usr/local/bin/pihole: line 364: killall: command not found
```

This patch adds `psmisc` (that contains `killall`) as dependency

Signed-off-by: Michele Bologna <michele.bologna@gmail.com>
 2018-04-19 23:41:23 +02:00
Daniel (Fourdee)
c2c1dc7469 Ensuring bot pleasure 
https://github.com/pi-hole/pi-hole/pull/2115#pullrequestreview-113066748
 2018-04-18 04:38:07 +01:00
Daniel (Fourdee)
47c1071bb8 Minor 
+ Add info in regards to disabling web server install:
https://github.com/pi-hole/pi-hole/pull/2115
 2018-04-18 04:24:48 +01:00
Daniel (Fourdee)
e401651f09 Update https://github.com/pi-hole/pi-hole/pull/2115 
+ Patch existing systems with the new variable changes using
'accountForRefactor'
+ Prompt user to install webserver
 2018-04-18 04:11:32 +01:00
Adam Warner
7455ac9bfb
Run chooseBlocklists on EVERY reconfigure, not only if the adlist file does not esist. 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-17 19:46:36 +01:00
Adam Warner
b6b1dcb275
delete adlists.list if user cancels out of this dialog 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-17 19:35:46 +01:00
Adam Warner
2e4f49a223
Default all to on, change up wording. This commit can be rolled back, it's just an option! 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-17 17:10:53 +01:00
Adam Warner
88d4108f92
- Add new whipstail to choose from example blocklists on new install 
- remove adlists.default
- do not copy non-existent adlists.default on run of gravity

Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-17 10:33:06 +01:00
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