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
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
81fdfcba22
Update whitelist.sh
2016-04-21 23:40:38 +08: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
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
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
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
Adam Warner
d10e9b1b6e
add pihole/webui version numbers
2016-04-12 08:47:30 +01:00
Adam Warner
a6bee76581
add location of debug log output file!
2016-04-12 08:24:34 +01:00
nate
2f4f5a6ad2
Added lighttpd error.log to debug output
2016-04-11 18:35:44 -05:00
Promofaux
48fa83c9ac
Fix whitespace
2016-04-10 21:36:33 +01:00
Promofaux
05e0003555
Fixes issue #453
2016-04-10 21:17:58 +01:00
Promofaux
107e0404de
Move exit 1
outside of if
block on verbose check to stop dnsmasq reloading
2016-04-08 23:01:13 +01:00
Promofaux
ab99e80333
indent
2016-04-08 23:00:46 +01:00
Promofaux
3154a378a6
Remove clear in DisplayWlist and force verbose to false to tidy up output.
2016-04-08 20:12:30 +01:00
Promofaux
8e04f1c03e
Remove clear in DisplayBlist and forse verbose to false to tidy up output.
2016-04-08 20:11:39 +01:00
Promofaux
c0aadeab3d
fix spelling in name of variable ($versbose -> $verbose)
2016-04-08 20:10:27 +01:00
Promofaux
6c87698f1a
fix spelling in name of variable ($versbose -> $verbose)
2016-04-08 20:10:10 +01:00
Justin Theberge
9a4c5cef86
fix indentations
2016-04-08 10:14:17 -04:00
Justin Theberge
bdfc86f850
fix formatting
2016-04-07 21:58:57 -04:00
Justin Theberge
70dadfba28
add list options requested from issue#442
2016-04-07 21:52:47 -04:00
Adam Warner
391dea445a
Move help output to function, add -h argument
2016-04-06 09:34:05 +01:00
Adam Warner
e074c72130
Move help output to function helpFunc, add -h argument.
2016-04-06 09:32:36 +01:00
Promofaux
9c94af04cc
Fixes #432 . Thanks to @VDRrulez and @jradwan for pointing it out...
2016-04-05 14:22:10 +01:00
Promofaux
849185d3c9
Fix incorrect echo
2016-04-05 00:03:49 +01:00
Promofaux
47cc757ed0
Fix incorrect echo
2016-04-05 00:03:24 +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
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
Promofaux
97d3aedba1
Add some output to the log flush
2016-04-03 18:27:18 +01:00
nate
7f9410fd34
Added uninstall option to bash-completion
2016-04-02 19:45:44 -05:00
nate
1a2046a7eb
Added uninstall option to pihole
command. Minor fixes
2016-04-02 19:20:54 -05:00
nate
6eea9239a7
Merged branch development into PiHoleController
2016-04-02 18:41:36 -05:00
Mcat12
e97755eb91
Fix missing cats
2016-04-02 19:28:30 -04:00
nate
d47fbbbe96
Mcat12 requests. Added bash-completion support
2016-04-02 17:58:10 -05: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
28f2a1309e
Merge branch 'development'
...
Conflicts:
automated install/uninstall.sh
2016-03-31 20:25:54 -05:00
nate
2625d9f7fe
Made piholeDebug.sh +x
2016-03-30 20:09:19 -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
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
fee55fa642
Added gravity.sh to the list of options
2016-03-28 18:37:49 -05:00
nate
76ea1962be
Controller script, pihole.sh added
...
Syntax changes for user output to be consistent
2016-03-28 18:31:21 -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
a4fbccac9b
Merge conflict resolution
2016-03-28 12:53:21 -05:00
nate
a0cf93a7ca
Merge branch 'PiholeDebug'
...
Conflicts:
README.md
2016-03-28 12:22:42 -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
6145748bfb
Change single echo to printf to forrect \t interpretation
2016-03-27 20:36:31 -05:00
nate
1a1026b367
Consistent stdout to match basic-install.sh and uninstall.sh
2016-03-27 14:44:42 -05:00
nate
5ee382c8eb
Roll back addition of piholeDebug.sh (production master base)
2016-03-26 17:00:52 -05:00
nate
0b9e78df2c
Cleaned code and added prompt for purge on uninstall
2016-03-26 16:57:01 -05:00
nate
a9c24b456d
Bug fixes and logging improvements
...
Finalized for production deployment. Next release targeting a tarball of config files plus additional logging.
2016-03-25 19:04:03 -05:00
nate
b4463bf42c
Added test for nslookup
...
Checks the TESTURL for nslookup is not whitelisted
2016-03-25 16:42:17 -05:00
nate
8f8dc66c70
Ignore whitespace when writing config files
2016-03-24 18:50:53 -05:00
Nate
b746250e71
Made all advanced/Scripts/ executable for consistency.
2016-03-24 18:29:13 -05:00
Promofaux
bc09760c84
Grab changes by @rosskevin. ( #386 - lighttpd changes to handle JS files)
2016-03-24 23:19:44 +00:00
nate
86eafe7a33
Added comparison of gravity.list with Whitelist.txt and Blacklist.txt.
...
Added additional echos to help read the debug file.
TODO: testNslookup function
2016-03-24 16:21:29 -05:00
nate
04638c9065
Added 01-pihole.conf from /etc/dnsmasq.d/ to log
...
Write 01-pihole.conf to debug log
2016-03-20 18:21:35 -05:00
nate
b0dd231018
Modified description in header
...
Removed copied header description from piholeLogFlush.sh and replaced with relevant description.
2016-03-19 21:34:02 -05:00
nate
0b5f005a5d
Added piholeDebug.sh script for advanced debugging
...
Script piholeDebug.sh added to /usr/local/bin to generate a detailed log file for debugging/troubleshooting.
2016-03-19 20:32:11 -05:00
Kevin Ross
b79db36336
no need for the X- header prefix in the string
2016-03-14 22:59:38 -05:00
Kevin Ross
d3971b26e4
add a valid js stub
2016-03-14 22:52:02 -05:00
Kevin Ross
a44a201f00
rewrite js files to a valid stub
2016-03-14 22:51:16 -05:00
Morlok8k
d13ae0610e
fix for older versions of uptime, on development branch.
2016-03-08 10:19:01 -08:00
Carter Maxwell
ced0ae0d65
remove trailing whitespace whitelist.sh
2016-03-05 21:15:53 -08:00
Carter Maxwell
876c51302a
remove trailing whitespace updateDashboard.sh
2016-03-05 21:15:36 -08:00
Carter Maxwell
a6877e7c13
remove trailing whitespace chronometer.sh
2016-03-05 21:15:11 -08:00
Carter Maxwell
f633d1fa5b
remove trailing whitespace blacklist.sh
2016-03-05 21:14:56 -08:00
Carter Maxwell
4f90b41343
remove trailing whitespace dnsmasq.conf.original
2016-03-05 21:14:17 -08:00
Adam Warner
3a46e7fc0a
Merge pull request #338 from pi-hole/auto-chronometer-lcd-setup
...
Auto chronometer lcd setup
2016-02-21 20:48:46 +00:00
jacobsalmela
c5d45edf2d
consoleblank=0
...
This makes sure the LCD screen does not go blank after a set period of
time.
2016-02-20 01:15:14 -06:00
jacobsalmela
0116b6341c
updated script
...
Added links to where code was borrowed from
added reboot at the end
also added a few things commented out that might be useful for some
people to learn.
2016-02-20 01:14:48 -06:00
jacobsalmela
f0e5b2b6f9
Merge branch 'master' into auto-chronometer-lcd-setup
2016-02-18 16:45:47 -06:00
Hippyjake
21c688a8a8
add uptime -p to chrono script
2016-02-16 18:06:49 -07:00
jacobsalmela
3142992c57
update
2016-02-14 10:53:13 -06:00
Promofaux
4c24186911
Fixes divide by zero error.
2016-02-14 02:58:09 +00:00
Promofaux
70e4104c17
Merge remote-tracking branch 'origin/development'
2016-01-31 20:47:10 +00:00
Mcat12
48f9a61ff0
Updated License
2016-01-30 15:12:40 -05:00
Chad Howell
abef758ff6
Get ready for user selected DNSs
...
Prep for using sed to insert user selected DNSs into 01-pihole.conf.
Selections will come from dialog during install script containing the
following choices: Google, DynDNS, and eventually 2 custom DNS servers.
2016-01-25 00:05:17 -05:00
Chad Howell
e5f9663a0e
Move dnsmasq.conf to dnsmasq.d/01-pihole.conf
...
Check if /etc/dnsmasq.conf is from pihole. If so, replace with an
original and install new in .d directory. Add and unmolested version of
dnsmasq.conf to the ./advanced directory.
2016-01-25 00:04:02 -05:00
Chad Howell
ff5ed561cc
Rename dnsmasq.conf to 01-pihole.conf
...
Rename dnsmasq.conf to 01-pihole.conf to prepare for move to
/etc/dnsmasq.d/ per the normal way of modding configs on Debian based
systems.
2016-01-24 23:54:00 -05:00
Promofaux
754beed3a1
Bring up to date with master
2016-01-24 20:22:41 +00:00
Promofaux
8ecf8eb76c
output to match other scripts
2016-01-24 17:18:37 +00:00
Promofaux
3cd1a5b1d5
... Helps if I add the changes to the repo file, and not the test file on my pi.
2016-01-24 16:51:54 +00:00
Promofaux
dfcf9d133e
Make output make a bit more sense
2016-01-24 16:46:00 +00:00
jacobsalmela
71fd32b1f4
script to set everything up
2016-01-23 12:56:27 -06:00
jacobsalmela
fcf3b4e4e2
file to set lcd font size
2016-01-23 11:48:12 -06:00
Dan Schaper
1e735c26c4
Repo Change QuickFix
...
QuickFix for Repo location change.
2016-01-22 20:46:10 -08:00