951 Commits (a97e361661c98bce0676c631d90a7e5f7cc1cc56)

Author	SHA1	Message	Date
DL6ER	279e809aaf	Use `poweroff` instead of `halt` ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	0d037e96fb	Merge branch 'development' into gedetil-development ... Signed-off-by: DL6ER <dl6er@dl6er.de> Conflicts: advanced/Scripts/webpage.sh	7 years ago
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	7 years ago
WaLLy3K	bab44c52ae	Merge branch 'development' into blockpage2	7 years ago
WaLLy3K	7cac207c00	Merge branch 'development' into tweak/gravity	7 years ago
Adam Warner	199de9ebc0	Merge branch 'development' into new/https	7 years ago
Adam Warner	504ae0193f	Merge branch 'development' into blockpage2	7 years ago
WaLLy3K	1ae403b742	Merge pull request #1667 from pi-hole/install-space ... Remove erroneous space	7 years ago
Adam Warner	18b41adbf6	Merge branch 'development' into tweak/gravity	7 years ago
Mcat12	898fdf7a60	Merge pull request #1602 from molikuner/development ... Fix URL extension parsing	7 years ago
Adam Warner	78143c2ff4	Merge branch 'development' into blockpage2	7 years ago
Adam Warner	7b1524ad01	Merge branch 'development' into new/https	7 years ago
Adam Warner	5799485b0f	Merge branch 'development' into development	7 years ago
Adam Warner	0a9965292c	Additional check to fix any existing cases of "24h" in setupVars.conf automatically. ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	4fb66e632f	The other h	7 years ago
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>	7 years ago
Adam Warner	d90489b31d	Include branch we're switching from ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
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>	7 years ago
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>	7 years ago
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>	7 years ago
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>	7 years ago
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	7 years ago
WaLLy3K	61ff0452e1	Remove duplicate code ... * Make RestartDNS() use `pihole restartdns` Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	7 years ago
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>	7 years ago
WaLLy3K	49aee8b931	Fixed development branch check	7 years ago
WaLLy3K	f2a3b557c8	Updated Block Page to work with queryFunc output	7 years ago
Adam Warner	0a062d26e6	Merge pull request #1611 from pi-hole/developmentNew ... Sort out Merge conflicts with master	7 years ago
Adam Warner	eb8333c772	Merge branch 'development' into developmentNew	7 years ago
Adam Warner	247d3ed729	list availible branches for FTL ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
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	7 years ago
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>	7 years ago
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	7 years ago
Adam Warner	783f50657b	Merge branch 'development' into tweak/checkout_FTL ... Signed-off-by: Adam Warner <adamw@rner.email> # Conflicts: # advanced/Scripts/piholeCheckout.sh	7 years ago
WaLLy3K	3631d1349e	Prevent Web Admin from printing restartdns colour codes (#1575) ... * Prevent Web Admin from printing unnecessary msgs * Make DNS restart behaviour consistent	7 years ago
Adam Warner	7d56e2a937	`FTL` has an `L` in it, innit? ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
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	7 years ago
Molikuner	9934f505a5	Fix URL extension parsing ... when there is a querystring Pi-hole sometimes parsed a wrong extension	7 years ago
Jacob Salmela	fb66fb12c5	put "no password will be set" on a newline.	7 years ago
Jacob Salmela	042dcf795c	fixes #1430	7 years ago
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	7 years ago
DL6ER	bb8a263d70	ShellCheck	7 years ago
DL6ER	70fd94edb3	Edit message when requested branch of FTL is not available	7 years ago
WaLLy3K	1bebcef265	Make Chronometer usable on smaller screens (#1518)	7 years ago
DL6ER	6ce79ae1d0	Fix git commands (#1577)	7 years ago
Adam Warner	b3eb5c4f0e	Colour Tweaks (#1549)	7 years ago
DL6ER	ec4e9780ed	Accept underscores when validating domain names (#1571)	7 years ago
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	7 years ago
Jacob Salmela	05a724afae	codacy appeasement: remove useless cats	7 years ago
Jacob Salmela	1957b002bc	add comments about X-Headers and further explain the file descriptor cod.	7 years ago
Jacob Salmela	04cef25add	remove color character codes before uploading so the log is more readable on our plaintext tricorder server	7 years ago
DL6ER	98afb0e998	pihole checkout ftl	7 years ago
DL6ER	e9d81fc883	Backend additions for aufit log feature (#1399)	7 years ago
Jacob Salmela	22fac5e1e0	additional shellcheck fixes	7 years ago
Jacob Salmela	b6a2a4ad5a	more shellcheck fixes	7 years ago
Jacob Salmela	5f00347019	appease shellcheck by removing two unneccesary functions and making some if/else blocks	7 years ago
Mcat12	009363a7bb	Merge pull request #1560 from pi-hole/fix/ad-domain-hostname ... Move local.list after the ad blocking lists	7 years ago
Mcat12	8dc94e014f	Merge branch 'development' into fix/invalid-ipv6-wildcard	7 years ago
Mcat12	78e7c8b8e9	Merge branch 'development' into fix/ad-domain-hostname	7 years ago
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>	7 years ago
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/)	7 years ago
Mcat12	cb09e0bc9a	Strip `/*` from the end of the IPv6 address ... Fixes #1536	7 years ago
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"	7 years ago
DL6ER	0283a1ab74	Introduce new file black.list for blacklist content	7 years ago
DL6ER	54a88ab5ab	Change ownership of /etc/pihole to user/group pihole. Fixes #1529 (#1530)	7 years ago
WaLLy3K	aff5ff08d5	Trim version output when update is successful (#1527)	7 years ago
Jacob Salmela	fc0440546f	add functions to parse head and tails of gravity.list and pihole.log	7 years ago
Jacob Salmela	172b8d2427	parse ftl log	7 years ago
Jacob Salmela	6d10a498a5	implement a limit on how many lines of a file we want to view	7 years ago
Jacob Salmela	881819ed5f	ignore big files we dont need to know about; also fix diagnosing pihole processes	7 years ago
Jacob Salmela	3275c5f710	more comments to help understand the script	7 years ago
Jacob Salmela	b0cc1a38c3	adjust minor formatting for better readability	7 years ago
Jacob Salmela	e10182c839	only parse files required by Pi-hole	7 years ago
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	7 years ago
Jacob Salmela	64171fa2a1	small color and formatting changes	7 years ago
Jacob Salmela	048eacd305	parse array in correct location	7 years ago
Jacob Salmela	24aa72c19d	condense repetative code into functions; parse the content of each file	7 years ago
Jacob Salmela	92b5fe4be4	check arch compatibility and add gateway faq url	7 years ago
DL6ER	f1146a3443	Don't update FTL when there is a core update (as this will update FTL a second time). Fixes #1516	7 years ago
DL6ER	2516a1e298	Make clear that NO is the default if the user just hits return (#1514)	7 years ago
DL6ER	8ef64dbe74	Add weekly logrotation of FTL's log (#1509)	7 years ago
Jacob Salmela	8b4c0b456b	exclude webpassword from being uploaded. also check that the IP addresses detected match those defined in setupVars.conf	7 years ago
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.	7 years ago
Jacob Salmela	b207fadc04	check if os is supported based on pretty name	7 years ago
Jacob Salmela	d51c067e1b	change some verbiage; new function to compare the ports in use to the services assigned to them.	7 years ago
Jacob Salmela	2fea5d428d	condense repetitive code into functions	7 years ago
Jacob Salmela	d51e0c49b1	remove comments and blank lines when parsing files	7 years ago
Jacob Salmela	36907edd50	parse contents of each file in each dir, several log_writes	7 years ago
Jacob Salmela	7ec169ab10	more comments, fixed automated tricorder, variablizing echos, verify FTL version	7 years ago
Jacob Salmela	7873da1ae5	more colors. shortened dig timeouts	7 years ago
Jacob Salmela	ef5a6e7880	add faq urls to some functions, added more colors, also use a static url for remote digs	7 years ago
Jacob Salmela	96f01e670f	add functions to write to console and log at the same time	7 years ago
WaLLy3K	10139241f5	Fix output IPv4 addr when removing CIDR notation (#1498)	7 years ago
Jacob Salmela	5902be2a49	comments for every line	7 years ago
Jacob Salmela	cc946ce068	upload to tricorder functions	7 years ago
Jacob Salmela	1102fdc44b	append everything the user sees to the pihole_debug.log file	7 years ago
Jacob Salmela	c995c81fff	adjust some spacing	7 years ago
Jacob Salmela	6684af9938	add lighttpd list function and gravity analysis	7 years ago
Jacob Salmela	8bafd12f95	fix resolver functions and add x-header function	7 years ago
Jacob Salmela	76266cf31b	add resolver functions and check directory content functions	7 years ago
WaLLy3K	4ad0cdf5d4	Rewrite Chronometer to output more stats	7 years ago
Jacob Salmela	1a87d3a659	add process check function	7 years ago
Jacob Salmela	085f2c6ca0	add port check function	7 years ago
Jacob Salmela	b74300f67c	add ping internet function and fix some spacing issues	7 years ago
Jacob Salmela	107babe8f4	add ping gateway function	7 years ago
Jacob Salmela	8fd9a22d18	add detect IP function	7 years ago
Jacob Salmela	8c5c1316dd	add php version and processor check functions	7 years ago
Jacob Salmela	daff5d8b5a	add critical dependencies version check functions	7 years ago
Jacob Salmela	6c4a7b626e	add pihole version check functions	7 years ago
Jacob Salmela	1aa5943e67	add if directory exists function	7 years ago
Jacob Salmela	69fe889f92	comments for all lines and small formatting changes	7 years ago
Jacob Salmela	5d7ef9281f	get just the OS pretty name for Dan	7 years ago
Jacob Salmela	6fa00e7cc8	first functions with pretty colors. check OS, setupVars, and contents of .d dirs	7 years ago
WaLLy3K	69fa9874dd	Use HTTP_HOST instead of SERVER_NAME ... * Fixes https://github.com/pi-hole/pi-hole/issues/1479	7 years ago
WaLLy3K	f6732a484e	Merge pull request #1317 from r0ckarong/development ... Fixed handling of `pihole -wild` help text	7 years ago
DL6ER	42eb811910	Add "quiet" mode + update comments in the cron file	7 years ago
DL6ER	c9042ffedd	Print echos only when manual flushing is requested	7 years ago
DL6ER	4e2c6a7b8e	Fix logrotation: manual flushing should be done twice, but automated rotation at midnight should only be done *once*!	7 years ago
WaLLy3K	7453bf2ee6	Fix wildcard help text ... * -wild is not a valid option since we're already using -wild	7 years ago
WaLLy3K	7d17c652f3	Merge branch 'development' into development	7 years ago
Adam Warner	90119c75d5	more merge conflicts!	7 years ago
WaLLy3K	30035ce1c2	Merge branch 'development' into tweak/help-output	7 years ago
WaLLy3K	3bd677c102	Show help for "pihole -v -h" ... * Indent output text * Minor help text change	7 years ago
WaLLy3K	0e4473685b	Show help for "pihole -a -i --help"	7 years ago
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	7 years ago
Dan Schaper	25601b9fcc	Document `sed` substitution for user readability ... Comment the oneliner with explanations of what each step does.	7 years ago
Adam Hill	55f78e3b64	Update list.sh ... I believe this has feature parity with `sed /foo/ Id` but also supports busybox, and my alpine docker ;)	7 years ago
WaLLy3K	f9d41caeb6	Merge branch 'development' into blockpage2	7 years ago
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.	7 years ago
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.	7 years ago
Dan Schaper	5bb91759b4	Merge pull request #1459 from WaLLy3K/patch-2 ... Provide remote hashes for version.sh	7 years ago
Dan Schaper	80c4b7c9bb	Merge pull request #1455 from pi-hole/tweak/logecho_gateway ... Debug: Log and echo gateway responses	7 years ago
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	7 years ago
WaLLy3K	f875976268	Replacing superseded file with dummy content	7 years ago
WaLLy3K	1c2aa44d46	Provide notice message for whitelisted sites	7 years ago
WaLLy3K	3b44a0da32	Provide error message if not found in any list	7 years ago
Dan Schaper	501b26decd	Log and echo gateway responses	7 years ago
WaLLy3K	c6596f2c54	Modified syntax to be valid for Shellcheck	7 years ago
WaLLy3K	2863308090	Minimise string duplication & other minor changes ... Instead of duplicating output strings, rewrite core/web/ftlOutput() into one neat versionOutput().	7 years ago
WaLLy3K	7fef1fdc83	Fixed indentation	7 years ago
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	7 years ago
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! ```	7 years ago
WaLLy3K	173ad339bb	Update CSS location	7 years ago
Adam Warner	9beb9fd941	Merge pull request #1384 from pi-hole/checkoutImprovements ... Stash changes when switching branches	7 years ago
DL6ER	9cc392fa02	Update Marks PR after the Promo code has been merged	7 years ago
WaLLy3K	4d731ca30b	Updated landing page location ... During development, I had the location of `/pihole/index.php` as just `/index.php`. Just correcting some changes!	7 years ago
WaLLy3K	f2016f26d7	Updated splash page CSS href	7 years ago
Adam Warner	9c136a5579	functionise Hashing	7 years ago
WaLLy3K	a8818c16d8	Fixed unnecessary usage of !important	7 years ago
WaLLy3K	7bcea98d0c	Do not activate letsencrypt.conf if found	7 years ago
WaLLy3K	74b15d10d9	Update lighttpd.conf.fedora ... Mirror changes found in `lighttpd.conf.debian`	7 years ago