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-15 18:53:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
2737 commits 8 branches 109 tags 27 MiB
Commit graph

2737 commits

This branch
This branch
All branches
Author SHA1 Message Date
WaLLy3K
34ae4844fa Merge branch 'development' into tweak/gravity 2017-09-14 16:44:14 +10:00
WaLLy3K
8191ec01e5 Gravity Bugfixes 
* Merge development OpenVPN code
* Determine which domain to resolve depending on existence of $localList
* Re-add code to remove $localList, preventing duplicate local entries
* Minor shellcheck validation fix
 2017-09-14 16:39:30 +10:00
WaLLy3K
4d39ab9753 Allow force-reload to be used when restarting DNS 
* Remove duplicate coltable variable definition and source
* Minor comment modifications
* Add "$2" to restartdns
 2017-09-14 16:39:25 +10:00
Adam Warner
7a1df15724 Merge pull request #1688 from pi-hole/tweak/customBlockPage 
Allow for Custom block page
 2017-09-13 18:22:38 +01:00
Adam Warner
42b5574f9b
remove no longer needed tests 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-09-09 19:41:05 +01:00
Adam Warner
5f4be0de35
adjust lighttpd config depending on whether or not custom.php exists 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-09-09 19:30:53 +01:00
Adam Warner
6c605f55f9
always overwrite default blockpage, so that changes can be rolled out 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-09-09 19:07:48 +01:00
DL6ER
17be6b860e Merge pull request #1682 from pi-hole/tweak/VPN_hostnames 
Add VPN host names to local.list
 2017-09-08 22:42:58 +02:00
Adam Warner
474ac4a15d Merge pull request #1581 from pi-hole/sqlite-dependency 
Add "php5-sqlite" to dependencies
 2017-09-08 21:28:16 +01:00
DL6ER
b8fedf76cd Merge pull request #1572 from pi-hole/gedetil-development 
Add web frontend shutdown command
 2017-09-08 20:21:20 +02:00
DL6ER
ca88c59d4e Merge pull request #1687 from spacedingo/patch-2 
Add ignore-case switch to sort (domains)
 2017-09-08 20:17:38 +02:00
Mcat12
d69e62589a Merge branch 'development' into sqlite-dependency 2017-09-08 13:43:26 -04:00
DL6ER
c9d4995900
Update to comply with current development code 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-09-08 19:35:05 +02:00
DL6ER
279e809aaf
Use poweroff instead of halt 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-09-08 19:33:06 +02:00
Mcat12
d61857efae Merge branch 'development' into patch-2 2017-09-08 13:32:51 -04:00
DL6ER
0d037e96fb
Merge branch 'development' into gedetil-development 
Signed-off-by: DL6ER <dl6er@dl6er.de>

Conflicts:
	advanced/Scripts/webpage.sh
 2017-09-08 19:32:38 +02:00
Mcat12
6376f9aef4 Merge pull request #1680 from pi-hole/colour-consistency 
Colour output consistency
 2017-09-08 13:29:55 -04:00
spacedingo
f5a1fa21f7 Add ignore-case switch to sort (domains) 
Domains with caps pass off as unique. It is necessary for proper duplicate removal.
Example:
::: /etc/pihole/list.preEventHorizon (2 results)
adsatt.abcnews.starwave.com
Adsatt.ABCNews.starwave.com
 2017-09-08 20:36:14 +04:00
DL6ER
4a90dac68e
Simplify awk code as the format of ipp.txt is actually fixed (only one entry per line is allowed) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-09-07 19:42:00 +02:00
DL6ER
2624e56de5
Parse /etc/openvpn/ipp.txt (if existing) and add entries to local.list. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-09-06 16:54:41 +02:00
Adam Warner
e839a7784c Merge branch 'development' into sqlite-dependency 2017-09-05 20:39:45 +01:00
WaLLy3K
bea99abd8d Ensure colour consistency between terminal themes 
* Comment file for review-ability
* Add BOLD and UNDERLINE options
* Select most readable colours out of LIGHT/DARK options
* Provide empty variables for `set -u`
* Deprecate unnecessary variables
* Correct colours for TICK/CROSS/DONE
* Escape r twice and add ESC to OVER
 2017-09-05 23:28:33 +10:00
WaLLy3K
a5c4ae955a Merge branch 'development' into tweak/gravity 2017-09-03 15:28:41 +10:00
Dan Schaper
d7d53849a3 Merge pull request #1628 from pi-hole/fix/issue-template 
Update Issue/PR Template text
 2017-09-02 04:55:56 -07:00
WaLLy3K
b354f722be Add link for EUPL 
* Also formatted `git rebase` text to be consistent with `git commit --signoff`

Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
 2017-09-02 21:52:54 +10:00
WaLLy3K
ea1aad9774 Add review suggestions to template 2017-09-01 10:17:08 +10:00
WaLLy3K
817d644795 Merge branch 'development' into fix/issue-template 2017-09-01 10:16:03 +10:00
WaLLy3K
56b8c4bfdb Merge branch 'development' into tweak/gravity 2017-09-01 10:01:41 +10:00
WaLLy3K
bf059e5ee8 Merge pull request #1676 from pi-hole/remove-netstat 
Replace superseded netstat command
 2017-08-31 21:16:11 +10:00
WaLLy3K
15a5f425bf Replace nc with psuedo-device 
* Also fix minor conditional style issue
 2017-08-31 20:32:02 +10:00
WaLLy3K
3125d24ded Replace superseded netstat command 
* Make colfile readonly, and use path of PI_HOLE_SCRIPT_DIR
* Rename piholeStatus function to statusFunc for function name consistency
* Replace superseded netstat command with nc
* Perform addn-hosts check using a single grep subshell
 2017-08-31 17:39:41 +10:00
Adam Warner
6b6d105c2f Merge branch 'development' into sqlite-dependency 2017-08-28 10:17:33 +01:00
WaLLy3K
2f19605750 Merge branch 'development' into fix/issue-template 2017-08-28 13:29:18 +10:00
WaLLy3K
7311db3a63 Change wording to support feature PR's 
* Also clarify template suggestion text
* Remove stray '
 2017-08-28 13:28:23 +10:00
WaLLy3K
0a00936e99 Update resolver test & added more comments 
* Add/update code comments
* Change resolver check to test for pi.hole
* Make resolver check timeout after 10 seconds
* Use > instead of &> where appropriate
* Make resolver check sleep for 30 seconds (effectively waiting up to 50s for dnsmasq to be resolvable)
* Provide confirmation upon success of resolver check availability
* Quotes and Braced remaining variables as appropriate
* Removed duplicate local
 2017-08-28 11:36:02 +10:00
WaLLy3K
7cac207c00 Merge branch 'development' into tweak/gravity 2017-08-28 03:11:38 +10:00
WaLLy3K
feb412b02a Merge pull request #1671 from pi-hole/release/3.2 
Update development from release/3.2
 2017-08-28 03:04:46 +10:00
WaLLy3K
1ae403b742 Merge pull request #1667 from pi-hole/install-space 
Remove erroneous space
 2017-08-24 14:00:20 +10:00
WaLLy3K
2f36acae49 Remove errornous space 2017-08-23 11:51:16 +10:00
Adam Warner
64f29120c8
indent nested function in basic-install.sh 
fix dependency in uninstall.sh

Signed-off-by: Adam Warner <adamw@rner.email>
 2017-08-17 19:43:07 +01:00
Adam Warner
d92434b1e9
Merge branch 'development' into sqlite-dependency 
Signed-off-by: Adam Warner <adamw@rner.email>

# Conflicts:
#	automated install/basic-install.sh
 2017-08-16 16:31:47 +01:00
Adam Warner
01cd056bcc
Work out correct SQLITE version for php-sqlite 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-08-16 16:27:50 +01:00
Adam Warner
56f2ea3ec2
Add Fedora/Centos dependency 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-08-16 15:56:39 +01:00
Adam Warner
d45695a088 Merge pull request #1643 from pi-hole/tweak/PiholeCheckout 
Small tweaks to output of `pihole checkout`
 2017-08-04 00:19:46 +01:00
Adam Warner
2ceeac41fe Merge pull request #1648 from pi-hole/branding/DOReadme.md 
Branding/DO readme.md
 2017-08-02 11:29:31 +01:00
WaLLy3K
cc4ada99d8 Use SIGHUP instead of force-reload 2017-08-01 20:48:43 +10:00
Adam Warner
16d67f55b3 Merge branch 'development' into fix/issue-template 2017-07-29 17:18:16 +01:00
Adam Warner
18b41adbf6 Merge branch 'development' into tweak/gravity 2017-07-29 17:14:39 +01:00
Mcat12
898fdf7a60 Merge pull request #1602 from molikuner/development 
Fix URL extension parsing
 2017-07-29 11:49:24 -04:00
Adam Warner
5799485b0f Merge branch 'development' into development 2017-07-29 16:29:57 +01:00