tyler.durden
/
pi-hole
mirror of https://github.com/pi-hole/pi-hole.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,050 Commits 10 Branches 109 Tags 32 MiB
Commit Graph

150 Commits

Author SHA1 Message Date
bcambl 21d4199a38 Merge branch 'development' into dns-hostname-fixes 2016-09-19 17:33:32 -06:00
Promofaux 3ed62d45f5 Source IP addresses from /etc/pihole/setupVars.conf 2016-09-16 23:05:08 +01:00
bcambl 640af300cb additional hostname checks in gravity.sh 
- Test if /etc/hostname exists before attempting to cat the file.
 - Add alternative hostname discovery via hostname command
 - Add an error message to stdout if unable to determine host fqdn
 2016-09-07 21:16:52 -06:00
Promofaux 6796b8bdad pass argument from pihole command to gravity for -f check 2016-08-19 23:06:56 +01:00
Promofaux 475d016029 hmmm 2016-08-19 22:52:55 +01:00
Promofaux 201304e678 fix variables in gravity to stop it using -f wether it's set or not 2016-08-19 22:51:09 +01:00
Promofaux f6ac0d73b4 Add force delete option 2016-08-17 19:08:55 +01:00
Promofaux ae47be0ce9 Add HelpFunc 2016-08-17 18:59:00 +01:00
Dan Schaper 024b741552 Merge pull request #490 from bcambl/fedora-armhf7 
Fedora Support
 2016-06-29 14:25:23 -07:00
Mcat12 4e95f4678f Merge pull request #540 from pi-hole/bugfix/curl-redirect 
Have `curl` auto-redirect
 2016-06-26 13:42:40 -04:00
Dan Schaper 7670b4e380 Mahakala User Agen modernization 
Update Curl User Agent for Maha list.
 2016-06-25 06:00:49 -07:00
Dan Schaper 636a9123b8 Have `curl` auto-redirect 
This should solve the redirection issue if a list is moved.
 2016-06-23 18:37:45 -07:00
bcambl 27a9642090 check for sudo via 'command -v' instead of dkpg-query 2016-06-11 15:58:49 -06:00
Jim Liu 08e95ed606 Update gravity.sh 
Change piholeIPfile to a permanent location.
 2016-04-22 01:40:42 +08:00
Jim Liu a5ad48aa18 Update gravity.sh 2016-04-21 23:40:44 +08:00
Promofaux ad574f5e90 Replace kill with killall 2016-04-16 15:52:38 +01:00
Promofaux 4941a657bf remove -s switch, as it turns out it worked afterall. 2016-04-16 12:59:40 +01:00
Promofaux 3d4bff9414 Add -s switch to kill command to increase compatability 2016-04-16 10:56:49 +01:00
Adam Warner 99a5b3a98a remove all mentions of spinner 2016-04-11 11:29:14 +01:00
Promofaux 8514f42d0d Correct variable name (Missing capital letter! whoops!) 2016-04-05 08:53:52 +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
nate 5347ee4896 Write verbose status of processes to debug log & Minor UI Fixes 2016-04-04 00:59:24 -05: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
nate 767b72fbfa Merged branch development into PiHoleController 2016-04-02 17:34:41 -05: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
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 28f2a1309e Merge branch 'development' 
Conflicts:
	automated install/uninstall.sh
 2016-03-31 20:25:54 -05:00
nate 45f24c8a85 Readded `cat`s that were originally considered UUOC 2016-03-30 19:56:11 -05:00
nate f8427ab789 Merge remote-tracking branch 'refs/remotes/pi-hole/development' 
Conflicts:
	README.md
	advanced/Scripts/blacklist.sh
	advanced/Scripts/whitelist.sh
	automated install/basic-install.sh
	gravity.sh
 2016-03-29 12:57:22 -05:00
Nate 31fc2bfeb7 Modified gravity.sh to point to new file locations and fixed permission issue 2016-03-29 00:25:40 -05:00
nate 37c1999965 Merged branch ScriptCleanup-Dev into development 2016-03-28 18:46:08 -05:00
nate 86dd4dd784 New spinner for gravity.sh 
Spinner in gravity.sh now matches basic-install.sh and uninstall.sh
 2016-03-28 18:45:55 -05:00
nate 00b65abd09 Minor changes to reflect new tool usage 
Removed symlink of scripts to u/l/b
Added copy for setupLCD to /opt/pihole/
New spinner added to gravity.sh to reflect new spinner in basic-install.sh and uninstall.sh
 2016-03-28 18:44:54 -05:00
nate f2150ee7e1 Merge conflict resolution 2016-03-28 13:07:51 -05:00
nate 2311b42bca Merge branch 'ScriptCleanup-Dev' 
Conflicts:
	README.md
	advanced/Scripts/blacklist.sh
	advanced/Scripts/piholeDebug.sh
	advanced/Scripts/whitelist.sh
	automated install/basic-install.sh
	gravity.sh
 2016-03-28 12:58:44 -05:00
nate 8ef4c12f97 Merge branch 'ScriptCleanup' 
Conflicts:
	README.md
	advanced/Scripts/blacklist.sh
	advanced/Scripts/whitelist.sh
	automated install/basic-install.sh
	gravity.sh
 2016-03-28 12:21:18 -05:00
nate 0b9e78df2c Cleaned code and added prompt for purge on uninstall 2016-03-26 16:57:01 -05:00
Carter Maxwell e4ddf8bc33 remove trailing whitespace gravity.sh 2016-03-05 21:13:43 -08:00
Adam Warner 88674e21cf Update gravity.sh 
Clear out `pihole.*` files from `/etc/pihole` as they are no longer needed.
 2016-02-21 20:45:56 +00:00
Promofaux bffc77e478 Add support for comments and blank lines in adlists.default/adlists.list 2016-02-21 17:45:25 +00:00
Adam Warner b7cb3df9bc Merge pull request #305 from fayetted/Issue_304 
Set file permisions on `/etc/pihole` directory. fixes #304
 2016-02-16 22:54:54 +00:00
Adam Warner 3a887af513 Addresses #313 
path to white and blacklist scripts moved to variables and updated to include full path
 2016-02-14 22:24:21 +00:00
Mcat12 af360a1a20 Merge pull request #298 from fayetted/Issue_297 
Fixes gravity_transport variable interpretation.
 2016-02-10 20:10:05 -05:00
Daniel Fayette 73bfbba5f7 Set file permisions on /etc/pihole 
Ensures file permisions on $piholeDir before reload/restart of dnsmasq
 2016-02-10 15:07:31 -06:00
Daniel Fayette a734927591 Fixes gravity_transport variable interpretation. 
Adding (") around Variables passed to function ensures
  spaces are handled and that missing arguments are
  accounted for.
 2016-02-09 19:51:03 -06:00
Promofaux 5111880edf remove erroneous -o 2016-01-27 22:35:52 +00:00
Promofaux b75b290351 adlists.default copied on each run of gravity. In case it has been overwritten 2016-01-27 21:14:23 +00:00