1479 commits

Author	SHA1	Message	Date
WaLLy3K	2c091f3a3c	Merge branch 'development' into cors_mixed_content_fix	2017-10-08 12:22:14 +11:00
WaLLy3K	cfcdc53185	Merge pull request #1722 from pi-hole/fix/bpfqdn ... Improve FQDN Authorized Hosts functionality (Fix for #1416)	2017-10-08 12:19:11 +11:00
WaLLy3K	bd33018660	Shellcheck OR validation ... Signed off by WaLLy3K <wally3k@pi-hole.net>	2017-10-08 12:16:05 +11:00
Mcat12	e7589945a2	Disable password field if no password is set ... For someone to actually whitelist a domain without a password, more changes will be needed on the PHP side.	2017-10-07 16:41:30 -04:00
Mcat12	67a5594909	Allow emails which include -h in them ... For example, mcat12@pi-hole.net would previously spit out the help message	2017-10-07 16:06:16 -04:00
DL6ER	70ad656af0	Save backup as ".bck~" to prevent reading of the file by dnsmasq ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-10-07 22:04:14 +02:00
DL6ER	f22b83d379	Create a backup before emptying the list ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-10-07 17:46:40 +02:00
DL6ER	114f84c948	Add --nuke option to list.sh that can be used e.g. by Teleporter to empty out lists before importing new content ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-10-07 17:29:47 +02:00
WaLLy3K	43e1121618	Match current style of Web Interface ... * Remove border from about menu Signed off by WaLLy3K <wally3k@pi-hole.net>	2017-10-04 01:05:44 +11:00
WaLLy3K	97dd1b4cf3	Improve FQDN Authorized Hosts functionality ... * Use inverse if statement, instead of IF/ELSE when checking setupVars.conf * Remove $svFQDN * Add or elaborate on more comments * Add $serverName to $authorizedHosts if admin has specified `setenv.add-environment = ("fqdn" => "true")` within lighttpd's external.conf * e.g: `$HTTP["host"] == "pihole.domain.com" { setenv.add-environment = ("fqdn" => "true") }` * Move "No exact results" check to top of exception handling * Remove unnecessary IF/ELSE when handling $queryAds error Signed off by WaLLy3K <wally3k@pi-hole.net>	2017-10-04 00:46:51 +11:00
WaLLy3K	288635abc9	Add comment for include_shell feature ... * Capitalise first letter for Lighttpd * Fix spacing * Add comment for include_shell feature	2017-10-03 22:05:06 +11:00
Celly	3f20981aab	Update access rules to block all root '.' files	2017-09-22 09:29:00 -04:00
Celly	f54a812ad5	Update access rules to block all root '.' files	2017-09-22 09:27:43 -04:00
andofrjando	6323d5afed	Use PHP short echo tag to avoid Codacy expecting an escaping function	2017-09-22 07:15:03 +08:00
Celly	e3e3b4da58	Add in some exclusions form some leaky files in the admin	2017-09-21 17:47:37 -04:00
Adam Warner	ef1ce7d4d6	Merge pull request #1631 from pi-hole/tweak/gravity ... Clean up and optimise Gravity	2017-09-21 19:58:38 +01:00
DL6ER	ee2169dd13	Merge branch 'development' into tweak/gravity	2017-09-21 17:05:30 +02:00
WaLLy3K	11282aaca3	Decrease local-ttl to 2 ... * Decreasing value should benefit clients when whitelisting blocked sites, [as per this discussion](https://github.com/pi-hole/pi-hole/pull/1698#issuecomment-331134576).	2017-09-21 23:11:44 +10:00
WaLLy3K	f3cc8c71c4	Merge pull request #1691 from pi-hole/new/adminemail ... Add `pihole -a email` functionality for Block Page contact email	2017-09-19 18:39:37 +10:00
WaLLy3K	500a755250	Delete superseded file ... * Functionality is reproduced from within the Block Page	2017-09-19 01:03:24 +10:00
andofrjando	5e48b3f7f7	Fix one mistake where $proto would not be created if $_SERVER['HTTPS'] exists but is not set to on	2017-09-16 11:24:38 +08:00
andofrjando	00d62b3423	This fixes the following bug: ... If Pi-Hole is behind a reverse proxy that uses SSL, then the block page will not load resources such as `blockingpage.css` and `jquery.min.js` as the insecure `http://` is hard coded. Browsers will block attempts to load insecure resources if the page is loaded of SSL. The fix is acheived by checking `$_SERVER['HTTPS']` and setting the variable `$proto` to either `http` or `https`. The harcoded `http` is replaced by the contents of this variable.	2017-09-16 10:24:37 +08:00
WaLLy3K	28063aa7f7	Add administrative contact address functionality ... * Disable shellcheck for SC1090	2017-09-15 00:24:29 +10:00
WaLLy3K	c458e4a93b	Merge pull request #1420 from WaLLy3K/new/https ... Disable Let's Encrypt HTTPS & shift functions to block page	2017-09-14 20:40:20 +10:00
WaLLy3K	e7ae62ba76	Merge pull request #1416 from WaLLy3K/blockpage2 ... Block Page 2.0	2017-09-14 20:39:45 +10:00
WaLLy3K	34ae4844fa	Merge branch 'development' into tweak/gravity	2017-09-14 16:44:14 +10: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	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
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
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	bab44c52ae	Merge branch 'development' into blockpage2	2017-08-28 13:30:57 +10:00
WaLLy3K	7cac207c00	Merge branch 'development' into tweak/gravity	2017-08-28 03:11:38 +10:00
Adam Warner	199de9ebc0	Merge branch 'development' into new/https	2017-08-27 11:38:30 +01:00
Adam Warner	504ae0193f	Merge branch 'development' into blockpage2	2017-08-27 11:23:21 +01:00
WaLLy3K	1ae403b742	Merge pull request #1667 from pi-hole/install-space ... Remove erroneous space	2017-08-24 14:00:20 +10: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	78143c2ff4	Merge branch 'development' into blockpage2	2017-07-29 16:44:28 +01:00
Adam Warner	7b1524ad01	Merge branch 'development' into new/https	2017-07-29 16:44:20 +01:00
Adam Warner	5799485b0f	Merge branch 'development' into development	2017-07-29 16:29:57 +01:00
Adam Warner	0a9965292c	Additional check to fix any existing cases of "24h" in setupVars.conf automatically. ... Signed-off-by: Adam Warner <adamw@rner.email>	2017-07-28 19:40:13 +01:00
Adam Warner	4fb66e632f	The other h	2017-07-28 16:30:03 +01:00
Adam Warner	5787895794	stop an extra h being added to leasetime of DHCP server. We already storethe h in setupVars.conf ... Signed-off-by: Adam Warner <adamw@rner.email>	2017-07-28 16:10:13 +01:00
Adam Warner	d90489b31d	Include branch we're switching from ... Signed-off-by: Adam Warner <adamw@rner.email>	2017-07-27 22:21:25 +01:00
Adam Warner	f38912a0c9	- Correctly overwrite ${INFO} boxes with ${CROSS} etc ... - Notify user that branch has been changed Signed-off-by: Adam Warner <adamw@rner.email>	2017-07-27 21:33:41 +01:00
WaLLy3K	2d8fff099f	Pass correct options to gravity.sh ... * Optimise $validDomain function by using bashism and `grep` * Add black/white/wildcard variables to pass to Reload() * Revert reload variable behaviour * Ensure Reload() function passes correct options to gravity.sh Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	2017-07-27 12:34:26 +10:00
WaLLy3K	fdf2649f2f	Clean up known remaining colour output issues (#1613) ... * Print newline on error message * Output last three lines of error if update fails * Consistent error messages & housekeeping * Add shellcheck directive to ignore COL_TABLE * Quoted and braced variables for codebase consistency * Escaped newlines correctly * Made error messages consistent (indenting and wording) * Removed consecutive echos * Conditional formatting consistency * Braced, quoted and used [[ on conditionals * Fix specific ShellCheck issues * Fixed issues that could be safely changed without extensive testing * Update SELinux whiptail behaviour & more * Colourised some strings * Fixed multiple line string indenting * Made output consistent with existing codebase * Removed sequential echos * Make SELinux whiptail use "--defaultno", and change text wording * Add help text for hostrecord, and colourise output * this should fix the tests... Signed-off-by: Adam Warner <adamw@rner.email> * revert changes to `update_package_cache()` to prove tests Signed-off-by: Adam Warner <adamw@rner.email>	2017-07-26 18:00:08 +01:00
Mcat12	b09c660833	Always process DNS and DHCP settings in installer (#1630) ... * Always process DNS and DHCP settings in installer * Make sure dnsmasq config exists before modifying it Signed-off-by: Mcat12 <newtoncat12@yahoo.com> * Make sure the dnsmasq config directory exists Signed-off-by: Mcat12 <newtoncat12@yahoo.com> * Only remove the DHCP config if it exists (fixes tests, hopefully) Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2017-07-26 17:15:23 +01:00
WaLLy3K	714fd93292	Provide correct FTL stats (#1619) ... * Provide correct FTL stats * Use the correct lines in the array when displaying FTL stats * Treat ads_blocked_today/dns_queries_today as currency, like domains_being_blocked is on large screens * Chronometer Shellcheck validation * Remove unnecessary \ from CPU usage readout	2017-07-25 23:03:23 +01:00
WaLLy3K	61ff0452e1	Remove duplicate code ... * Make RestartDNS() use `pihole restartdns` Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	2017-07-24 21:27:12 +10:00
WaLLy3K	406098e55a	Speed up refresh time ... * Add "--blacklist-only" to only run essential gravity functions * Pass "--wildcard" option to `gravity.sh` to ensure dnsmasq is restarted Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	2017-07-24 21:26:39 +10:00
WaLLy3K	49aee8b931	Fixed development branch check	2017-07-19 12:26:00 +10:00
WaLLy3K	f2a3b557c8	Updated Block Page to work with queryFunc output	2017-07-19 00:15:59 +10:00
Adam Warner	0a062d26e6	Merge pull request #1611 from pi-hole/developmentNew ... Sort out Merge conflicts with master	2017-07-17 14:49:55 +01:00
Adam Warner	eb8333c772	Merge branch 'development' into developmentNew	2017-07-16 16:45:33 +01:00
Adam Warner	247d3ed729	list availible branches for FTL ... Signed-off-by: Adam Warner <adamw@rner.email>	2017-07-16 13:54:23 +01:00
Adam Warner	031c6428d5	Merge branch 'tweak/checkout_FTL' of https://github.com/pi-hole/pi-hole into tweak/checkout_FTL ... Signed-off-by: Adam Warner <adamw@rner.email> # Conflicts: # advanced/Scripts/piholeCheckout.sh	2017-07-16 13:34:20 +01:00
Adam Warner	f2e9d585f7	* Add helptext for pihole checkout ftl ... * Only attempt to install FTL if branch was found * ~~corebranches~~ webbranches (web branches now actually listed) Signed-off-by: Adam Warner <adamw@rner.email>	2017-07-16 13:33:00 +01:00
WaLLy3K	8af9853b9a	Fixed minor formatting issues ... * Removed useless echo * Quoted and braced conditionals * Explicit escaping of newline * Fixed arrays implicitly concatenating (SC2199) * Fixed incorrect variable used in checkout web	2017-07-16 22:32:34 +10:00
Adam Warner	783f50657b	Merge branch 'development' into tweak/checkout_FTL ... Signed-off-by: Adam Warner <adamw@rner.email> # Conflicts: # advanced/Scripts/piholeCheckout.sh	2017-07-16 12:25:27 +01:00
WaLLy3K	3631d1349e	Prevent Web Admin from printing restartdns colour codes (#1575) ... * Prevent Web Admin from printing unnecessary msgs * Make DNS restart behaviour consistent	2017-07-15 11:11:06 +01:00
Adam Warner	7d56e2a937	FTL has an L in it, innit? ... Signed-off-by: Adam Warner <adamw@rner.email>	2017-07-14 20:54:41 +01:00
Jacob Salmela	e1f818ffb7	Tweak/debug improvements (#1585) ... * check for CIDR notation when comparing IPv6 address to that found in setupVars.conf * highlight bad address entries in pihole.log and reference a corresponding FAQ * show header output if Pi-holes x-header does not match * fix automated mode when running from the dashboard. It would previously not automatically upload and generate a token. * show disclaimer message * undocumented feature for now: obfuscate domains in pihole.log so they are not visible when sent to the Pi-hole developers. We need to make an additonal flag for this in the pihole command. if the variable OBFUSCATE has a value, it will replace the domain in the log with a placeholder value * fix small typo in the disclaimer	2017-07-14 16:53:45 +01:00
Molikuner	9934f505a5	Fix URL extension parsing ... when there is a querystring Pi-hole sometimes parsed a wrong extension	2017-07-13 23:18:40 +02:00
Jacob Salmela	fb66fb12c5	put "no password will be set" on a newline.	2017-07-06 20:54:09 -05:00
Jacob Salmela	042dcf795c	fixes #1430	2017-07-06 20:44:40 -05:00
Jacob Salmela	cb65907e60	Merge branch 'development' of https://github.com/pi-hole/pi-hole into revamp/debug ... merge in development to avoid shellcheck from travis	2017-07-05 16:55:34 -05:00
DL6ER	bb8a263d70	ShellCheck	2017-07-05 19:34:20 +02:00
DL6ER	70fd94edb3	Edit message when requested branch of FTL is not available	2017-07-05 19:30:05 +02:00
WaLLy3K	1bebcef265	Make Chronometer usable on smaller screens (#1518)	2017-07-04 13:52:51 +10:00
DL6ER	6ce79ae1d0	Fix git commands (#1577)	2017-07-01 23:52:10 +02:00
Adam Warner	b3eb5c4f0e	Colour Tweaks (#1549)	2017-07-01 22:08:17 +10:00
DL6ER	ec4e9780ed	Accept underscores when validating domain names (#1571)	2017-06-30 22:52:33 +10:00
Adam Warner	22abbffbb7	Merge branch 'development' of https://github.com/gedetil/pi-hole into gedetil-development ... Signed-off-by: Adam Warner <adamw@rner.email> # Conflicts: # advanced/Scripts/webpage.sh	2017-06-29 19:47:32 +01:00
Jacob Salmela	05a724afae	codacy appeasement: remove useless cats	2017-06-29 11:49:28 -05:00
Jacob Salmela	1957b002bc	add comments about X-Headers and further explain the file descriptor cod.	2017-06-29 11:37:58 -05:00
Jacob Salmela	04cef25add	remove color character codes before uploading so the log is more readable on our plaintext tricorder server	2017-06-29 11:17:19 -05:00
DL6ER	98afb0e998	pihole checkout ftl	2017-06-27 14:28:05 +02:00
DL6ER	e9d81fc883	Backend additions for aufit log feature (#1399)	2017-06-27 10:53:24 +02:00
Jacob Salmela	22fac5e1e0	additional shellcheck fixes	2017-06-26 22:03:45 -05:00
Jacob Salmela	b6a2a4ad5a	more shellcheck fixes	2017-06-26 21:51:41 -05:00
Jacob Salmela	5f00347019	appease shellcheck by removing two unneccesary functions and making some if/else blocks	2017-06-26 21:34:39 -05:00
Mcat12	009363a7bb	Merge pull request #1560 from pi-hole/fix/ad-domain-hostname ... Move local.list after the ad blocking lists	2017-06-25 18:11:48 -04:00
Mcat12	8dc94e014f	Merge branch 'development' into fix/invalid-ipv6-wildcard	2017-06-25 18:04:38 -04:00
Mcat12	78e7c8b8e9	Merge branch 'development' into fix/ad-domain-hostname	2017-06-25 18:03:16 -04:00
Dan Schaper	c29c4ceb0f	Integrate DL's update.sh fixes. ... `shellcheck -x` for following files. Do not test for included files SC1091 Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-06-25 14:39:09 -07:00
Mcat12	bc46694ea7	Move local.list after the ad blocking lists ... Fixes the bug found by [Reddit](https://www.reddit.com/r/pihole/comments/6j3az9/urls_in_my_blacklist_are_showing_up_as_my_default/)	2017-06-25 12:18:09 -04:00
Mcat12	cb09e0bc9a	Strip /* from the end of the IPv6 address ... Fixes #1536	2017-06-24 11:14:23 -04:00
Adam Warner	536585b846	Colourise Core Output Text (#1471) ... * Define colours within COL_TABLE * Do not output colours for non-terminal instances * Removed ":::" * Fixed indenting & spacing * Made output consistent throughout project * Reworded text to fit on standard 80 char wide Terminal screen * Made 'sudo raspi-config' warning (insufficient disk space) only show on RPi * Make "Installation/Update Complete" the final msg * Remove redundant messages * Simplify update available message * Confirm user would like to begin uninstall * If "git pull" string says "Already up-to-date.", place [i] before it * Colour Temp/Interface output * Made `pihole disable 5z` invalid * Added error fallback if invalid argument (not s/m) is detected * Quoted "$2" for consistency * Updated help text * L185/286: Replaced echo with redirect * User agents for adblock.mahakala.is/adaway.org unnecessary * Print newline on confirmation of repository reset * Add output to admin-related dnsmasq restarts * Return error message for "pihole -q" * Imply default checkout behaviour with y/N * Fix uninstall failing to remove pihole user * Print checkout 'git remote show origin' STDERR on new line * Replaced checkout "AdminLTE" wording with "Web Admin"	2017-06-21 21:49:05 +10:00
DL6ER	0283a1ab74	Introduce new file black.list for blacklist content	2017-06-17 13:50:10 +02:00
DL6ER	54a88ab5ab	Change ownership of /etc/pihole to user/group pihole. Fixes #1529 (#1530)	2017-06-17 08:43:05 +02:00
WaLLy3K	aff5ff08d5	Trim version output when update is successful (#1527)	2017-06-15 09:50:05 +02:00
Jacob Salmela	fc0440546f	add functions to parse head and tails of gravity.list and pihole.log	2017-06-10 23:20:27 -05:00
Jacob Salmela	172b8d2427	parse ftl log	2017-06-10 22:18:33 -05:00
Jacob Salmela	6d10a498a5	implement a limit on how many lines of a file we want to view	2017-06-10 21:57:17 -05:00
Jacob Salmela	881819ed5f	ignore big files we dont need to know about; also fix diagnosing pihole processes	2017-06-10 18:37:28 -05:00
Jacob Salmela	3275c5f710	more comments to help understand the script	2017-06-10 15:54:27 -05:00
Jacob Salmela	b0cc1a38c3	adjust minor formatting for better readability	2017-06-10 15:28:04 -05:00
Jacob Salmela	e10182c839	only parse files required by Pi-hole	2017-06-10 12:27:05 -05:00
Jacob Salmela	b4f1fe08f0	variablize all files and directories. also put required files and folders into an arry so we can compare them in later functions by parsing through them	2017-06-09 23:22:37 -05:00
Jacob Salmela	64171fa2a1	small color and formatting changes	2017-06-09 15:42:54 -05:00
Jacob Salmela	048eacd305	parse array in correct location	2017-06-07 12:31:08 -05:00
Jacob Salmela	24aa72c19d	condense repetative code into functions; parse the content of each file	2017-06-07 12:25:00 -05:00
Jacob Salmela	92b5fe4be4	check arch compatibility and add gateway faq url	2017-06-05 14:55:58 -05:00
DL6ER	f1146a3443	Don't update FTL when there is a core update (as this will update FTL a second time). Fixes #1516	2017-06-04 12:41:44 +02:00
DL6ER	2516a1e298	Make clear that NO is the default if the user just hits return (#1514)	2017-06-03 17:23:47 +02:00
DL6ER	8ef64dbe74	Add weekly logrotation of FTL's log (#1509)	2017-06-03 14:51:35 +02:00
Jacob Salmela	8b4c0b456b	exclude webpassword from being uploaded. also check that the IP addresses detected match those defined in setupVars.conf	2017-06-01 01:15:11 -05:00
Jacob Salmela	02a601deff	comment out dir checks for lighttpd, cronm and http as they have a lot of other files that need parsing through. May need to increase the logic there if this is information we really need to know.	2017-06-01 00:19:15 -05:00
Jacob Salmela	b207fadc04	check if os is supported based on pretty name	2017-06-01 00:18:06 -05:00
Jacob Salmela	d51c067e1b	change some verbiage; new function to compare the ports in use to the services assigned to them.	2017-05-27 21:21:18 -05:00
Jacob Salmela	2fea5d428d	condense repetitive code into functions	2017-05-27 15:47:15 -05:00
Jacob Salmela	d51e0c49b1	remove comments and blank lines when parsing files	2017-05-27 13:44:33 -05:00
Jacob Salmela	36907edd50	parse contents of each file in each dir, several log_writes	2017-05-27 00:04:42 -05:00
Jacob Salmela	7ec169ab10	more comments, fixed automated tricorder, variablizing echos, verify FTL version	2017-05-26 22:05:50 -05:00
Jacob Salmela	7873da1ae5	more colors. shortened dig timeouts	2017-05-26 15:17:26 -05:00
Jacob Salmela	ef5a6e7880	add faq urls to some functions, added more colors, also use a static url for remote digs	2017-05-26 14:26:02 -05:00
Jacob Salmela	96f01e670f	add functions to write to console and log at the same time	2017-05-26 12:16:22 -05:00
WaLLy3K	10139241f5	Fix output IPv4 addr when removing CIDR notation (#1498)	2017-05-26 09:57:27 +02:00
Jacob Salmela	5902be2a49	comments for every line	2017-05-24 22:07:15 -05:00
Jacob Salmela	cc946ce068	upload to tricorder functions	2017-05-24 21:11:15 -05:00
Jacob Salmela	1102fdc44b	append everything the user sees to the pihole_debug.log file	2017-05-24 20:24:23 -05:00
Jacob Salmela	c995c81fff	adjust some spacing	2017-05-24 19:36:06 -05:00
Jacob Salmela	6684af9938	add lighttpd list function and gravity analysis	2017-05-24 18:31:55 -05:00
Jacob Salmela	8bafd12f95	fix resolver functions and add x-header function	2017-05-24 16:10:14 -05:00
Jacob Salmela	76266cf31b	add resolver functions and check directory content functions	2017-05-24 15:29:31 -05:00
WaLLy3K	4ad0cdf5d4	Rewrite Chronometer to output more stats	2017-05-25 01:03:13 +10:00
Jacob Salmela	1a87d3a659	add process check function	2017-05-23 22:57:22 -05:00
Jacob Salmela	085f2c6ca0	add port check function	2017-05-23 22:32:30 -05:00
Jacob Salmela	b74300f67c	add ping internet function and fix some spacing issues	2017-05-22 12:57:55 -05:00
Jacob Salmela	107babe8f4	add ping gateway function	2017-05-22 12:35:57 -05:00
Jacob Salmela	8fd9a22d18	add detect IP function	2017-05-22 12:05:42 -05:00
Jacob Salmela	8c5c1316dd	add php version and processor check functions	2017-05-22 08:48:56 -05:00
Jacob Salmela	daff5d8b5a	add critical dependencies version check functions	2017-05-22 03:05:51 -05:00
Jacob Salmela	6c4a7b626e	add pihole version check functions	2017-05-22 02:39:00 -05:00
Jacob Salmela	1aa5943e67	add if directory exists function	2017-05-22 01:06:15 -05:00
Jacob Salmela	69fe889f92	comments for all lines and small formatting changes	2017-05-21 23:25:53 -05:00
Jacob Salmela	5d7ef9281f	get just the OS pretty name for Dan	2017-05-20 02:01:56 -05:00
Jacob Salmela	6fa00e7cc8	first functions with pretty colors. check OS, setupVars, and contents of .d dirs	2017-05-20 01:34:13 -05:00
WaLLy3K	69fa9874dd	Use HTTP_HOST instead of SERVER_NAME ... * Fixes https://github.com/pi-hole/pi-hole/issues/1479	2017-05-18 18:54:26 +10:00
WaLLy3K	f6732a484e	Merge pull request #1317 from r0ckarong/development ... Fixed handling of `pihole -wild` help text	2017-05-18 11:16:25 +10:00
DL6ER	42eb811910	Add "quiet" mode + update comments in the cron file	2017-05-17 12:54:43 +02:00
DL6ER	c9042ffedd	Print echos only when manual flushing is requested	2017-05-17 12:51:04 +02:00
DL6ER	4e2c6a7b8e	Fix logrotation: manual flushing should be done twice, but automated rotation at midnight should only be done *once*!	2017-05-17 12:44:35 +02:00
WaLLy3K	7453bf2ee6	Fix wildcard help text ... * -wild is not a valid option since we're already using -wild	2017-05-16 10:23:53 +10:00
WaLLy3K	7d17c652f3	Merge branch 'development' into development	2017-05-16 10:18:32 +10:00
Adam Warner	90119c75d5	more merge conflicts!	2017-05-14 16:43:20 +01:00
WaLLy3K	30035ce1c2	Merge branch 'development' into tweak/help-output	2017-05-14 13:03:33 +10:00
WaLLy3K	3bd677c102	Show help for "pihole -v -h" ... * Indent output text * Minor help text change	2017-05-14 11:57:46 +10:00
WaLLy3K	0e4473685b	Show help for "pihole -a -i --help"	2017-05-14 11:47:56 +10:00
WaLLy3K	b721ed49ab	Update Help Output (#1467) ... * File consistency * Tabs to 2 spaces * Corrected indenting * Double braced conditionals * Quoted variables within conditionals * Standardise core help text * Added help text for disable command * Added help text for logging command * Clean up * Fixed certain new lines and spaces * Sync with development branch * Formatting consistency * Tabs to 2 spaces * Corrected indenting * Double braced conditionals * Quoted variables within conditionals * Fixed certain newlines and spaces * Admin help text * Added help text for interface command * Sync with development branch * Formatting consistency * Tabs to 2 spaces * Fixed some wording * Fixed certain spaces * Formatting consistency * Minor wording changes * Tabs to 2 spaces * Corrected indenting * Double braced conditionals * Quoted variables within conditionals * Fixed certain newlines and spaces * Blacklist help text * Formatting consistency * Tabs to 2 spaces * Corrected indenting * Cronometer help text * Formatting consistency * Fixed certain newlines and spaces * Corrected indenting * Checkout warning alteration * Add checkout help text * Corrected help output	2017-05-14 11:11:44 +10:00
Dan Schaper	25601b9fcc	Document sed substitution for user readability ... Comment the oneliner with explanations of what each step does.	2017-05-13 17:49:58 -07:00
Adam Hill	55f78e3b64	Update list.sh ... I believe this has feature parity with `sed /foo/ Id` but also supports busybox, and my alpine docker ;)	2017-05-13 18:44:41 -05:00
WaLLy3K	f9d41caeb6	Merge branch 'development' into blockpage2	2017-05-13 23:29:44 +10:00
Hans Geiblinger	b166410cbf	Solve piholeLogFlush.sh having to be issued 2 x to clear logs (#1460) ... Simplified the command -v syntax, and added a sleep 3 timer to the first execution of the log rotation. The second execution was being issued while the first was still running, thus it would fail and you would have to issue the "Flush Logs" command a second time.	2017-05-12 22:39:55 +02:00
0412465564	31d5a7ae9e	whitelist on website blocked doesnt work (#1452) ... Since Pi-hole redirects ad domains to itself, accessing the script via de.ign.com is the same as pi.hole in this case. The fix should be as simple as adding a / before admin on this line.	2017-05-12 22:29:07 +02:00
Dan Schaper	5bb91759b4	Merge pull request #1459 from WaLLy3K/patch-2 ... Provide remote hashes for version.sh	2017-05-12 12:38:13 -07:00
Dan Schaper	80c4b7c9bb	Merge pull request #1455 from pi-hole/tweak/logecho_gateway ... Debug: Log and echo gateway responses	2017-05-12 12:02:21 -07:00
WaLLy3K	ea0a9ceb37	Provide remote hashes for version.sh ... * Provide remote hashes for comparison * Use double braces for all conditions (for consistency) * Suppress potential "cd" error output * Provide "not applicable" output upon any hash request for FTL	2017-05-12 15:25:01 +10:00
WaLLy3K	f875976268	Replacing superseded file with dummy content	2017-05-11 21:02:04 +10:00
WaLLy3K	1c2aa44d46	Provide notice message for whitelisted sites	2017-05-11 20:10:40 +10:00
WaLLy3K	3b44a0da32	Provide error message if not found in any list	2017-05-11 20:09:00 +10:00
Dan Schaper	501b26decd	Log and echo gateway responses	2017-05-10 22:08:06 -07:00
WaLLy3K	c6596f2c54	Modified syntax to be valid for Shellcheck	2017-05-11 14:19:13 +10:00
WaLLy3K	2863308090	Minimise string duplication & other minor changes ... Instead of duplicating output strings, rewrite core/web/ftlOutput() into one neat versionOutput().	2017-05-11 13:34:58 +10:00
WaLLy3K	7fef1fdc83	Fixed indentation	2017-05-11 10:11:04 +10:00
WaLLy3K	fe0a35cc7a	Update -h to work as --hash ... Also provide error output as per https://github.com/pi-hole/pi-hole/pull/1447#issuecomment-300600093	2017-05-11 08:30:49 +10:00
WaLLy3K	03201e2f20	Display FTL version & version.sh rewrite ... While testing to make sure `pihole -v` would output `pihole-FTL version`, I noticed some options didn't work how I expected them to. For example, if I use `pihole -v -p`, I would expect to see the version output of Pi-hole Core. Instead, I'm informed that it's an invalid option. I've had the following things in mind while rewriting this: * I'm operating under the assumption that FTL is only installed if the Admin Console is (Line 113 exit 0) * I have modified the help text to only output with `pihole -v --help` * I have modified all output to be more similar to the output style of `grep` and `curl` (Ditching ":::") Testing output: ``` w3k@MCT:~$ pihole -v Pi-hole version is v3.0.1-14-ga928cd3 (Latest: v3.0.1) Admin Console version is v3.0-9-g3760482 (Latest: v3.0.1) FTL version is v2.6.2 (Latest: v2.6.2) w3k@MCT:~$ pihole -v -c Current Pi-hole version is v3.0.1-14-ga928cd3 Current Admin Console version is v3.0-9-g3760482 Current FTL version is v2.6.2 w3k@MCT:~$ pihole -v -l Latest Pi-hole version is v3.0.1 Latest Admin Console version is v3.0.1 Latest FTL version is v2.6.2 w3k@MCT:~$ pihole -v -p --hash Current Pi-hole hash is a928cd3 w3k@MCT:~$ pihole -v -a --hash Current Admin Console hash is 3760482 w3k@MCT:~$ pihole -v --help Usage: pihole -v [REPO | OPTION] [OPTION] Show Pi-hole, Web Admin & FTL versions <Shows all Repositories and Options> w3k@MCT:~$ pihole -v -foo Invalid Option! ```	2017-05-10 13:07:56 +10:00
WaLLy3K	173ad339bb	Update CSS location	2017-05-08 19:33:45 +10:00
Adam Warner	9beb9fd941	Merge pull request #1384 from pi-hole/checkoutImprovements ... Stash changes when switching branches	2017-05-05 23:22:54 +01:00
DL6ER	9cc392fa02	Update Marks PR after the Promo code has been merged	2017-05-04 11:43:48 +02:00
WaLLy3K	4d731ca30b	Updated landing page location ... During development, I had the location of `/pihole/index.php` as just `/index.php`. Just correcting some changes!	2017-05-03 15:33:50 +10:00
WaLLy3K	f2016f26d7	Updated splash page CSS href	2017-05-03 15:29:43 +10:00
Adam Warner	9c136a5579	functionise Hashing	2017-05-02 22:24:37 +01:00
WaLLy3K	a8818c16d8	Fixed unnecessary usage of !important	2017-05-02 19:51:13 +10:00
WaLLy3K	7bcea98d0c	Do not activate letsencrypt.conf if found	2017-05-02 17:28:51 +10:00
WaLLy3K	74b15d10d9	Update lighttpd.conf.fedora ... Mirror changes found in `lighttpd.conf.debian`	2017-05-02 17:24:55 +10:00
WaLLy3K	356c70cdae	Update lighttpd.conf.debian ... * Disable `include-conf-enabled.pl`, as blindly enabling HTTPS (as Let's Encrypt does by having a file in that folder) creates Block Page inefficiencies * Make Block page handle JS request rewrite, allowing users to better utilise their `lighttpd` service * Make Block page handle debugging Pi-hole header * Make Block page redirect users from `pi.hole` to `http://pi.hole/admin`	2017-05-02 17:24:07 +10:00
WaLLy3K	dfb5c37d98	Delete index.js	2017-05-02 17:21:40 +10:00
DL6ER	30dcf6ff47	Include pihole-FTL.log in debug report	2017-05-02 09:18:58 +02:00
WaLLy3K	551add5f44	Update index.php ... * An "About Pi-hole" link on the block page provides an ELI5 explanation to those not familiar with Pi-hole * An email contact link on the block page provides users of your Pi-hole with a means to easily get in touch with you * Browsing to your Pi-hole's address will show a simple "landing page", which can be replaced by adding "landing.php" within "/var/www/html" * Users manually browsing to file/image based content (i.e: non HTML based content) on blocked sites will be greeted with a small "Blocked by Pi-hole" image * Sites that are manually blacklisted will display a notice of this on the block page * Sites that aren't directly blocked, but have a CNAME record, will show a notification on the block page (e.g: If raw.githubusercontent.com is not blocked, but github.map.fastly.net is) * On the block page, "Back to Safety" now directs the user to "about:home" if Javascript is disabled * Whitelisting is disabled for installs without a password, or if a client does not have Javascript * Known issues: * Admin Console needs a text field under "Web User Interface" where the admin can enter a preferred contact email when a site needs to be whitelisted, to be saved to setupVars.conf with the key "ADMIN_EMAIL" * Admin Console needs a text field under "Networking" where the admin can enter their Pi-hole's externally contactable FQDN, allowing access to their landing page when browsing to mypi.duckdns.org, to be saved to setupVars.conf with the key "FQDN" * I am not aware of expected output of `$_SERVER["VIRTUAL_HOST"]`, so I have assumed it should be filtered as if it's a domain	2017-05-02 17:06:31 +10:00
WaLLy3K	88944a31ec	Update blockingpage.css ... * Block page UI overhaul to replicate the style of the Admin Console * Block page UI is now mobile friendly * Users can safely customise text in order to make the block page more friendly for their household	2017-05-02 17:05:24 +10:00
DL6ER	19e688effb	Add localise-queries flag to 01-pihole.conf	2017-04-30 13:47:07 +02:00
Dan Schaper	bfc4775b34	Merge pull request #1297 from raincoats/development ... Redirect to admin panel when accessing 'http://pi.hole/'	2017-04-26 12:35:19 -07:00
DL6ER	db1e5f10ea	Make changes according to comment in #1384	2017-04-21 17:08:15 +02:00
DL6ER	f1f70133dc	Populate $ipv4 and $ipv6 + fix small error that prevented blocking page from coming up at all. Fixes #1396	2017-04-20 13:53:27 +02:00
DL6ER	320c06e0a4	Flush twice to move data out-of-sight of FTL	2017-04-17 21:25:15 +02:00
Adam Warner	2e398c5da4	stash changes on branch switch, else it fails if any changes have been made.	2017-04-14 17:20:13 +01:00
DL6ER	fcd92d27f7	Don't use PID file but rather "pidof pihole-FTL" for detecting if another process is already running	2017-04-12 15:12:09 +02:00
DL6ER	3eacfa9831	Improve FTL's service script	2017-04-12 14:13:18 +02:00
gedetil	ff6df76e36	Update webpage.sh ... Implement "Halt system" button, next to "Restart system" button, on admin/settings page. Useful for doing clean shutdown before powering off. (This affects 4 files, 3 for the web content, 1 for backend script.) Gilbert Detillieux <gedetil> 2017-04-11	2017-04-11 12:04:44 -05:00
Mcat12	a96b4d28e1	Merge pull request #1365 from pi-hole/adlistImprovements ... Adlist improvements	2017-04-06 16:15:50 -04:00
Mcat12	57e8b7f924	Merge pull request #1355 from pmo3/development ... Mask password input when changing password	2017-04-03 20:23:19 -04:00
Flo	7e0aa822b6	Match the Pi-hole brand (#1358) ... * Update README.md * Update index.php * Update basic-install.sh * Update piholeCheckout.sh * Update update.sh * Update CONTRIBUTING.md * Update the Pi-hole brand tip in CONTRIBUTING.md Use a better formulation. * Update README.md 2	2017-04-03 17:29:57 +02:00
DL6ER	ad9575ce18	Recognize more host names	2017-04-03 16:28:18 +02:00
Adam Warner	3cf9942465	spacing fixed	2017-03-31 23:00:56 +01:00
Adam Warner	153031482f	Add delete mode to adlist command. Might be abetter way to do this	2017-03-31 22:51:10 +01:00
Adam Warner	af2cff5177	remove call to user list	2017-03-31 20:13:04 +01:00
Adam Warner	5435b93df2	remove spaces	2017-03-31 20:05:45 +01:00
Adam Warner	3a3dde6298	add adlist argument redirector	2017-03-31 20:03:56 +01:00
Adam Warner	b4bc90fb85	add in CustomizeAdlists function	2017-03-31 19:35:52 +01:00
DL6ER	f09c166350	Improve Error 404 page behavior	2017-03-28 14:02:00 +02:00
Patrick O'Brien	24868fdb2b	Merge remote-tracking branch 'upstream/development' into development	2017-03-27 13:38:19 -04:00
Patrick O'Brien	a463250ecf	don't hash an empty password	2017-03-27 13:37:19 -04:00
Flo	6eb9192cd1	Complete site ... The start <html>-tag was missing.	2017-03-25 16:11:37 +01:00
Patrick O'Brien	94f15f1b3c	Merge remote-tracking branch 'upstream/development' into development	2017-03-23 18:47:50 -04:00
Patrick O'Brien	ee296f36c1	mask password input on command line	2017-03-23 18:47:30 -04:00
Mcat12	fb3e6ee35c	Source setupVars before attempting to use it ... Fixes #1347	2017-03-21 18:01:51 -04:00
Dan Schaper	2740c68a63	Merge pull request #1335 from pi-hole/tweak/debug_templog ... Debugging tweaks for temporary logfiles	2017-03-16 23:35:15 -07:00
Dan Schaper	b1f769b671	Output cleaning, IP stack check headers. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-15 23:50:29 -07:00
Dan Schaper	77378da70a	Cat out temp files to final log. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-15 23:43:41 -07:00
Dan Schaper	160030b75f	Quiet systemctl output to just the current daemon status. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-15 23:27:18 -07:00
Dan Schaper	0a0c3a2fb7	Copy working temp to final location. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-15 23:20:12 -07:00
Dan Schaper	e9f1ca338f	Create temp files for working storage, log to working storage temps. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-15 22:49:47 -07:00
Adam Warner	cfaf1ac67c	add check on file_parse to not include WEBPASSWORD= in the debug log	2017-03-15 18:59:41 +00:00
Adam Warner	6b862dd9e9	Only remove from wildcard list if domain is being added to whitelist or blacklist	2017-03-13 20:38:34 +00:00
Markus Napp	bb7a7d94ef	Replace misleading letter variable	2017-03-12 16:16:45 +01:00
Markus Napp	9a475cc010	Rewrite help text for better handling of params	2017-03-12 15:50:48 +01:00
Markus Napp	ae30c285a2	Fix handling of wildcard help text	2017-03-12 15:45:11 +01:00
Dan Schaper	2e74219ff9	Merge pull request #1313 from pi-hole/new/piholecheckout ... Checkout adjustments	2017-03-11 13:01:11 -08:00
Dan Schaper	b0ae954f1e	Only update when update flag is set to "true" ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-11 12:37:36 -08:00
Dan Schaper	a2404f104a	Just some style and linting. And a cd in fetch_checkout_pull_branch ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-11 12:21:15 -08:00
DL6ER	38547ced7a	Can only diff once upstream branch is tracked	2017-03-11 16:55:37 +01:00
DL6ER	9a9d9007cd	Add missing "== true"	2017-03-11 16:49:47 +01:00
DL6ER	bd2d81f691	source setupVars.conf to see if INSTALL_WEB is true or not	2017-03-11 16:46:52 +01:00
DL6ER	1b9e7fbf2e	Test if branch is locally available is not reliable because of possible ambiguities	2017-03-11 16:40:10 +01:00
DL6ER	d4a49d192f	Correct variable name	2017-03-11 16:38:28 +01:00
DL6ER	8cb66544d2	Remove "\ "	2017-03-11 16:36:54 +01:00
DL6ER	140ac192aa	The web repo might actually be missing and this is n error (not installed because the user didn't want it)	2017-03-11 16:30:58 +01:00
DL6ER	b961b13d60	Small bugfix	2017-03-11 16:27:00 +01:00
DL6ER	febdb4a190	Use git diff to determine if code has changed (no need to run the installer if it hasn't changed at all)	2017-03-11 16:24:13 +01:00
DL6ER	1d60b62e7a	Testing alternative way of fetching/checking out of a single branch	2017-03-11 16:11:23 +01:00
Dan Schaper	41e1e4cb68	Rearrange pull logic, some optimization. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-10 11:25:35 -08:00
Dan Schaper	d5b88e0df8	Get the right name for the options. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-10 11:07:58 -08:00
Dan Schaper	20fd61468d	Require branch to check out ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-10 11:04:37 -08:00
Dan Schaper	0a0d25dff4	Script runs in subshell, no need to cd back to pwd. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-10 10:57:46 -08:00
raincoats	1590a179fa	Change 302 redirect to 301 ... Change "302 Found" response to "301 Moved Permanently", as "302 Found" is meant for temporary redirects. Was asked to do so in this comment: https://github.com/pi-hole/pi-hole/pull/1297#issuecomment-284335421	2017-03-09 17:38:56 +11:00
DL6ER	2b3afbfef8	Merge pull request #1310 from pi-hole/new/piholecheckout ... Pi-hole checkout feature	2017-03-09 00:43:35 +01:00
DL6ER	81a1057cac	Fix something Dan has overlooked	2017-03-09 00:30:36 +01:00
DL6ER	fd310c6445	Back to how we had it before, because --unshallow does not work at all	2017-03-09 00:28:02 +01:00
Dan Schaper	a9b52518bf	Shift numbers for argument identifiers, functions are called after shift ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-08 14:29:51 -08:00
Dan Schaper	87da40068c	Always exited with value 1, now exits with proper value. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-08 14:18:08 -08:00
Dan Schaper	b8f1eadb7f	Shift off checkout from being passed to script from pihole ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-08 14:17:56 -08:00
Dan Schaper	b522d8eaf6	Source and reuse existing variables, centralize code. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-08 13:41:11 -08:00
Dan Schaper	89ff99322d	Don't need to remember pwd inside a function, calling function doesn't change directories. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-08 13:30:08 -08:00
Dan Schaper	56e17d1010	Source functions and variables from basic-install.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-08 13:28:24 -08:00
DL6ER	d2ab0694b7	Add "master" shortcut	2017-03-08 13:18:34 +01:00
DL6ER	8a14a63d5d	Pi-hole checkout feature	2017-03-08 13:16:40 +01:00
DL6ER	8235b18854	Remove duplicated line	2017-03-08 12:09:34 +01:00
DL6ER	e0e9ebbe74	Merge pull request #1307 from pi-hole/fix/versionwithoutwebinterface ... Don't try to obtain version of web interface it it is not installed	2017-03-07 23:54:32 +01:00
DL6ER	10bc8414b9	Move FTL querying before clearing the terminal to avoid flashing on Pi B+	2017-03-07 18:10:05 +01:00
DL6ER	4e25e0dc5c	Add missing } to JSON output	2017-03-07 17:57:57 +01:00
DL6ER	b1a9793d94	Let Chronometer query all data from FTL (no need for having the API). Fixes #1305	2017-03-07 17:54:11 +01:00
DL6ER	6dea00668e	Don't try to obtain version of web interface it it is not installed. Fixes #1303	2017-03-07 13:08:01 +01:00
DL6ER	ae9182c92e	Merge pull request #1301 from pi-hole/fix/removewildcard ... Remove wildcard entry when adding the very same domain either the white- or blacklist	2017-03-06 23:53:06 +01:00
DL6ER	cf31561267	Remove wildcard entry when adding the very same domain either the white- or blacklist	2017-03-06 16:25:35 +01:00
DL6ER	a97f0b1298	Merge pull request #1300 from pi-hole/fix/deletehostrecord ... Bugfix for when deleting host-record	2017-03-06 16:16:42 +01:00
Dan Schaper	d1e0f3ae18	Merge pull request #1294 from pi-hole/tweak/debugDNS ... Tweak DNS debugging	2017-03-06 05:50:37 -08:00
DL6ER	47a6786e8f	Use proper test syntax	2017-03-06 14:02:56 +01:00
DL6ER	a69fcbb91e	Bugfix for when deleting host-record	2017-03-06 13:44:13 +01:00
Dan Schaper	8e2b51b391	Merge pull request #1296 from pi-hole/fix/debugVersion ... Debug version detection improvements	2017-03-05 07:13:41 -08:00
Dan Schaper	560af43204	Merge pull request #1293 from pi-hole/fix/version ... Account for hash in versioning	2017-03-05 07:10:18 -08:00
DL6ER	baefec86f2	Add CLI teleporter feature	2017-03-05 14:08:44 +01:00
raincoats	eb763d2dc2	Redirect to admin panel when accessing 'http://pi.hole/' ... If someone tries to access 'http://pi.hole/', it will take them to the "Website blocked" page. Very confusing if you don't know to go to 'http://pi.hole/admin/'. This just redirects them to the admin panel.	2017-03-05 16:58:21 +11:00
Dan Schaper	512c650441	Shellchecking. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-04 19:07:55 -08:00
Dan Schaper	dc44fc9e27	Version check amalgamation and removal of && || logic. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-04 17:54:38 -08:00
Dan Schaper	6f2fb57c08	Protocol specific records checks. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-04 15:16:33 -08:00
Dan Schaper	2547cc4c8d	Only run IPv6 if enabled, split out Chaos TXT checks. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-04 15:06:34 -08:00
DL6ER	9f4ef66f41	Add IPv6 resolver test	2017-03-04 22:38:52 +01:00
DL6ER	086f0790fc	Add Google's IPv6 address for potential IPv6 resolver tests	2017-03-04 22:31:18 +01:00
Dan Schaper	709b44f736	IPv4 DNS tests ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-04 12:16:43 -08:00
Dan Schaper	6cd4ff6d68	Organize functions and function calls. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-04 12:16:32 -08:00
Dan Schaper	abd3e828de	Optimize normalOutput ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-04 07:46:00 -08:00
DL6ER	b85af50d14	Generate only the information that is actually asked for	2017-03-04 14:08:11 +01:00
Dan Schaper	0e8fd49669	Function... ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-03 23:30:57 -08:00
Dan Schaper	945e22874e	Collapse duplicate functions, and take out argument loops. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-03 23:12:28 -08:00
Dan Schaper	77ab47a984	Awk for perl ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-03 22:34:55 -08:00
Dan Schaper	ed8088f203	Functions for Core/Web version and hash. And only check first argument in each section. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-03 22:10:32 -08:00
Dan Schaper	8831b22fc8	Prototype function for getting version of local repo ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-03 21:36:38 -08:00
Dan Schaper	0341bd1758	Optimize code, undoc flag for current hash. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-03 20:32:26 -08:00
Dan Schaper	9bb4a5fb25	Factor out variables from display. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-03 20:16:53 -08:00
Dan Schaper	ebfffea5dc	Always show something, even if it's just the short hash of the latest commit. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-03 20:04:55 -08:00
Dan Schaper	81939ab265	Get short hash of local and remote ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-03 19:14:30 -08:00
DL6ER	f2fe84c9d3	Merge pull request #1292 from pi-hole/master ... Merge patches back into devel	2017-03-03 23:45:29 +01:00
DL6ER	f626406685	Revert #1273	2017-03-03 23:14:12 +01:00
DL6ER	dd971b6ee5	Default behavior is old behavir (listen on gravity interface (e.g. eth0), permit all origins)	2017-03-03 22:58:41 +01:00
DL6ER	f1b8abf503	Merge pull request #1146 from pi-hole/tweak/chronometer_recentlyblocked ... [FTL] Show most recently blocked domain in chronometer	2017-03-03 12:20:43 +01:00
DL6ER	66b7d04b82	Merge branch 'development' into new/FTL-binary	2017-03-01 12:42:48 +01:00
DL6ER	7ba47f504c	Add special "except-interface" line in case of listening on all interfaces	2017-03-01 12:15:04 +01:00
DL6ER	0be1717ff4	Fix config error	2017-03-01 11:46:48 +01:00
DL6ER	189a4e0078	Add option to skip restarting of dnsmasq	2017-03-01 11:26:06 +01:00
DL6ER	3adf8785d8	Move "all" down in help text to not suggest that it is the default	2017-03-01 11:07:05 +01:00
DL6ER	b74862bfc5	Actually apply new setting by restarting dnsmasq	2017-03-01 11:02:08 +01:00
DL6ER	01273124ea	Change to -i, interface	2017-03-01 10:59:55 +01:00
DL6ER	721ada7e16	Fix typo	2017-03-01 10:52:21 +01:00
DL6ER	bd9dc91396	Add response for users manually setting this up via CLI	2017-03-01 10:50:13 +01:00
DL6ER	de6c43a8d3	Setup interface listening behavior of dnsmasq	2017-03-01 10:46:20 +01:00
Dan Schaper	f6fc6a5e56	Merge pull request #1281 from pi-hole/tweak/web_debug ... Back end changes for Web based debug calls.	2017-02-27 12:21:33 -08:00
Dan Schaper	83b0600863	Carriage return or newline based webcalls. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-02-27 11:03:57 -08:00
Dan Schaper	6c130b7960	Vebiage and highligh the token, also ::: ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-02-27 10:27:11 -08:00
Dan Schaper	7244d44a1d	Notify user that log is being uploaded. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-02-27 10:02:00 -08:00
Dan Schaper	9b060aab34	Debug auto mode engaged ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-02-26 18:22:06 -08:00
DL6ER	ec7e75a6e3	Don't save interface= line to dnsmasqs config file	2017-02-24 16:02:24 +01:00
DL6ER	ce6c465942	Merge pull request #1266 from pi-hole/new/host-record ... Add host-record option	2017-02-23 17:32:10 +01:00
Jacob Salmela	7a1a2dec67	update license to EUPL on core files	2017-02-22 11:55:20 -06:00
DL6ER	7ed1bbad49	Add host-record option	2017-02-22 14:43:07 +01:00
DL6ER	078cc7660e	Improved updater logic	2017-02-22 11:00:45 +01:00
DL6ER	af2893d2ce	Updater implementation for FTL	2017-02-22 10:43:13 +01:00
ProtoFoo	fb6631d317	Removed a line that did nothing.	2017-02-21 22:22:30 +01:00
ProtoFoo	cd0b8927c5	Removed a line that did nothing.	2017-02-21 22:22:03 +01:00
ProtoFoo	3fab34687c	Redirect pi.hole to pi.hole/admin/	2017-02-21 20:38:09 +01:00
ProtoFoo	b2d78edae9	Redirect pi.hole to pi.hole/admin/	2017-02-21 20:36:59 +01:00
DL6ER	a64211123f	Some debug additions	2017-02-21 16:46:54 +01:00
DL6ER	4f85ace525	Force pihole user to use sh-shell (instead of nologin)	2017-02-21 14:46:53 +01:00
DL6ER	e8fde702a0	Also chown the other files	2017-02-21 11:52:07 +01:00
DL6ER	e339f3852c	Change ownership of FTL log to pihole user	2017-02-21 11:50:08 +01:00
DL6ER	032f94afc0	Don't suppress su's output	2017-02-21 11:46:31 +01:00
DL6ER	90ccbef431	pihole-FTL init.d script	2017-02-21 11:18:47 +01:00
Adam Warner	a7def771c8	Revert "redirect pi.hole to pi.hole/admin"	2017-02-19 20:12:32 +00:00
Adam Warner	543f1243e2	Merge pull request #1241 from pi-hole/feature/redirect-pi-hole-to-admin ... redirect pi.hole to pi.hole/admin	2017-02-18 20:59:03 +00:00
Dan Schaper	053b38e0bd	Set up for IP matching in detection.	2017-02-16 19:45:44 -08:00
Dan Schaper	2aa3a109a0	Ping gateways and Internet.	2017-02-16 18:38:05 -08:00
Dan Schaper	472708376d	Split out IP checks.	2017-02-16 18:30:15 -08:00
Dan Schaper	cfed3d59e9	Begin fixing IP detection functions.	2017-02-16 16:49:14 -08:00
Jacob Salmela	26cb6a1929	redirect pi.hole to pi.hole/admin	2017-02-11 20:46:27 -06:00
Jacob Salmela	7c63bbfe44	Merge pull request #1233 from ProtoFoo/patch-1 ... Add manual edit warnings to lighttpd.conf.* files	2017-02-11 08:10:35 -06:00
DL6ER	af8e629df4	Merge pull request #1239 from pi-hole/tweak/debug48h ... Change description as we want to save the debug log for 48h instead of only 24h	2017-02-10 20:46:12 +01:00
DL6ER	01f980d49c	Change description as we want to save the debug log for 48h instead of only 24h	2017-02-10 17:45:20 +01:00
DL6ER	99fab7e52a	Scan whole dnsmasq.d directory for cofigurations files	2017-02-10 17:42:37 +01:00
Mcat12	ba67144e34	Merge branch 'development' into adminPageAsOption	2017-02-09 16:27:07 -05:00
ProtoFoo	162d9d7d57	Add manual edit warning ... Added text block from 01-pihole.conf to warn user that manual changes to lighttpd config will be overwritten. Slight cosmetic adjustments (tabs -> spaces).	2017-02-09 17:00:52 +01:00
ProtoFoo	357f5a2cfd	Add manual edit warning ... Added text block from dns config file to warn user that manual changes to lighttpd config will be overwritten. Slight cosmetic adjustments (tabs -> spaces).	2017-02-09 16:46:55 +01:00
DL6ER	7785dac50e	Merge pull request #1228 from r0ckarong/development ... Justify and improve help texts, add missing wildcard description	2017-02-08 14:05:53 +01:00
Markus Napp	01f643e5eb	fixup! Fix spacing for wildcard help in list script	2017-02-08 12:56:28 +01:00
Markus Napp	8037f3e332	Fix spacing for wildcard help in list script	2017-02-08 12:55:14 +01:00
Markus Napp	afe5176e01	Justify help output to match main script	2017-02-08 12:41:53 +01:00
Mcat12	a48317883d	Fix indentation	2017-02-07 18:14:41 -05:00
Promofaux	4fcf8fd23f	Merge in development branch - resolve conflict in update.sh	2017-02-05 19:39:02 +00:00
Promofaux	10a30344e5	No need to source setupVars, as basic-install.sh is sourced, which sources setupVars itself. Sourception.	2017-02-05 19:29:56 +00:00
Promofaux	b764d17c64	comment	2017-02-05 19:18:27 +00:00
Promofaux	ba0abdb88d	wrap update logic in admin_installed bool check	2017-02-05 19:12:09 +00:00
Promofaux	1428b58dde	source setupVars and only check admin repo if it is enabled	2017-02-05 19:07:04 +00:00
Mcat12	18eb8a2159	Merge pull request #1185 from pi-hole/cleanup/git_functions ... Move git functions to one script	2017-01-31 19:05:53 -05:00
DL6ER	3239c7023a	Merge pull request #1170 from pi-hole/new/DHCPstaticleases ... Backend changes for static DHCP leases	2017-01-31 21:07:36 +01:00
DL6ER	da05491992	Merge pull request #1192 from pi-hole/fix/regex ... Remove misplaced start of string expression	2017-01-30 21:25:45 +01:00
DL6ER	3d4516dc95	Improve regex	2017-01-29 20:27:20 +01:00
DL6ER	509c864cc3	Merge branch 'development' into fix/regex	2017-01-29 20:27:04 +01:00
DL6ER	8b22f435ad	Change how user and group are stored in the logrotate config file (necessary on Ubuntu 16.04.1)	2017-01-29 19:58:53 +01:00
Mcat12	f8944177a0	Fix chronometer interpreting summaryRaw	2017-01-29 13:32:48 -05:00
DL6ER	06873fe69e	Remove misplaced start of string expression. Fixes #1191	2017-01-29 13:54:39 +01:00
Dan Schaper	3d9d13222b	Use constants for leading paths.	2017-01-28 17:42:55 -08:00
Dan Schaper	745adabb05	Path to source basic-install.sh	2017-01-28 17:38:14 -08:00
Dan Schaper	3861b57dc6	Start moving reused utility functions to one script.	2017-01-28 17:32:42 -08:00
Dan Schaper	99a4a80017	Spelling	2017-01-28 17:08:38 -08:00
Mcat12	033ba26041	Stay in repo directory until we error check	2017-01-28 20:00:02 -05:00
DL6ER	08cddba200	There should be no echo here	2017-01-28 21:49:31 +01:00
DL6ER	1bf43b0425	Improved regex: Remove all leading points from domain (.....xyz => .xyz). Return not only a part, but fill validated domain	2017-01-28 21:48:19 +01:00
DL6ER	85b3fef08d	Use perl instead of grep?	2017-01-28 00:39:10 +01:00
DL6ER	15037fa888	Typo	2017-01-28 00:17:32 +01:00
DL6ER	d595fef18f	Fix regex	2017-01-28 00:15:06 +01:00
Dan Schaper	be5fa22b6f	Merge pull request #1174 from pi-hole/tweak/logrotate_insecure_directory ... Improve logrotate support	2017-01-27 11:18:06 -08:00
DL6ER	6fd7e0311c	Install customized version of logrotate script	2017-01-27 14:16:24 +01:00
DL6ER	1bcf2dd0fc	Tweak CLI domain filter	2017-01-27 00:45:57 +01:00
DL6ER	dad18dc5de	Changed keywords	2017-01-25 10:35:45 +01:00
DL6ER	5c95c4074b	Remove static leases from DHCP static leases file	2017-01-25 10:35:03 +01:00
DL6ER	4301b9a12a	Add static DHCP leases to new file	2017-01-25 10:33:25 +01:00
DL6ER	6a89c6bf3b	Silence rm warning if no DHCP server is used	2017-01-23 15:06:36 +01:00
Promofaux	fe8c365d17	codacy never lies	2017-01-22 20:53:30 +00:00
Promofaux	9acc3aac01	pipe du -h output to awk to ensure we only get the file size, and not the filename too. Yeah that's right Dom, pipe.	2017-01-22 20:44:07 +00:00
Promofaux	1ad23a065e	switch out wc -l with grep -c ^	2017-01-22 20:38:46 +00:00
Promofaux	de102fde5c	Add line count and size check for pihole.log	2017-01-22 20:38:09 +00:00
DL6ER	8bb9dd460b	Be able to disable the DHCP domain name	2017-01-18 12:22:03 +01:00
Mcat12	58f3ff69d8	Align comment with referenced line	2017-01-16 18:51:13 -05:00
DL6ER	72d8d10e64	Show most recently blocked domain in chronometer (using FTL). Fixes #717	2017-01-16 22:39:58 +01:00
Mcat12	63d02df0bc	Merge pull request #1130 from pi-hole/new/logrotate ... Use logrotate for pihole.log	2017-01-16 15:11:11 -05:00
DL6ER	08f08fea61	Merge pull request #1135 from pi-hole/new/multipleDNSservers ... Allow multiple DNS servers	2017-01-13 23:48:38 +01:00
DL6ER	1ed2a8637f	Removed debug echo's	2017-01-13 23:39:57 +01:00
Mcat12	d196c13f2c	Merge pull request #1131 from pi-hole/chronometerJsonUnixTools ... No excuse for chronometer not to match API	2017-01-13 16:34:51 -05:00
DL6ER	bd1c5a42e8	Allow multiple DNS servers	2017-01-13 17:49:55 +01:00
DL6ER	845d8c0e63	Ensure LC_NUMERIC=C is set when evaluating floating point number (non-English systems might expect "," as decimal separator	2017-01-13 12:59:49 +01:00
DL6ER	bcb8a52418	Added user to cron file	2017-01-13 11:57:07 +01:00
Promofaux	b4c32e47c6	Missed one!	2017-01-12 22:07:07 +00:00
Promofaux	248d8680f7	actual codacy complaints	2017-01-12 21:51:10 +00:00
Promofaux	1bda965a7c	Codacy complaints	2017-01-12 21:50:16 +00:00
Promofaux	2ee305769d	Replace all calculations with values read directly web admin API. Parse JSON using native unix tools, no additional requirements needed.	2017-01-12 21:23:58 +00:00
DL6ER	3a8a936575	Corrected path	2017-01-12 21:01:52 +01:00
DL6ER	6b6fbc4709	Remove --force on @reboot	2017-01-12 20:41:25 +01:00
DL6ER	3fd2ffd466	Add logrotate for pihole.log	2017-01-12 20:39:25 +01:00
DL6ER	b56ca2b834	Add DNSSEC support to Pi-hole core	2017-01-12 16:02:41 +01:00
Mcat12	df7671d393	Add a few comments and remove debug output	2017-01-11 18:01:27 -05:00
DL6ER	a263936243	Merge branch 'development' into wildcardblacklisting	2017-01-11 18:25:51 +01:00
DL6ER	11924d425b	Hide whitelist option if we detected that the domain as blocked due to wildcard blocking	2017-01-11 17:07:08 +01:00
DL6ER	6b3aea933d	Add info that whitelisting blocked pages does not work	2017-01-09 15:02:31 +01:00
DL6ER	2935275227	Merge branch 'development' into wildcardblacklisting	2017-01-09 14:53:01 +01:00
DL6ER	74a4e62cc9	Codacy fix	2017-01-08 11:26:56 +01:00
DL6ER	63a414a544	Align outputs	2017-01-08 11:21:50 +01:00
DL6ER	7d1f5091a7	Fixed small typo	2017-01-08 11:21:10 +01:00
DL6ER	3b54cab3bc	Show branches and revisions (incl. possible dirty state) in debug log	2017-01-08 11:17:25 +01:00
DL6ER	d9e949b27c	Merge pull request #1096 from pi-hole/fix/updater ... Fix updater failing on non-English systems	2017-01-06 23:36:42 +01:00
DL6ER	168397e90d	Fixed typo in webpage.sh	2017-01-05 21:45:06 +01:00
DL6ER	e3c1fcd2c6	NEW LOGIC FOR THE UPDATER ... Compare local and remote hashes. Update is available if current remote hash is different from current local hash since we assume that local should never be newer than remote for user	2017-01-05 13:10:19 +01:00
DL6ER	200995bf29	Make IPv6 features of Pi-hole DHCP server switchable	2017-01-03 14:24:33 +01:00
DL6ER	3a90c1c192	Source setupVars.conf before trying to access variables	2017-01-03 13:34:01 +01:00
Adam Warner	12bec1df68	Merge pull request #1048 from pi-hole/tweak/simplify_webpage.sh ... Major simplification of webpage.sh + extend DHCP to IPv6	2017-01-02 14:28:26 +00:00
DL6ER	ad61852804	Test against empty string	2017-01-02 11:10:38 +01:00
DL6ER	dbd8aee4ee	Add 'local' domain if not set in setupVers.conf	2017-01-02 11:08:54 +01:00
DL6ER	677694b01a	Set 24h lease time if settings was empty before	2017-01-02 11:05:40 +01:00
DL6ER	85f0241c0d	Reprocess DHCP settings after update	2017-01-02 10:50:59 +01:00
DL6ER	ebf0db4bbf	Typo fixed	2016-12-31 17:17:46 +00:00
DL6ER	9ac265980f	Add .conf to filename	2016-12-31 13:41:19 +00:00
DL6ER	40798da6b1	Add blacklisting wildcard support	2016-12-31 12:49:04 +00:00
Dan Schaper	fc596e41d4	All scripts set executable	2016-12-30 18:35:16 -08:00
Mcat12	7bcc15e416	Adjust blocking page paths from admin restructure	2016-12-30 15:36:53 -05:00
DL6ER	1a3bdbaabf	Merge pull request #1057 from pi-hole/new/whitelistonblockingpage ... Allow whitelisting from blocking page	2016-12-30 21:07:34 +01:00
Mcat12	5e35fdbc52	Save blocking page CSS to pihole directory instead of admin	2016-12-30 14:42:15 -05:00
Mcat12	ab2c486f25	Fix password Enter handling ... Also remove extranious form information, since JS handles that	2016-12-30 14:13:15 -05:00
Mcat12	7fd7430d38	Use pi.hole when getting js and css ... If a user is able to get to this page, they must be using Pi-hole	2016-12-30 13:43:29 -05:00
Mcat12	089b98430f	Fix formatting	2016-12-30 12:59:05 -05:00
DL6ER	5c7fc05a32	Enable DHCP logging by default	2016-12-30 16:31:57 +00:00
DL6ER	09bbc81470	Add notice that the user might have to flush his DNS cache	2016-12-30 12:27:33 +00:00
Dan Schaper	f7274addcd	Delete swapfile generator, haven't used this in a long time. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2016-12-30 04:08:32 -08:00
DL6ER	09bfa2ef77	Add whitelisting on blocking page feature	2016-12-30 12:03:45 +00:00
DL6ER	9181a4a1d8	Apply dhcp lease time also for IPv6	2016-12-29 14:26:23 +00:00
DL6ER	3268e1611a	Backend accept and apply dhcp lease time	2016-12-29 14:19:44 +00:00
DL6ER	cf724176dc	Do stateful DHCPv6 and SLAAC	2016-12-28 20:02:48 +00:00
DL6ER	1e627c7e8f	Make webpage.sh fully library style	2016-12-28 16:25:14 +00:00
DL6ER	9af26cbaac	Major simplification of webpage.sh	2016-12-28 02:14:47 +00:00
DL6ER	321ea8a3a9	Merge branch 'development' into webUIprivacymode	2016-12-27 21:27:11 +01:00
Dan Schaper	ef8292d371	Merge branch 'development' into updater_rewrite	2016-12-27 11:59:52 -08:00
Dan Schaper	c5f5252145	Merge pull request #961 from pi-hole/customblockpage ... Custom Pi-Hole block page	2016-12-27 10:25:03 -08:00
Dan Schaper	62d001225a	Merge pull request #1040 from pi-hole/fix/updater_git-C ... Remove git -C from update.sh	2016-12-25 12:28:42 -08:00
DL6ER	e50947eb58	mend	2016-12-25 21:26:06 +01:00
DL6ER	ca056d32d2	Remove git -C	2016-12-25 21:22:59 +01:00
DL6ER	a0e0465036	Revert "Merge pull request #1018 from pi-hole/diginc-patch-1" ... This reverts commit ff3c36a7a2, reversing changes made to 9355a8ad0e.	2016-12-25 17:32:59 +01:00
DL6ER	e15548cbf5	Add --quiet to git fetch in GitCheckUpdateAvail()	2016-12-25 01:18:58 +01:00
DL6ER	5e28e6b9ac	Removed remaining git -C	2016-12-25 01:17:46 +01:00
Dan Schaper	3365ef7aaa	is_repo() returns values to caller, silence function. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2016-12-24 11:54:04 -08:00
Dan Schaper	68c17b26dc	Bashisms ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2016-12-24 11:41:42 -08:00
Dan Schaper	e647efd471	Shell script, not javascript ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2016-12-24 11:24:20 -08:00
DL6ER	15db1ffdd5	Remove variables not needed any more	2016-12-24 15:48:43 +01:00
DL6ER	4632b0f797	Updated updater logic	2016-12-24 15:40:31 +01:00
DL6ER	65c35a5530	Use new subroutine to determine if updates are available	2016-12-24 15:32:25 +01:00
DL6ER	c449a1c0e0	Added GitCheckUpdateAvail()	2016-12-24 15:19:39 +01:00
DL6ER	b020010f0d	Removed some of the &> /dev/null	2016-12-24 15:08:30 +01:00
DL6ER	0276c72fe2	replace 'git -C' with long version (see #1009)	2016-12-24 15:05:57 +01:00
DL6ER	04a9791be2	Save empty password	2016-12-23 23:41:40 +01:00
Adam Warner	c1982c04ff	Merge pull request #1029 from pi-hole/bogusDNS_BOGUS_PRIVentries ... remove `DNS_BOGUS_PRIV` from setupVars.conf	2016-12-23 19:32:13 +00:00
Promofaux	9a62026830	remove DNS_BOGUS_PRIV from setupVars.conf	2016-12-23 19:27:02 +00:00
bcambl	2fb0dc0a4a	add warning if SELinux is Enforcing	2016-12-23 10:27:52 -06:00
Adam Warner	ef1ce66793	Merge pull request #1013 from pi-hole/fix/chronometer ... Fix chronometer.sh	2016-12-23 11:12:20 +00:00
Adam Warner	3bc5d1bae0	Merge pull request #989 from pi-hole/APIresolveclientsandupstream ... Implement backend for AdminLTE/#253	2016-12-23 10:37:48 +00:00
Adam Warner	ff3c36a7a2	Merge pull request #1018 from pi-hole/diginc-patch-1 ... pihole.cron reduce duplication	2016-12-23 09:41:48 +00:00
Adam Hill	5e53f484be	Update pihole.cron ... Stop repeating the path.	2016-12-22 22:00:17 -06:00
DL6ER	bb28d94884	Merge branch 'development' into customblockpage ... Conflicts: automated install/basic-install.sh	2016-12-22 19:22:09 +01:00
DL6ER	a4f58b0a22	Look for "query[" instead of "query" to avoid false-positives, like listed below ... root@raspberrypi:/etc/.pihole# grep 'query' /var/log/pihole.log | grep -v 'query\[' Dec 22 16:29:50 dnsmasq[30801]: forwarded code.jquery.com to 208.67.222.222 Dec 22 16:29:50 dnsmasq[30801]: reply code.jquery.com is <CNAME> Dec 22 16:29:50 dnsmasq[30801]: reply code.jquery.netdna-cdn.com is 94.31.29.54 Dec 22 16:29:50 dnsmasq[30801]: reply code.jquery.netdna-cdn.com is 23.111.11.3 Dec 22 16:29:50 dnsmasq[30801]: reply code.jquery.netdna-cdn.com is 198.232.125.113	2016-12-22 19:09:37 +01:00
DL6ER	bcf8139708	Removed cat where we don't need it	2016-12-22 18:55:14 +01:00
DL6ER	9b0390c9da	Space to Tab	2016-12-22 18:53:44 +01:00
DL6ER	e88f58c34e	Remove grpping for today's log entries, because we flush the log every day	2016-12-22 18:45:53 +01:00
DL6ER	4626b8ced5	Removed fixed username from sudoers file	2016-12-22 13:18:38 +01:00
DL6ER	ee8f29d178	Fixed typo, extended help text	2016-12-20 16:28:28 +01:00
DL6ER	da363070c7	Added Kelvin	2016-12-20 12:21:08 +01:00
DL6ER	715838cf89	Allow disabling second DNS server	2016-12-19 13:42:42 +01:00
DL6ER	7a243f890e	Backend for privacyMode on webUI	2016-12-16 17:33:01 +01:00
DL6ER	afabb5957b	Implement backend for https://github.com/pi-hole/AdminLTE/pull/253	2016-12-15 18:55:40 +01:00
Mcat12	a0019d86c5	Merge pull request #983 from pi-hole/cronpath ... Fix missing path information for cron	2016-12-15 07:01:20 -05:00
DL6ER	3c4a9bba78	Minor change	2016-12-15 10:38:24 +01:00
Adam Warner	4348653431	Merge pull request #985 from pi-hole/pi.hole ... A man has no name. Even though his name is Jaqen H'ghar	2016-12-15 08:49:22 +00:00
Promofaux	e7713a9028	add missing pihole autocomplete commands	2016-12-14 19:53:40 +00:00
Promofaux	684ac98c8e	Remove hostname and pi.hole entries, move to /etc/pihole/local.list	2016-12-14 19:28:01 +00:00
DL6ER	9a2ffabc33	Fix missing path information	2016-12-14 17:33:20 +01:00
DL6ER	2977168da1	dnsmasq "bogus-priv" property	2016-12-14 16:16:25 +01:00
DL6ER	85e3f37503	dnsmasq "domain-needed" property	2016-12-14 16:09:57 +01:00
DL6ER	ba015c1918	Set domain name via Settings page	2016-12-14 14:24:09 +01:00
DL6ER	1556adb678	Also remove quiet-dhcp setting when disabling/enabling the Pi-Hole DHCP server	2016-12-14 12:12:36 +01:00
Adam Warner	6bfe729112	Merge pull request #979 from pi-hole/wwwdatapassword ... Prevent web UI password change by web user	2016-12-13 16:33:41 +00:00
DL6ER	207422f83a	Added a missing space	2016-12-13 15:54:41 +01:00
DL6ER	004ba28378	Prevent web UI password change by web user	2016-12-13 15:52:28 +01:00
DL6ER	6f38801ed8	Add "Interface appearence" option	2016-12-13 14:59:52 +01:00
DL6ER	b8d2bfc890	Wait 5 seconds before rebooting so the web UI can finish loading before being unreachable due to the reboot	2016-12-13 12:42:40 +01:00
DL6ER	bc91716082	Suppress logging of DHCP actions to /var/log/pihole.log	2016-12-12 17:14:52 +01:00
DL6ER	8dc0dc4d69	Add DHCP-Server backend	2016-12-12 15:34:05 +01:00
DL6ER	2f4b7ce3dd	Update dnsmasq file when changing upstream DNS servers and restart the service to get it active	2016-12-12 14:17:02 +01:00
DL6ER	d4f83cb1d4	Be able to set API_QUERY_LOG_SHOW	2016-12-12 13:15:07 +01:00
DL6ER	aaab3306a8	Add restart DNS capability	2016-12-12 10:38:21 +01:00
DL6ER	2bafa2f2ac	Add reboot option	2016-12-11 22:33:27 +01:00
DL6ER	9ac378ae09	Set domains and clients which are excluded by the API	2016-12-11 19:30:04 +01:00
DL6ER	bf867bd9fd	Set DNS servers from web UI	2016-12-11 16:54:27 +01:00
DL6ER	505c9e8979	Minor change	2016-12-06 14:08:45 +01:00
DL6ER	75deb02961	Don't query pihole if page is hidden anyhow	2016-12-06 14:05:48 +01:00
DL6ER	480211033d	Detect if blocking page is loaded within frame or iframe. If so, hide everything	2016-12-06 14:05:02 +01:00
DL6ER	ca9321624c	Added padding for ad list results	2016-12-05 14:40:48 +01:00
DL6ER	40f18df90f	Simplified CSS, removed external contents	2016-12-05 14:39:07 +01:00
DL6ER	0d63cfd6c3	Add 1x1 pixel GIF image. Can apparently be used to trick some of the please-don't-use-adblocker pages as many of them contain code like if ($('Ad').height() == 0) { prevent access to this page; }	2016-12-05 12:34:30 +01:00
DL6ER	3d6b22de6c	Update index.php to include more detailed output	2016-12-05 12:12:01 +01:00
DL6ER	fc233fcdd3	Fixed typo	2016-12-05 12:10:05 +01:00
DL6ER	20370d4348	Update CSS file	2016-12-05 11:26:21 +01:00
DL6ER	0f90671241	Updated index.php to use CSS file unter admin/	2016-12-05 10:51:41 +01:00
DL6ER	a866c4e388	Place blockingpage.css (former index.css) unter admin/ so we can load it also from some blocked sub-directories	2016-12-05 10:50:19 +01:00
DL6ER	e7241a989c	Include CSS file	2016-12-04 22:20:51 +01:00
DL6ER	6e788668f9	Updated index.php	2016-12-04 22:17:33 +01:00
DL6ER	b246dba7e7	Rename index.html to index.php	2016-12-04 21:41:26 +01:00
Mcat12	f98de3d5db	Merge pull request #941 from DL6ER/caseinsensitive ... Improvements for black-/whitelist scripts	2016-12-04 14:33:10 -05:00
DL6ER	78cb43d0dc	Revert "Simplified EscapeRegexp()" ... This reverts commit 509cfd15f2.	2016-12-03 00:32:37 +01:00
DL6ER	509cfd15f2	Simplified EscapeRegexp()	2016-12-02 14:17:34 +01:00
DL6ER	2061daa902	Don't forget to escape also the slash "/"	2016-12-02 14:11:17 +01:00
DL6ER	629ca970a1	Changed from single quoted filter expression to double quotes as reqeusted by codacy	2016-12-02 14:08:54 +01:00
DL6ER	c8ad6f23a8	Properly escape any special characters before using them in regexp manner	2016-12-02 12:57:04 +01:00
Dan Schaper	925c80edd4	Catch more 1's ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2016-12-01 15:10:06 -08:00
Dan Schaper	2ec4acfe52	Begin fixing exit values. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2016-12-01 12:21:08 -08:00
DL6ER	7b26b308ad	No need for echo and pipe here!	2016-11-21 15:50:05 +01:00
DL6ER	4c10634d85	Convert domain names to lower case before checking validity of the domain	2016-11-21 15:49:11 +01:00
Adam Warner	de4401823e	Merge pull request #924 from DL6ER/webpage.sh ... Add webpage.sh	2016-11-20 21:43:44 +00:00
DL6ER	f50cbe74cb	Changed -web (webpage) to -a (admin)	2016-11-20 15:15:27 +01:00
DL6ER	33b6fe72da	Extended help text	2016-11-19 21:57:42 +01:00
DL6ER	733919be4a	Implement possibility to remove password using "pihole -web -p"	2016-11-19 21:50:15 +01:00
Dan Schaper	68cb0782c0	Add countdown timer	2016-11-18 13:27:06 -08:00
Dan Schaper	0f4c8d4923	Set default timeout to 60 seconds	2016-11-17 11:00:11 -08:00
Dan Schaper	6d2c5b2312	Add debug timeoute	2016-11-17 10:58:58 -08:00
Dan Schaper	a95ce11ca6	Add debug timeoute	2016-11-17 10:39:51 -08:00
DL6ER	88c161769d	Capitalized variable names.	2016-11-16 22:33:28 +01:00
DL6ER	01bf1ae92d	Compute double hashes to avoid rainbow table vulnerability	2016-11-16 22:13:47 +01:00
DL6ER	9193c71cff	Minor change	2016-11-16 21:36:19 +01:00
DL6ER	db278d81e4	Added webpage.sh	2016-11-16 21:34:43 +01:00
Adam Warner	b191cd73a7	Update piholeDebug.sh ... wording	2016-11-15 13:28:18 +00:00
Jacob Salmela	ca56ca5bd8	promo-tweak ... Better logic introduced by @PromoFaux	2016-11-06 11:16:48 -06:00
Jacob Salmela	a0f0dff88e	replace hardcoded interface with var ... setupVars.conf is already sourced, so we just need to replace the hardcoded value with the variable name.	2016-11-06 08:18:57 -06:00
Dan Schaper	8c08e9e473	Merge pull request #891 from pi-hole/bugfix/chronometer-domain-count ... Bugfix/chronometer domain count	2016-11-03 13:55:29 -07:00
Adam Warner	4300759287	Fix logic. If both v6 and v4 divide by two, else dont.	2016-11-03 08:01:25 +00:00
Promofaux	d7d6d6f991	Update to use new Var name	2016-11-02 21:46:30 +00:00
Promofaux	2f976504e8	switch out -eq for ==	2016-11-02 20:06:21 +00:00
Dan Schaper	4b7b859db9	Gotta catch 'em all...'	2016-11-02 12:29:55 -07:00
Dan Schaper	f7d0de53bb	Compare string to string.	2016-11-02 12:11:34 -07:00
Dan Schaper	603ec997ba	Remove testing block.	2016-11-02 12:09:33 -07:00
Dan Schaper	f7266ef4c8	Version remote check returns -1 on failure to detect curl silent failing. Update detects loss of contact to GitHub or fallthrough condition and reports to user.	2016-11-02 12:07:59 -07:00
Dan Schaper	3d43e1568c	Use explicit calls for function to self-document	2016-11-02 11:39:22 -07:00
Dan Schaper	c1a3f003e8	Rename the only utilty function left that didn't say repo	2016-11-02 11:18:13 -07:00
Dan Schaper	3f61aea7fc	Utility functions fully quiet now. Calling functions have the echos.	2016-11-02 11:09:53 -07:00
Dan Schaper	bd68db51e0	ShellCheck split local declaration and assignment.	2016-11-02 11:01:50 -07:00
Dan Schaper	b8a5ed710e	Take echos out of utility functions and move up a level.	2016-11-02 10:51:09 -07:00
Dan Schaper	34be601dd7	Test for lexicographically less than tag version.	2016-11-02 10:42:05 -07:00
Dan Schaper	1d64ad1ccd	Stash all changed files, clean directory and pull updates.	2016-11-02 10:39:27 -07:00
Dan Schaper	f2d7a3d26d	Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks	2016-11-02 09:48:00 -07:00
Adam Warner	ee37c37cab	fix update output logic. version number variables should not be read only!	2016-11-02 14:29:20 +00:00
Dan Schaper	b636c1e1f8	Whitespace.	2016-11-02 07:00:43 -07:00
Dan Schaper	8b9f0487c0	Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks ... # Conflicts: # advanced/Scripts/update.sh # automated install/basic-install.sh	2016-11-02 06:57:33 -07:00
Dan Schaper	ece1667fb0	Refactor and move some bits.	2016-11-02 06:41:51 -07:00
Adam Warner	50bd8b4a09	Further tweaks to local repo handling	2016-11-02 13:34:57 +00:00
Dan Schaper	93d91353a1	All tabs now spaced	2016-11-02 05:49:33 -07:00
Dan Schaper	8dc9143b34	Just delete, no need to cd there first.	2016-11-02 05:45:29 -07:00
Dan Schaper	a0d9a1133c	Factoring and combining functions	2016-11-02 05:34:39 -07:00
Dan Schaper	035e4bf727	Move value checks to if calls.	2016-11-02 03:55:04 -07:00
Dan Schaper	9ec5bbd560	Actually get is_repo to return a value and have it expected.	2016-11-02 03:38:35 -07:00
Dan Schaper	34482c5ed6	Modified is_repo	2016-11-02 03:09:59 -07:00
Dan Schaper	7d414b5628	Move version messages to main function, check for repos.	2016-11-02 01:12:02 -07:00
Dan Schaper	d9528dfd09	Bash is funny with returns.	2016-11-02 00:51:38 -07:00
Dan Schaper	9c83825cb8	Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks	2016-11-01 22:20:32 -07:00
Dan Schaper	7a22471787	New naming convention, and reorder functions as bash would prefer them to be.	2016-11-01 22:19:40 -07:00
diginc	c30478bf4a	cleanup and use sentintel in is_repo	2016-11-01 23:21:50 -05:00
diginc	d986746ef9	missing quote added	2016-11-01 23:07:20 -05:00
diginc	a8fa061f2e	quote all the assignments prevent accidental glob splitting	2016-11-01 23:02:06 -05:00
Jacob Salmela	f8e9726922	source setupVars and check for the correct variable	2016-11-01 19:01:48 -05:00
Jacob Salmela	884363bd05	remove ipv6 check since it's already in setupVars	2016-11-01 19:01:28 -05:00
Dan Schaper	bdd240ecb6	Shellcheck catch for always true expansion.	2016-11-01 15:36:27 -07:00
Dan Schaper	04da292df9	Missed one spinner, updated and exit script if github is unreachable.	2016-11-01 12:17:38 -07:00
Dan Schaper	85b8676b8e	Remove spinner, no functions here should last that long, and it masks a few potential exit avenues.	2016-11-01 12:16:46 -07:00
Dan Schaper	114bc13c23	Specify path, cron may not know where the files are located.	2016-11-01 12:03:26 -07:00
Dan Schaper	5fef5f1ed4	Break down is_repo to make sure it does what is expected.	2016-11-01 11:54:14 -07:00
Dan Schaper	807b60b0e6	Missed the second reinstaller....	2016-11-01 11:44:16 -07:00
Dan Schaper	fbc800e556	If unattened reinstall fails, notify user and exit script immediately.	2016-11-01 11:42:18 -07:00
Dan Schaper	1991ee7a7d	Google Style Guide. readonly and cap constants.	2016-11-01 11:36:44 -07:00
Dan Schaper	ffbfadbccf	Detail what the script does.	2016-11-01 11:33:04 -07:00
Dan Schaper	c3e2bce956	Variables declared as strings, make sure they are strings when we use them in functions.	2016-11-01 11:26:57 -07:00
Dan Schaper	0c9520d7e3	Protect against unexepcted return values (GitHub not responding as we'd expect.) And make sure bash doesn't maul the variables and cause firing of unattended reinstall of application when values returned aren't as expected.	2016-11-01 11:18:41 -07:00
Dan Schaper	1e7e5230cc	Clarify what exactly is being called and the expected returned value format	2016-11-01 11:15:21 -07:00
Dan Schaper	f1efc97357	Clairfy condition to make sure they operate as per the specs of the logic flow layout.	2016-11-01 11:04:33 -07:00
Adam Warner	d6fe48112c	Merge pull request #857 from pi-hole/feature/debugUpdate ... Debug Updates	2016-10-29 23:15:07 +01:00
Dan Schaper	dcf6e6b14d	Clarify user action required to end the scripts.	2016-10-29 12:24:22 -07:00
Dan Schaper	908697a963	User token instructions, and small bugfix for missing separator.	2016-10-29 12:04:18 -07:00
Dan Schaper	fad2d6b1d1	Return values start showin up now. Logic operators too...	2016-10-28 15:53:18 -07:00
Dan Schaper	9cd830b6aa	Start to refine tests and clean up code.	2016-10-28 15:37:45 -07:00
Dan Schaper	d9a16b0ff4	Clear up bottom half of script with fewer redundenicies.	2016-10-28 15:25:06 -07:00
Dan Schaper	cb5c94ef5e	Sorry, left that gravity.list parser in. Big debug files. Cleared that up.	2016-10-28 15:13:04 -07:00
Dan Schaper	85fbd66871	Good commit point, number of changes	2016-10-28 14:52:08 -07:00
Eric Warnke	3da75d6125	Grep was leaking a file not found if blacklist didn't exist	2016-10-28 17:28:04 -04:00
Dan Schaper	d4a3a5c180	Trying to implement The Brontide Idiom for design.	2016-10-28 10:42:30 -07:00
Dan Schaper	71e3a473d6	Fix = underbar	2016-10-28 07:16:16 -07:00
Dan Schaper	c2cfc09f63	Clean up more of the UX and log. Lots to go.	2016-10-28 07:06:05 -07:00
Dan Schaper	01f10b56e8	Refactor out some more reudndant code.	2016-10-28 06:51:30 -07:00
Dan Schaper	90ec0a610e	Tricorder is introduced.	2016-10-28 04:42:45 -07:00
Dan Schaper	42bff1ce1b	Move parse utility to be near other parsing functions.	2016-10-28 03:53:53 -07:00
Dan Schaper	e3c7a1f31f	Top half user output updated.	2016-10-28 03:49:03 -07:00
Dan Schaper	0debbffa70	Add a couple of parsing utility functions.	2016-10-28 03:45:07 -07:00
Jacob Salmela	473b58d26d	Merge pull request #704 from stonedbovines/development ... lighttpd.conf templates change	2016-10-27 20:22:46 -05:00
Dan Schaper	300001e766	Remove listen-address directive ... Since we declare an `interface` `dnsmasq` should ignore the `listen-address` directive thus making redundant. Removed.	2016-10-27 11:56:16 -07:00
Adam Warner	21fc6344bf	Merge pull request #849 from pi-hole/aManHasNoNameResolution ... [BugFix] A man has no name resolution	2016-10-27 19:41:07 +01:00
Dan Schaper	f9570a82cc	Remove glitchy daemon detection.	2016-10-27 00:58:24 -07:00
Dan Schaper	36285ead57	Just becuase this is bugging me, but I'll fix it later.	2016-10-27 00:32:18 -07:00
Dan Schaper	13e488dace	Daemon check for lighttpd and dnsmasq.	2016-10-27 00:30:51 -07:00
Dan Schaper	f169da8fd0	Set for quiet temporarily.	2016-10-26 14:48:11 -07:00
Dan Schaper	60741298b7	Cut more verbosity. Prep for lsof parsing and daemon tests.	2016-10-26 14:33:47 -07:00
Dan Schaper	f73734acb0	Only check IPv6 Gateway if it exists.	2016-10-26 13:57:57 -07:00
Dan Schaper	fc360abe43	Only check IPv6 if system is enabled.	2016-10-26 12:22:20 -07:00
Adam Warner	3996e11425	Merge pull request #859 from pi-hole/ImproveWhitelistBlacklist ... Improvements to White and Blacklists	2016-10-26 19:52:16 +01:00
Dan Schaper	98db002770	Tighten IP test reponse to user.	2016-10-26 11:38:19 -07:00
Eric Warnke	f1c1caf7bd	url.rewrite does not work in $HTTP block lighttpd bug #2526	2016-10-26 11:49:42 -04:00
Eric Warnke	e2997b8135	Due to lighttpd bug 2526 the url.rewrite for javascript must be placed ... outside of the $HTTP block or it will never evaluate.	2016-10-26 11:49:31 -04:00
Adam Warner	0d6a6b97f9	remove whitelist and blacklist scripts	2016-10-26 09:56:45 +01:00
Adam Warner	469ff45f01	create list.sh. Combines whitelist and blacklist scripts in an effort to reduce code duplication. ... update pihole script to reflect new white/blacklist command.	2016-10-26 09:36:02 +01:00
Dan Schaper	4269626f5d	Attribute source for bashism.	2016-10-25 21:53:41 -07:00
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
Adam Warner	18005ceee8	add hostname lines in 01-pihole.conf	2016-10-25 15:03:49 +01:00
Adam Warner	eb52f81a5c	add pi.hole entries to 01-pihole.conf	2016-10-25 14:54:10 +01: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
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
Promofaux	b79392ba2c	exit after displaying white/blacklist	2016-10-23 19:49:51 +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
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
Adam Warner	44a36368a2	Merge pull request #822 from pi-hole/ChangeWarning ... Add file change warning to header	2016-10-21 11:24:12 +01:00
Promofaux	c0012540ed	Re-add shebang	2016-10-20 21:08:07 +01:00
Promofaux	9ab6df0e54	Merge branch 'development' into promoTweaksTheSecond ... # Conflicts: # advanced/Scripts/blacklist.sh # advanced/Scripts/whitelist.sh	2016-10-20 21:06:28 +01:00
Adam Warner	3623183072	Remove reference to non-existent script	2016-10-20 13:29:12 +01:00
Dan Schaper	e6bd979aeb	Can't spell ... Fix spelling error	2016-10-20 04:27:12 -07:00
Dan Schaper	b5b6350cc7	Add file change warning to header	2016-10-20 03:42:25 -07:00
Marcus Hildum	0efda04920	Use heredocs instead of multiple calls to echo ... There were a lot of places (like in help functions) that used multiple echo calls instead of heredocs. Personal opinion but this seems cleaner.	2016-10-19 20:46:37 -07:00
Marcus Hildum	28eeaf201b	Standardize function declaration ... There were no fewer than three styles of function declaration going on in these files, so I attempted to standardize them to the typical myfucn() { } style.	2016-10-19 19:47:45 -07:00
Promofaux	a64f4cd871	whitelist script now only directly edits whitelist.txt. DOES NOT TOUCH HOST FILE, instead calls gravity with a no download argument	2016-10-19 23:17:20 +01:00
Promofaux	a41eff1276	Blacklist script now only directly edits blacklist.txt. DOES NOT TOUCH HOST FILE, instead calls gravity with a no download argument	2016-10-19 23:16:52 +01:00
Adam Warner	b66f23cfd0	account for new update script	2016-10-18 14:19:44 +01:00
Adam Warner	27d6e5d8cf	Complete overhaul of update logic. Moved to seperate script	2016-10-18 14:19:25 +01:00
Adam Warner	ce46c4dec4	remove prematurely added code	2016-10-18 12:11:02 +01:00
Adam Warner	013d77488a	complete overhaul of version script. Now with optional arguments!	2016-10-18 12:07:11 +01:00
Adam Warner	29ad2496b6	don't output "elevating with sudo" in pihole script, just do it.	2016-10-18 12:05:48 +01:00