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
b207fadc04
check if os is supported based on pretty name
2017-06-01 00:18:06 -05:00
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
2fea5d428d
condense repetitive code into functions
2017-05-27 15:47:15 -05:00
d51e0c49b1
remove comments and blank lines when parsing files
2017-05-27 13:44:33 -05:00
36907edd50
parse contents of each file in each dir, several log_writes
2017-05-27 00:04:42 -05:00
7ec169ab10
more comments, fixed automated tricorder, variablizing echos, verify FTL version
2017-05-26 22:05:50 -05:00
7873da1ae5
more colors. shortened dig timeouts
2017-05-26 15:17:26 -05:00
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
96f01e670f
add functions to write to console and log at the same time
2017-05-26 12:16:22 -05:00
10139241f5
Fix output IPv4 addr when removing CIDR notation ( #1498 )
2017-05-26 09:57:27 +02:00
5902be2a49
comments for every line
2017-05-24 22:07:15 -05:00
cc946ce068
upload to tricorder functions
2017-05-24 21:11:15 -05:00
1102fdc44b
append everything the user sees to the pihole_debug.log file
2017-05-24 20:24:23 -05:00
c995c81fff
adjust some spacing
2017-05-24 19:36:06 -05:00
6684af9938
add lighttpd list function and gravity analysis
2017-05-24 18:31:55 -05:00
8bafd12f95
fix resolver functions and add x-header function
2017-05-24 16:10:14 -05:00
76266cf31b
add resolver functions and check directory content functions
2017-05-24 15:29:31 -05:00
4ad0cdf5d4
Rewrite Chronometer to output more stats
2017-05-25 01:03:13 +10:00
1a87d3a659
add process check function
2017-05-23 22:57:22 -05:00
085f2c6ca0
add port check function
2017-05-23 22:32:30 -05:00
b74300f67c
add ping internet function and fix some spacing issues
2017-05-22 12:57:55 -05:00
107babe8f4
add ping gateway function
2017-05-22 12:35:57 -05:00
8fd9a22d18
add detect IP function
2017-05-22 12:05:42 -05:00
8c5c1316dd
add php version and processor check functions
2017-05-22 08:48:56 -05:00
daff5d8b5a
add critical dependencies version check functions
2017-05-22 03:05:51 -05:00
6c4a7b626e
add pihole version check functions
2017-05-22 02:39:00 -05:00
1aa5943e67
add if directory exists function
2017-05-22 01:06:15 -05:00
69fe889f92
comments for all lines and small formatting changes
2017-05-21 23:25:53 -05:00
5d7ef9281f
get just the OS pretty name for Dan
2017-05-20 02:01:56 -05:00
6fa00e7cc8
first functions with pretty colors. check OS, setupVars, and contents of .d dirs
2017-05-20 01:34:13 -05:00
f6732a484e
Merge pull request #1317 from r0ckarong/development
...
Fixed handling of `pihole -wild` help text
2017-05-18 11:16:25 +10:00
42eb811910
Add "quiet" mode + update comments in the cron file
2017-05-17 12:54:43 +02:00
c9042ffedd
Print echos only when manual flushing is requested
2017-05-17 12:51:04 +02:00
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
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
7d17c652f3
Merge branch 'development' into development
2017-05-16 10:18:32 +10:00
90119c75d5
more merge conflicts!
2017-05-14 16:43:20 +01:00
30035ce1c2
Merge branch 'development' into tweak/help-output
2017-05-14 13:03:33 +10:00
3bd677c102
Show help for "pihole -v -h"
...
* Indent output text
* Minor help text change
2017-05-14 11:57:46 +10:00
0e4473685b
Show help for "pihole -a -i --help"
2017-05-14 11:47:56 +10:00
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
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
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
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
5bb91759b4
Merge pull request #1459 from WaLLy3K/patch-2
...
Provide remote hashes for version.sh
2017-05-12 12:38:13 -07:00
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
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
501b26decd
Log and echo gateway responses
2017-05-10 22:08:06 -07:00
c6596f2c54
Modified syntax to be valid for Shellcheck
2017-05-11 14:19:13 +10:00
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
7fef1fdc83
Fixed indentation
2017-05-11 10:11:04 +10:00
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
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
2017-05-10 13:07:56 +10:00
9beb9fd941
Merge pull request #1384 from pi-hole/checkoutImprovements
...
Stash changes when switching branches
2017-05-05 23:22:54 +01:00
9cc392fa02
Update Marks PR after the Promo code has been merged
2017-05-04 11:43:48 +02:00
9c136a5579
functionise Hashing
2017-05-02 22:24:37 +01:00
30dcf6ff47
Include pihole-FTL.log in debug report
2017-05-02 09:18:58 +02:00
db1e5f10ea
Make changes according to comment in #1384
2017-04-21 17:08:15 +02:00
320c06e0a4
Flush twice to move data out-of-sight of FTL
2017-04-17 21:25:15 +02:00
2e398c5da4
stash changes on branch switch, else it fails if any changes have been made.
2017-04-14 17:20:13 +01:00
a96b4d28e1
Merge pull request #1365 from pi-hole/adlistImprovements
...
Adlist improvements
2017-04-06 16:15:50 -04:00
57e8b7f924
Merge pull request #1355 from pmo3/development
...
Mask password input when changing password
2017-04-03 20:23:19 -04:00
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
3cf9942465
spacing fixed
2017-03-31 23:00:56 +01:00
153031482f
Add delete mode to adlist command. Might be abetter way to do this
2017-03-31 22:51:10 +01:00
af2cff5177
remove call to user list
2017-03-31 20:13:04 +01:00
5435b93df2
remove spaces
2017-03-31 20:05:45 +01:00
3a3dde6298
add adlist argument redirector
2017-03-31 20:03:56 +01:00
b4bc90fb85
add in CustomizeAdlists function
2017-03-31 19:35:52 +01:00
a463250ecf
don't hash an empty password
2017-03-27 13:37:19 -04:00
94f15f1b3c
Merge remote-tracking branch 'upstream/development' into development
2017-03-23 18:47:50 -04:00
ee296f36c1
mask password input on command line
2017-03-23 18:47:30 -04:00
fb3e6ee35c
Source setupVars before attempting to use it
...
Fixes #1347
2017-03-21 18:01:51 -04:00
2740c68a63
Merge pull request #1335 from pi-hole/tweak/debug_templog
...
Debugging tweaks for temporary logfiles
2017-03-16 23:35:15 -07:00
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
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
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
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
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
cfaf1ac67c
add check on file_parse to not include WEBPASSWORD= in the debug log
2017-03-15 18:59:41 +00:00
6b862dd9e9
Only remove from wildcard list if domain is being added to whitelist or blacklist
2017-03-13 20:38:34 +00:00
bb7a7d94ef
Replace misleading letter variable
2017-03-12 16:16:45 +01:00
9a475cc010
Rewrite help text for better handling of params
2017-03-12 15:50:48 +01:00
ae30c285a2
Fix handling of wildcard help text
2017-03-12 15:45:11 +01:00
2e74219ff9
Merge pull request #1313 from pi-hole/new/piholecheckout
...
Checkout adjustments
2017-03-11 13:01:11 -08:00
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
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
38547ced7a
Can only diff once upstream branch is tracked
2017-03-11 16:55:37 +01:00
9a9d9007cd
Add missing "== true"
2017-03-11 16:49:47 +01:00
bd2d81f691
source setupVars.conf to see if INSTALL_WEB is true or not
2017-03-11 16:46:52 +01:00
1b9e7fbf2e
Test if branch is locally available is not reliable because of possible ambiguities
2017-03-11 16:40:10 +01:00
d4a49d192f
Correct variable name
2017-03-11 16:38:28 +01:00
8cb66544d2
Remove "\ "
2017-03-11 16:36:54 +01:00
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
b961b13d60
Small bugfix
2017-03-11 16:27:00 +01:00
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
1d60b62e7a
Testing alternative way of fetching/checking out of a single branch
2017-03-11 16:11:23 +01:00
41e1e4cb68
Rearrange pull logic, some optimization.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-10 11:25:35 -08:00
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
Jacob Salmela
WaLLy3K
DL6ER
Adam Warner
Dan Schaper
Adam Hill
Hans Geiblinger
Adam Warner
Mcat12
Flo
Patrick O'Brien
Dan Schaper
Markus Napp