Adam Warner
f6edd435af
Merge pull request #429 from pi-hole/white-black-piholeconf
...
Ensure all scripts honour pihole.conf
fixed small bug where source lists were being updated on every run of gravity
2016-04-04 23:52:11 +01:00
Promofaux
0c0dd914f7
Fix source lists not being skipped if they are already up to date
2016-04-04 23:48:34 +01:00
Promofaux
c6405bc93b
Ensure addn-hosts value is updated in /etc/dnsmasq.d/01-pihole.conf if user has a custom value set in pihole.conf
2016-04-04 23:38:46 +01:00
Promofaux
cdffdfbded
merge master > development
2016-04-04 22:18:53 +01:00
Promofaux
0bbfb323b1
make whitelist honour pihole.conf file
2016-04-04 21:08:56 +01:00
Promofaux
4f08359786
Make blacklist honour pihole.conf file
2016-04-04 21:08:45 +01:00
Adam Warner
7efb17537a
Merge pull request #427 from pi-hole/SystemctlDebugLogging
...
Write verbose status of processes to debug log & Minor UI Fixes
2016-04-04 14:59:22 +01:00
nate
7e06769d44
Double quoting
2016-04-04 01:03:05 -05:00
nate
5347ee4896
Write verbose status of processes to debug log & Minor UI Fixes
2016-04-04 00:59:24 -05:00
Adam Warner
3e6dd9ea9e
Merge pull request #424 from pi-hole/PiHoleController
...
Indentation fix
2016-04-03 23:28:03 +01:00
nate
10f363e9e7
Merged branch development into PiHoleController
2016-04-03 17:26:37 -05:00
nate
69e8c014c3
Indentation fix
2016-04-03 17:25:48 -05:00
Adam Warner
dbb40e1dda
Merge pull request #416 from pi-hole/PiHoleController
...
Add in Pi hole controller
2016-04-03 23:15:00 +01:00
Promofaux
d710b97276
Fix issue raised in #421 (Use variable instead of hardcoded path, do not delete user created pihole.conf!)
2016-04-03 22:10:04 +01:00
Promofaux
0e6e8040ba
Change spinstr to match install and uninstall scripts
2016-04-03 21:54:16 +01:00
Promofaux
c6fb0bad4b
change spinstr to match spinstr in basic-install.sh
2016-04-03 21:45:00 +01:00
Promofaux
2d08217173
Tidy up For loops, clean up whitespace
2016-04-03 21:43:36 +01:00
Promofaux
36645d9335
Add check for existing files in /usr/local/bin left over from previous version, as those scripts are replaced with pihole <command> script.
2016-04-03 18:39:22 +01:00
Promofaux
97d3aedba1
Add some output to the log flush
2016-04-03 18:27:18 +01:00
Promofaux
5976b20aec
Fix spelling mistake, remove unaccessed function.
2016-04-03 18:25:39 +01:00
Promofaux
ad8573c739
Pedantic change, stops my editor from treating all of the code as one long sting in ' ' (as the ' was escaped with \)
2016-04-03 18:10:50 +01:00
nate
7f9410fd34
Added uninstall option to bash-completion
2016-04-02 19:45:44 -05:00
nate
71133f6b59
Spelling error fix...
2016-04-02 19:42:33 -05:00
nate
5d5d6c2c70
handle case where parent directories do not exist
2016-04-02 19:31:26 -05:00
nate
37fa462db5
Erraneous call to SUDO removed
2016-04-02 19:24:19 -05:00
nate
1a2046a7eb
Added uninstall option to pihole command. Minor fixes
2016-04-02 19:20:54 -05:00
nate
3dff7e80fc
Fixed path to /etc/bash_completion.d/
2016-04-02 18:52:03 -05:00
nate
6eea9239a7
Merged branch development into PiHoleController
2016-04-02 18:41:36 -05:00
nate
75f1969bd2
Set executable permissions of pihole and changed installer to invoke sudo for gravity.sh.
...
Note: We invoke gravity.sh with sudo in other places, so ignore the removed comment.
2016-04-02 18:39:09 -05:00
Mcat12
e97755eb91
Fix missing cats
2016-04-02 19:28:30 -04:00
Mcat12
b938949cdb
Merge pull request #419 from pi-hole/piholeDebugInstallFix
...
Fixed missing `cp` of `piholeDebug.sh` to /opt/pihole
2016-04-02 19:20:41 -04:00
nate
447af208b3
Fixed missing cp of piholeDebug.sh to /opt/pihole
2016-04-02 17:59:59 -05:00
nate
d47fbbbe96
Mcat12 requests. Added bash-completion support
2016-04-02 17:58:10 -05:00
nate
767b72fbfa
Merged branch development into PiHoleController
2016-04-02 17:34:41 -05:00
Adam Warner
b94a8da9d6
Merge pull request #418 from gitter-badger/gitter-badge
...
Add a Gitter chat badge to README.md
2016-04-02 14:44:24 +01:00
The Gitter Badger
12b5be239b
Add Gitter badge
2016-04-02 13:31:49 +00:00
Mcat12
0fbf72bb09
Change dummy domain and show device's hostname in ping
...
* Change dummy domain
Allows users to access Pi-hole console with my.pi-hole.net instead of the IP address
* Cleaned up formatting
* Put device hostname at the top of the list
Changed my.pi-hole.net to pi.hole and placed it under the device hostname. This way, ping will return the device hostname but you still can access the web interface with pi.hole/admin
2016-04-01 20:19:47 -04:00
Adam Warner
ae2117ff5a
Merge pull request #411 from nate-ubiquisoft/development
...
debugPihole.sh, uninstall.sh bug fixes and improvements, script cleanup
2016-04-01 20:36:45 +01:00
nate
b80821c4b7
Merged branch development into PiHoleController
2016-04-01 12:17:41 -05:00
nate
cf01b5a002
Readded cat calls to fix permission issue
2016-04-01 12:17:05 -05:00
nate
bb66d559e7
Merge branch 'development'
...
Conflicts:
gravity.sh
2016-04-01 11:08:46 -05:00
nate
7b8fa3b922
Permissions changed for /etc/pihole and cleaned up some output
2016-04-01 01:11:59 -05:00
nate
777676b525
Made uninstall.sh and pihole.sh executable.
2016-03-31 20:33:15 -05:00
nate
28f2a1309e
Merge branch 'development'
...
Conflicts:
automated install/uninstall.sh
2016-03-31 20:25:54 -05:00
nate
4b0a7c2252
Added 01-pihole.conf to be removed on uninstall regardless of removing dnsmasq
2016-03-30 20:23:24 -05:00
nate
2625d9f7fe
Made piholeDebug.sh +x
2016-03-30 20:09:19 -05:00
nate
45f24c8a85
Readded cats that were originally considered UUOC
2016-03-30 19:56:11 -05:00
nate
5f7c11f495
Sudo added to ifconfig to ensure it runs if debug not run as root
2016-03-30 19:51:09 -05:00
nate
ec4d2d65a6
PromoFaux request: Detailed adlists.list output
...
Now tells user (and logs to pihole_Debug.log) that the adlists.default file is in use
2016-03-30 19:49:39 -05:00
nate
3e20f5dd3c
Merged branch development into development
2016-03-29 17:04:43 -05:00
