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
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
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
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
2017-05-10 13:07:56 +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
Adam Warner
9c136a5579
functionise Hashing
2017-05-02 22:24:37 +01:00
DL6ER
30dcf6ff47
Include pihole-FTL.log in debug report
2017-05-02 09:18:58 +02: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
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
