Commit Graph

859 Commits

Author SHA1 Message Date
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
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
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
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
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
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