4a75566a3b
Merge remote-tracking branch 'origin/development' into tweak/32bitOS_on_64bitCPU
2018-06-08 20:20:57 -04:00
d9c924b472
Merge pull request #2225 from rrobgill/ftlinstall-local-vars
...
remove duplicate declaration in ftlinstall()
2018-06-06 19:51:06 -04:00
52aa52c3b1
remove duplicate declaration
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-06-07 08:19:26 +10:00
d254d6075a
First step from wildcards to regex lists for blocking
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-06-06 19:26:56 +02:00
8004080643
Additional command-line completion
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-06-06 22:37:43 +10:00
13878974a6
Merge pull request #4 from pi-hole/development
...
Development
2018-06-06 14:21:50 +10:00
6689e00e6a
Merge pull request #2212 from rrobgill/man-pages
...
Man page for pilhole-FTL
2018-06-05 21:33:54 -04:00
9b8a108f86
Merge pull request #2221 from pi-hole/tweak/statsnologs
...
Stats can still be generated without logging, no need for this sentence
2018-06-05 18:39:44 -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
5724cec1e5
Merge pull request #2219 from pi-hole/tweak/readme
...
Add coverage, remove projects, add Patreon link
2018-06-04 20:12:18 -05:00
35ca54d98f
add patreon and adjust affiliate links
...
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net >
2018-06-04 20:00:26 -05:00
7398a9ebf9
remove projects that are not compliant with our trademarks
...
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net >
2018-06-04 19:59:23 -05:00
4188fb536e
Privacy levels
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-06-05 10:25:51 +10:00
a11e5e2deb
dnsmasq
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-06-05 10:23:23 +10:00
5dd7e8c4d9
Merge pull request #2215 from rrobgill/web-console
...
Changes to --help text
2018-06-04 18:20:57 -04:00
40bc390c3b
Admin Console -> "Web Interface"
...
User facing --help text changes
Admin Console --> Web Interface
and additional branch option
Signed-Off-By: Rob Gill <rrobgill@protonmail.com >
2018-06-04 13:34:42 +10:00
8776348a80
Merge pull request #2 from pi-hole/development
...
Development
2018-06-04 10:05:58 +10:00
49fb4421dd
Requested changes to manpages - now align with docs.pi-hole.net/ftldns. weird bolding issues fixed
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-06-04 09:54:53 +10:00
d232f08933
Merge pull request #2208 from pi-hole/tweak/checkout
...
Don't run the installer when doing ftl checkout, instead just run the…
2018-06-03 14:35:35 -04: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
928d7186b5
Merge pull request #2214 from pi-hole/fix/gravity-comment
...
Fix gravity_ParseFileIntoDomains Awk comment
2018-06-03 10:52:46 -07:00
3149a95d6a
Fix gravity_ParseFileIntoDomains Awk comment
...
Signed-off-by: Mark Drobnak <newtoncat12@yahoo.com >
2018-06-03 13:33:33 -04:00
ed7ebfd58d
man page for pihole-FTL
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-06-03 22:15:26 +10:00
808e310799
Merge pull request #1 from pi-hole/development
...
Development
2018-06-03 20:54:03 +10:00
23fbb3cf22
Merge pull request #2205 from rrobgill/manual-page
...
Manual page
2018-06-02 21:11:21 -04:00
c11e643f13
Merge pull request #2207 from rrobgill/service-pihole-FTL-status-(sysV)
...
Fix service pihole-FTL status (sysV)
2018-06-02 11:23:38 -04:00
f5541860bc
Don't run the installer when doing ftl checkout, instead just run the ftl install functions
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-06-02 09:56:08 +01:00
83ff0055b6
Test and indicate status
...
This added function tests if pihole-FTL is running when the sysV.
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-06-02 15:30:51 +10:00
213f23aaf6
wildcard & space
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-06-02 14:46:45 +10:00
9970f3786f
Requested change
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-06-02 14:14:55 +10:00
d01a568b8b
Requested changes (also tabs -> spaces)
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-06-02 14:13:30 +10:00
e397884e1e
Merge pull request #2206 from rrobgill/lighttpd-service-test-cleanup
...
Lighttpd service test
2018-06-01 22:08:53 -04: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
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
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
ef17f4913b
Create pihole.8
...
Linux man page for pihole
Signed-off-by: Rob Gill <rrobgill@protonmail.com >
2018-06-02 09:39:51 +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
b7e8b91eec
Merge pull request #2196 from rrobgill/uninstall-formatting
...
Style: uninstall.sh (Tabs to spaces)
2018-06-01 17:27:58 -04:00
3be1904653
basic-install.sh: fix "install: invalid user ''"
...
refs #1767
2018-06-01 10:20:40 +02:00
Mcat12