Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-30 10:03:17 +00:00
Code Issues Projects Releases Packages Wiki Activity
6428 commits 8 branches 109 tags 27 MiB
Commit graph

6428 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Schaper
8fa897aadb Add back in sourcing files (setupVars.conf) and tweak ip_check 2016-10-25 21:39:28 -07:00
Dan Schaper
f549618d12 Move environment IPv6 interface check to ip_check and fix IPv6 source routing issue. 2016-10-25 21:25:57 -07:00
Dan Schaper
2fa47aaf31 Source routing is deprecated by RFC5095 2016-10-25 20:53:18 -07:00
Dan Schaper
b0874fb23a Temporarily get rid of gateway sourcing from setupVars, temporarily. 2016-10-25 19:53:00 -07:00
Dan Schaper
fb70fd77e8 Prototype version_check, add helper functions for logging and echo. 2016-10-25 17:50:14 -07:00
Dan Schaper
01f17f9cbb Reduce header verbosity. New header writer. 2016-10-25 17:19:33 -07:00
Promofaux
4c853defb2 add if traps to check for existence of whitelist.txt / blacklist.txt 2016-10-25 22:27:35 +01:00
Adam Warner
bd0db56ba0 actually fix up logic 2016-10-25 15:29:02 +01:00
Adam Warner
95f0b3710d fix up logic 2016-10-25 15:27:13 +01:00
Adam Warner
e0ac109dd1 remove hostname insertion into gravity.list from gravity.sh 2016-10-25 15:07:29 +01:00
Adam Warner
86349527e7 replace HOSTNAME tokens in 01-pihole.conf 2016-10-25 15:06:37 +01:00
Adam Warner
18005ceee8 add hostname lines in 01-pihole.conf 2016-10-25 15:03:49 +01:00
Adam Warner
7653b3d088 Remove pi.hole references in gravity.sh 2016-10-25 15:01:16 +01:00
Adam Warner
911053f63f Replace IPv4 and IPv6 tokens in 01-pihole.conf for pi.hole resolution. 2016-10-25 15:00:18 +01:00
Adam Warner
eb52f81a5c add pi.hole entries to 01-pihole.conf 2016-10-25 14:54:10 +01:00
Adam Warner
4839953328 Merge pull request #844 from pi-hole/EnforceTemplate 
Update ISSUE_TEMPLATE.md
 2016-10-25 17:57:06 +06:00
Adam Warner
aba0d93fda Merge pull request #814 from pi-hole/promoTweaksTheSecond 
Various tweaks and fixes: Part 2 (Plus Pause/Resume button functionality!)
 2016-10-25 17:43:40 +06:00
Adam Warner
0de74c0448 Merge pull request #848 from pi-hole/PromoFaux-patch-1 
Update .pullapprove.yml
 2016-10-25 17:38:04 +06:00
Adam Warner
ee927346b7 Update .pullapprove.yml 
Update to V2. Only require 2 approvers on development, and 3 on master
 2016-10-25 12:36:05 +01:00
Dan Schaper
2f8015cbca Update PULL_REQUEST_TEMPLATE.md 2016-10-24 14:50:47 -07:00
Dan Schaper
f3bf7c4b38 Update ISSUE_TEMPLATE.md 2016-10-24 14:48:38 -07:00
Adam Warner
e37c4d57da Merge pull request #842 from pi-hole/Fix/template-spacing 
fix check box spacing
 2016-10-25 02:32:34 +06:00
Jacob Salmela
acff90c000 fix check box spacing 
I have seen several issues/PRs with the extra space.  removing the
extra whitespace might help to keep the formatting when being submitted.
 2016-10-24 14:58:13 -05:00
Adam Warner
5f9e72dd71 Merge pull request #835 from pi-hole/debugFixes 
Debug script tweaks.
 2016-10-24 19:40:27 +06:00
Adam Warner
be0bcb8f7d Merge pull request #838 from airencracken/hotfix-missing-newline 
Fix missing newline
 2016-10-24 15:48:53 +06:00
Adam Warner
44c3d56439 Merge pull request #836 from pi-hole/UdemyAttribution 
Udemy attribution
 2016-10-24 13:54:14 +06:00
Marcus Hildum
519d731ddd Fix missing newline 
My mistake
 2016-10-23 16:45:51 -07:00
Dan Schaper
119c00c22a Merge pull request #837 from pi-hole/UdemyAttribution-1 
Update PULL_REQUEST_TEMPLATE.md
 2016-10-23 15:53:27 -07:00
Dan Schaper
12596dd697 Update PULL_REQUEST_TEMPLATE.md 2016-10-23 15:50:59 -07:00
Dan Schaper
cb38f5f0d7 Move attribution to bottom since our bots quote from top 
Bot's keeps quoting the attribution line in snippets (Discourse, GitLab, Mattermost)
 2016-10-23 15:50:03 -07:00
Promofaux
b49384ffe4 intent 2016-10-23 22:44:21 +01:00
Promofaux
7fb622638b flip reload logic. Do not reload if there are not changes made to blacklist.txt 2016-10-23 22:44:06 +01:00
Promofaux
bd0cc134bf MERGE FAIL :ashamed_face: 2016-10-23 22:43:11 +01:00
Promofaux
476fd1f695 indentation 2016-10-23 22:38:18 +01:00
Promofaux
96053d13be Flip reload logic. Do not reload lists if no changes made to whitelist.txt 2016-10-23 22:38:06 +01:00
Promofaux
c958bed418 Consistency changes. Replace MOST uses of echo >> ${DebugLog} with usage of log_write function 2016-10-23 22:31:20 +01:00
Promofaux
2b2c240d39 Fix shebang line broken in #831 
Remove root check and references to ${SUDO}

Check for /etc/pihole/setupVars.conf and use piholeInterace in IPv6 checks as suggest by @jacobsalmela https://github.com/pi-hole/pi-hole/pull/831#issuecomment-255606854
 2016-10-23 22:15:10 +01:00
Adam Warner
1f0ae16216 Merge pull request #831 from airencracken/development 
Consistent Style in Bash
 2016-10-23 20:03:30 +01:00
Promofaux
b79392ba2c exit after displaying white/blacklist 2016-10-23 19:49:51 +01:00
Promofaux
8ee98f0a4a remove a space 2016-10-23 19:47:31 +01:00
Promofaux
82e78fb651 Add output to pihole disable and pihole enable 2016-10-23 19:44:40 +01:00
Promofaux
d0826b2c33 Merge branch 'development' of https://github.com/airencracken/pi-hole into airencracken-dev 2016-10-23 19:33:28 +01:00
Promofaux
ff588200c0 Merge branch 'promoTweaksTheSecond' of https://github.com/pi-hole/pi-hole into promoTweaksTheSecond 2016-10-23 19:11:36 +01:00
Marcus Hildum
5d6072524c Consistency 
Missed one
 2016-10-22 10:26:00 -07:00
Marcus Hildum
07a66a70fc Consistency 
More of the same
 2016-10-22 10:12:05 -07:00
Marcus Hildum
69ba8a3c2f Consistency 
Again trying to move the repo to one style. Doesn't matter if it's
changed afterwards, but one style instead of about five seems
saner.
 2016-10-22 10:01:15 -07:00
Marcus Hildum
a30c75ef71 Consistency 
Cleanup!
 2016-10-22 00:35:44 -07:00
Marcus Hildum
d0b3727c5d Consistency 
Yet more cleanup
 2016-10-22 00:32:36 -07:00
Marcus Hildum
6e94bf5b6d Consistency 
You know the drill
 2016-10-22 00:14:38 -07:00
Marcus Hildum
0f04e270a7 consistency 
Just more cleanup
 2016-10-22 00:10:25 -07:00