af13ceac24
Touch file as ${USER} instead of copying template.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2018-07-29 08:42:59 -07:00
b2fb3fd35a
Merge pull request #2310 from pi-hole/feature/pihole-FTL.conf
...
Include template pihole-FTL.conf
2018-07-28 20:04:39 -07:00
c73b5456eb
Fix "which" error leaking
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-07-28 21:12:05 -04:00
3d87398721
Fix check_service_active leaking error output
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-07-28 20:50:04 -04:00
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
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
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
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
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
9b1356ad01
Revert #2282
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-07-27 00:27:06 +01:00
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
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
9cd674b528
Merge pull request #2282 from RamSet/tweak/Port53
...
Updated port 53 check #2
2018-07-18 22:56:33 -04:00
5aea7eb860
corrected function indentation
...
Signed-off-by: RamSet <RamSet@gmail.com >
2018-07-17 20:46:18 -06:00
ec30df2020
Merge pull request #2277 from bcambl/centos_fedora_fixes
...
Installer fixes for Fedora & CentOS
2018-07-17 22:06:25 -04:00
bb33427c79
fixed parsing error
...
Signed-off-by: RamSet <RamSet@gmail.com >
2018-07-17 18:09:25 -06:00
28a16cebda
Addressed lint errors.
...
Signed-off-by: RamSet <RamSet@gmail.com >
2018-07-17 18:06:32 -06:00
49c79405bc
changed flag and variable name
...
Signed-off-by: RamSet <RamSet@gmail.com >
2018-07-17 18:04:50 -06:00
3098f32a07
Fixed intentation and corrected comments.
...
Signed-off-by: RamSet <RamSet@gmail.com >
2018-07-17 17:56:13 -06:00
69e06d89ff
Added missing for sourced file.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2018-07-16 22:36:58 -07:00
56b04017e7
Port 53 check updated with 4 spaces.
...
Signed-off-by: RamSet <RamSet@gmail.com >
2018-07-16 11:29:12 -06:00
fa9ecbdb81
add php-json to Fedora web deps
...
Signed-off-by: bcambl <blayne@blaynecampbell.com >
2018-07-15 15:41:04 -06:00
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
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
a323b126e5
Finished space conversion
...
Signed-off-by: Dan Schaper <dan.schaper@pihole.net >
2018-07-05 23:47:55 -07:00
0651f1bcd4
Merge pull request #2220 from rrobgill/installedphpcheck
...
Bugfix - Check version of installed php
2018-06-08 23:31:40 -04:00
11f0ade921
comments
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-06-09 13:18:36 +10:00
6381bdbf33
don't use major.minor for PHP 5
...
Signed-off-by: <rrobgill@protonmail.com >
2018-06-09 11:35:30 +10:00
4a75566a3b
Merge remote-tracking branch 'origin/development' into tweak/32bitOS_on_64bitCPU
2018-06-08 20:20:57 -04:00
52aa52c3b1
remove duplicate declaration
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-06-07 08:19:26 +10:00
6689e00e6a
Merge pull request #2212 from rrobgill/man-pages
...
Man page for pilhole-FTL
2018-06-05 21:33:54 -04:00
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
f2f6b6ede9
stickler complaints
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-06-05 09:29:03 +01:00
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
13b8e1a2ae
quotes.
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-06-05 15:09:07 +10:00
36dbdf955d
Update basic-install.sh
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-06-05 14:48:24 +10:00
714b6c98ef
codacy
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-06-05 14:45:01 +10:00
7181d7ae6a
Left that fi
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-06-05 14:30:18 +10:00
9422d57283
Check version of installed php
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-06-05 12:08:27 +10:00
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
ed7ebfd58d
man page for pihole-FTL
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-06-03 22:15:26 +10:00
23fbb3cf22
Merge pull request #2205 from rrobgill/manual-page
...
Manual page
2018-06-02 21:11:21 -04:00
9970f3786f
Requested change
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-06-02 14:14:55 +10:00
ef65bac79b
change status from INFO to CROSS
...
Signed-Off-By: Rob Gill <rrobgill@protonmail.com >
2018-06-02 11:27:35 +10:00
c0837c726f
blank space
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-06-02 11:18:13 +10:00
ce5429aba7
stickler
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-06-02 11:02:06 +10:00
aa191e9202
Update basic-install.sh
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-06-02 10:46:07 +10:00
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
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
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
