RamSet
bb33427c79
fixed parsing error
...
Signed-off-by: RamSet <RamSet@gmail.com>
6 years ago
RamSet
28a16cebda
Addressed lint errors.
...
Signed-off-by: RamSet <RamSet@gmail.com>
6 years ago
RamSet
49c79405bc
changed flag and variable name
...
Signed-off-by: RamSet <RamSet@gmail.com>
6 years ago
RamSet
3098f32a07
Fixed intentation and corrected comments.
...
Signed-off-by: RamSet <RamSet@gmail.com>
6 years ago
RamSet
56b04017e7
Port 53 check updated with 4 spaces.
...
Signed-off-by: RamSet <RamSet@gmail.com>
6 years ago
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>
6 years ago
Dan Schaper
a323b126e5
Finished space conversion
...
Signed-off-by: Dan Schaper <dan.schaper@pihole.net>
6 years ago
Mark Drobnak
0651f1bcd4
Merge pull request #2220 from rrobgill/installedphpcheck
...
Bugfix - Check version of installed php
6 years ago
Rob Gill
11f0ade921
comments
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
6381bdbf33
don't use major.minor for PHP 5
...
Signed-off-by: <rrobgill@protonmail.com>
6 years ago
Mcat12
4a75566a3b
Merge remote-tracking branch 'origin/development' into tweak/32bitOS_on_64bitCPU
6 years ago
Rob Gill
52aa52c3b1
remove duplicate declaration
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Mark Drobnak
6689e00e6a
Merge pull request #2212 from rrobgill/man-pages
...
Man page for pilhole-FTL
6 years ago
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>
6 years ago
Adam Warner
f2f6b6ede9
stickler complaints
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
7f81cfd45a
Stats can still be generated without logging, no need for this sentence
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Rob Gill
13b8e1a2ae
quotes.
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
36dbdf955d
Update basic-install.sh
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
714b6c98ef
codacy
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
7181d7ae6a
Left that fi
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
9422d57283
Check version of installed php
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Dan Schaper
feba4da0b8
Merge pull request #2161 from pi-hole/centos_remi-php7
...
CentOS install re-worked to provide PHP7 via Remi Repository
6 years ago
Rob Gill
ed7ebfd58d
man page for pihole-FTL
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Mark Drobnak
23fbb3cf22
Merge pull request #2205 from rrobgill/manual-page
...
Manual page
6 years ago
Rob Gill
9970f3786f
Requested change
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
ef65bac79b
change status from INFO to CROSS
...
Signed-Off-By: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
c0837c726f
blank space
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
ce5429aba7
stickler
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
aa191e9202
Update basic-install.sh
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
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>
6 years ago
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>
6 years ago
Mark Drobnak
1a30043776
Merge pull request #1768 from Al2Klimov/bugfix/install-invalid-user
...
basic-install.sh: fix "install: invalid user ''"
6 years ago
Alexander A. Klimov
3be1904653
basic-install.sh: fix "install: invalid user ''"
...
refs #1767
6 years ago
Rob Gill
20ccb7b558
move & clarify comments
6 years ago
Rob Gill
8cfe89604a
user-facing messages
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
c400b914e5
Update basic-install.sh
...
Force reloading of relsolved config where available
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
a431c829cb
Regex & case fix
...
grep & sed regexes match commented or uncommented
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
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>
6 years ago
Rob Gill
b89a78ce17
message text
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>>
6 years ago
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>
6 years ago
bcambl
ec3802c180
add 'which' dependency (missing on Fedora minimal)
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
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>
6 years ago
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>
6 years ago
bcambl
8ad37af70e
CentOS install re-worked to include PHP7 via Remi repository
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
Adam Warner
a07891e3e6
0 is not 1!!
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
e946a35b18
Move dnsmasq check into FTLcheckUpdate
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
68d7337f98
switch up dnsmasq detection logic
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
8b4198fd8d
Merge pull request #1835 from Fauxsys/development
...
Fix for unattended installations #1767 #1768 #1834
6 years ago
Adam Warner
e17e69604c
Merge branch 'development' into new/RemoveDefaultBlocklists
6 years ago
Adam Warner
0c8a32b9ae
No need to stop services
...
This causes issues on a `pihole -r reconfigure`
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago