906 Commits (1078aa499c26ba0b3dfb886c7a1a6f3d95d00591)

Author	SHA1	Message	Date
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	8 years ago
WaLLy3K	1c2aa44d46	Provide notice message for whitelisted sites	8 years ago
WaLLy3K	3b44a0da32	Provide error message if not found in any list	8 years ago
Dan Schaper	501b26decd	Log and echo gateway responses	8 years ago
WaLLy3K	c6596f2c54	Modified syntax to be valid for Shellcheck	8 years ago
WaLLy3K	2863308090	Minimise string duplication & other minor changes ... Instead of duplicating output strings, rewrite core/web/ftlOutput() into one neat versionOutput().	8 years ago
WaLLy3K	7fef1fdc83	Fixed indentation	8 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	8 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! ```	8 years ago
WaLLy3K	173ad339bb	Update CSS location	8 years ago
Adam Warner	9beb9fd941	Merge pull request #1384 from pi-hole/checkoutImprovements ... Stash changes when switching branches	8 years ago
DL6ER	9cc392fa02	Update Marks PR after the Promo code has been merged	8 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!	8 years ago
WaLLy3K	f2016f26d7	Updated splash page CSS href	8 years ago
Adam Warner	9c136a5579	functionise Hashing	8 years ago
WaLLy3K	a8818c16d8	Fixed unnecessary usage of !important	8 years ago
WaLLy3K	7bcea98d0c	Do not activate letsencrypt.conf if found	8 years ago
WaLLy3K	74b15d10d9	Update lighttpd.conf.fedora ... Mirror changes found in `lighttpd.conf.debian`	8 years ago
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`	8 years ago
WaLLy3K	dfb5c37d98	Delete index.js	8 years ago
DL6ER	30dcf6ff47	Include pihole-FTL.log in debug report	8 years ago
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	8 years ago
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	8 years ago
DL6ER	19e688effb	Add localise-queries flag to 01-pihole.conf	8 years ago
Dan Schaper	bfc4775b34	Merge pull request #1297 from raincoats/development ... Redirect to admin panel when accessing 'http://pi.hole/'	8 years ago
DL6ER	db1e5f10ea	Make changes according to comment in #1384	8 years ago
DL6ER	f1f70133dc	Populate $ipv4 and $ipv6 + fix small error that prevented blocking page from coming up at all. Fixes #1396	8 years ago
DL6ER	320c06e0a4	Flush twice to move data out-of-sight of FTL	8 years ago
Adam Warner	2e398c5da4	stash changes on branch switch, else it fails if any changes have been made.	8 years ago
DL6ER	fcd92d27f7	Don't use PID file but rather "pidof pihole-FTL" for detecting if another process is already running	8 years ago
DL6ER	3eacfa9831	Improve FTL's service script	8 years ago
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	8 years ago
Mcat12	a96b4d28e1	Merge pull request #1365 from pi-hole/adlistImprovements ... Adlist improvements	8 years ago
Mcat12	57e8b7f924	Merge pull request #1355 from pmo3/development ... Mask password input when changing password	8 years ago
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	8 years ago
DL6ER	ad9575ce18	Recognize more host names	8 years ago
Adam Warner	3cf9942465	spacing fixed	8 years ago
Adam Warner	153031482f	Add delete mode to adlist command. Might be abetter way to do this	8 years ago
Adam Warner	af2cff5177	remove call to user list	8 years ago
Adam Warner	5435b93df2	remove spaces	8 years ago
Adam Warner	3a3dde6298	add adlist argument redirector	8 years ago
Adam Warner	b4bc90fb85	add in CustomizeAdlists function	8 years ago
DL6ER	f09c166350	Improve Error 404 page behavior	8 years ago
Patrick O'Brien	24868fdb2b	Merge remote-tracking branch 'upstream/development' into development	8 years ago
Patrick O'Brien	a463250ecf	don't hash an empty password	8 years ago
Flo	6eb9192cd1	Complete site ... The start <html>-tag was missing.	8 years ago
Patrick O'Brien	94f15f1b3c	Merge remote-tracking branch 'upstream/development' into development	8 years ago
Patrick O'Brien	ee296f36c1	mask password input on command line	8 years ago
Mcat12	fb3e6ee35c	Source setupVars before attempting to use it ... Fixes #1347	8 years ago
Dan Schaper	2740c68a63	Merge pull request #1335 from pi-hole/tweak/debug_templog ... Debugging tweaks for temporary logfiles	8 years ago
Dan Schaper	b1f769b671	Output cleaning, IP stack check headers. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	8 years ago
Dan Schaper	77378da70a	Cat out temp files to final log. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	8 years ago
Dan Schaper	160030b75f	Quiet systemctl output to just the current daemon status. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	8 years ago
Dan Schaper	0a0c3a2fb7	Copy working temp to final location. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	8 years ago
Dan Schaper	e9f1ca338f	Create temp files for working storage, log to working storage temps. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	8 years ago
Adam Warner	cfaf1ac67c	add check on file_parse to not include WEBPASSWORD= in the debug log	8 years ago
Adam Warner	6b862dd9e9	Only remove from wildcard list if domain is being added to whitelist or blacklist	8 years ago
Markus Napp	bb7a7d94ef	Replace misleading letter variable	8 years ago
Markus Napp	9a475cc010	Rewrite help text for better handling of params	8 years ago
Markus Napp	ae30c285a2	Fix handling of wildcard help text	8 years ago
Dan Schaper	2e74219ff9	Merge pull request #1313 from pi-hole/new/piholecheckout ... Checkout adjustments	8 years ago
Dan Schaper	b0ae954f1e	Only update when `update` flag is set to "true" ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	8 years ago
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>	8 years ago