Commit Graph

1009 Commits

Author SHA1 Message Date
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