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 10:43:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
847 commits 8 branches 109 tags 27 MiB
Commit graph

847 commits

This branch
This branch
All branches
Author SHA1 Message Date
Adam Warner
ce110aab90 Merge pull request #536 from fhemberger/development 
Fix link for spam404scamlist.txt
 2016-06-20 18:47:12 +01:00
Frederic Hemberger
fd92752f52 Fix link for spam404scamlist.txt 
The redirect `http://spam404bl.com/spam404scamlist.txt` resolves to `https://raw.githubusercontent.com/spam404scamlist.txt/Dawsey21/Lists/master/main-blacklist.txt`, which is wrong.

Instead, use `https://raw.githubusercontent.com/Dawsey21/Lists/master/main-blacklist.txt`directly.
 2016-06-20 19:37:58 +02:00
Adam Warner
791e5bbd55 Merge pull request #531 from pi-hole/malwareList 
Update adlists.default
 2016-06-16 10:12:30 +01:00
Adam Warner
46df6e7dd3 Update adlists.default 
Add C&C malware list from #528
 2016-06-16 10:11:55 +01:00
Jacob Salmela
13a479a9f6 tell user to run as root 
since you can't install sudo as a non-root user, the script needs to be
run as root in order to install it.
 2016-06-11 13:21:08 -05:00
Jacob Salmela
1194e48bd8 install sudo 
sudo is needed for the sudoers file to work, which is how the Web
interface executes the pihole commands.
 2016-06-11 13:08:43 -05:00
Jacob Salmela
1e0666d1ef make folder so file can be deployed 2016-06-10 18:51:38 -05:00
Jacob Salmela
1c53ad6876 mcat is smarter than me 
He already added this.
 2016-06-10 18:20:53 -05:00
Jacob Salmela
dc2a537f6b copy sudoers file 
necessary for Web interface white/black list functionality.
 2016-06-10 17:47:27 -05:00
Adam Warner
a5d3022e9f Merge pull request #522 from crazy-max/development 
Update URL for Windows 10 Telemetry list
 2016-06-03 16:22:58 +01:00
crazy-max
4541da1f17 Update URL for Windows 10 Telemetry list 2016-06-03 17:10:36 +02:00
Mcat12
a16cd9aef7 Merge pull request #469 from pi-hole/web-sudo 
Give WebUI permissions to run pihole commands
 2016-05-26 18:45:04 -04:00
Mcat12
6cf446032f Show web interface URL after install 2016-05-25 18:55:36 -04:00
Mcat12
3fda2d9ac3 Fix helpfunc not found error 2016-05-25 17:07:12 -04:00
Mcat12
7829e907c9 Merge pull request #511 from crazy-max/development 
Update URL for Windows 10 Telemetry list
 2016-05-22 20:23:04 -04:00
crazy-max
b5529e5138 Update URL for Windows 10 Telemetry list 2016-05-22 01:30:32 +02:00
Adam Warner
d601afcebc Merge pull request #509 from crazy-max/development 
New URL for Windows 10 Telemetry list.
 2016-05-15 20:12:49 +01:00
crazy-max
892a90bf51 New URL for Windows 10 Telemetry list. 2016-05-15 13:51:35 +02:00
Mcat12
d52a8f08ed Merge pull request #501 from davidtorcivia/development 
Fix basic install for Proxmox LXC
 2016-05-11 19:12:37 -04:00
David Torcivia
b7e27bf6b4 Fix basic install for Proxmox LXC 
Fixed basic installer to properly bind to eth0 when install to a Proxmox LXC.
 2016-05-11 18:24:43 -04:00
Mcat12
9ee96d6176 Merge pull request #500 from yoosi/remove-toilet 
Replace toilet with echo in chronometer.sh
 2016-05-11 16:53:38 -04:00
Carter Maxwell
c0e1772e21 Replace toilet with echo 2016-05-07 11:44:18 -07:00
Mcat12
62dc160c65 Merge pull request #491 from pi-hole/dont-frame-me 
Make sure web interface can't be loaded into a frame
 2016-05-06 14:30:13 -04:00
Mcat12
f03303e5aa Add X-Pi-hole header 2016-05-03 11:58:13 -04:00
Mcat12
7bc2844b9d Remove X-Pi-hole header 
Also adds `X-Frame-Options: DENY` for the admin directory, so that
an ad can't load it into a frame
 2016-05-02 18:51:02 -04:00
Mcat12
ba283755be Merge pull request #472 from jim-liu/development 
Save custom IP
 2016-05-02 09:32:35 -04:00
Jim Liu
00cc480bc1 Update basic-install.sh 2016-04-26 16:10:51 +08:00
Jacob Salmela
d7de5b2afa link to pihole menubar 2016-04-23 15:56:14 -05:00
Jim Liu
221b72439b Update basic-install.sh 2016-04-22 01:46:27 +08:00
Jim Liu
08e6f60941 Update blacklist.sh 2016-04-22 01:42:43 +08:00
Jim Liu
10066209e7 Update whitelist.sh 
Change piholeIPfile to a permanent location.
 2016-04-22 01:41:11 +08: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
Jim Liu
81fdfcba22 Update whitelist.sh 2016-04-21 23:40:38 +08:00
Mcat12
24de6d6fc9 Allow sudoers file to be uninstalled 2016-04-20 21:43:01 -04:00
Mcat12
aec6fcd00b Merge branch 'BugFix463' into development 2016-04-20 15:55:26 -04:00
Mcat12
619082dbed Merge branch 'development' into BugFix463 
Conflicts:
	advanced/Scripts/blacklist.sh
	advanced/Scripts/whitelist.sh
 2016-04-20 15:54:58 -04:00
Mcat12
09cdf5081c Install sudoer file 2016-04-17 23:03:12 -04:00
Mcat12
d7abbbfac4 Change mode of sudoer file 2016-04-17 22:49:47 -04:00
Mcat12
c714196647 Add Sudoer file for WebUI 2016-04-17 22:46:06 -04:00
Adam Warner
b702c1d9a8 Merge pull request #468 from mayurkr/mayur-bugfix 
fixed non execution of the function helpFunc
 2016-04-17 17:32:56 +01:00
Mayur Raiturkar
56ac04c48e fixed helpFunc 2 2016-04-17 18:22:06 +05:30
Mayur Raiturkar
b58519b974 fixed helpFunc 1 2016-04-17 18:21:32 +05:30
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
2d03616c10 Merge pull request #460 from pi-hole/LighttpdDebugLogging 
Added lighttpd error.log to debug output
 2016-04-15 21:56:58 +01:00
Adam Warner
fcb9ba08a8 Merge pull request #452 from notracking/patch-2 
Added hosts-blocklists lists
 2016-04-15 21:56:23 +01:00
Adam Warner
77f4126f9b add root check to whitelist script 2016-04-13 15:51:48 +01:00
Adam Warner
4c890ab202 Add root check to blacklist script 2016-04-13 15:50:48 +01:00