Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-24 13:50:17 +00:00
Code Issues Projects Releases Packages Wiki Activity
3471 commits 11 branches 109 tags 28 MiB
Commit graph

958 commits

Author SHA1 Message Date
DL6ER
f5c3dc5d9d
Improve download error message that is shown when downloading or verifying the binary failed 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-08-07 16:51:58 +02:00
Mcat12
e01eea8ba8
Remove PowerPC from FTL binaries 
It is no longer built, and may cause 404 errors if it attempts to
download the binary.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-08-06 21:15:16 -04:00
Dan Schaper
5b628a4c77
Merge branch 'development' into release/v4.0 2018-08-05 21:16:19 -07:00
Dan Schaper
993beab3b7
Changed wording. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-31 11:14:26 -07:00
Dan Schaper
06875f2cc9
Merge branch 'release/v4.0' into fix/parse_pihole-FTL.conf 2018-07-30 14:32:29 -07:00
Dan Schaper
448fc7231c
Installed to /etc/pihole as PI_HOLE_CONFIG_DIR variable. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-30 14:26:07 -07:00
Dan Schaper
d0d030bafc
Moved file creation to proper function. Included bash variables for file 
location. Set to pihole:pihole ownership with 644 permissions.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-30 14:02:18 -07:00
Dan Schaper
833131e15f
Merge pull request #2315 from pi-hole/fix/regex-file-ownership 
Allow PHP to edit the regex file if web is installed
 2018-07-30 06:36:20 -07:00
Dan Schaper
fb2810557a
Allow web user group to access regex.list 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-29 16:09:03 -07:00
Mcat12
57af0ba0a4
Use install to make the regex file 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-29 18:26:00 -04:00
Dan Schaper
17c1e64f7e
Moved FTL configuration copy in to scripts copy function. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-29 09:06:51 -07:00
Dan Schaper
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
Mcat12
a55cc55338
Only touch the regex file if it doesn't already exist 
The other permission calls will always be run so that the file is in the
expected state after install and repair.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-28 23:07:35 -04:00
Dan Schaper
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
Mcat12
1a8d5fb4a9
Allow PHP to edit the regex file if installed 
Fixes permissions error on the web interface when modifying the regex.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-28 21:57:39 -04:00
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
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