279e809aaf
Use `poweroff` instead of `halt`
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-09-08 19:33:06 +02:00
0d037e96fb
Merge branch 'development' into gedetil-development
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
Conflicts:
advanced/Scripts/webpage.sh
2017-09-08 19:32:38 +02:00
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
2017-09-05 23:28:33 +10:00
7cac207c00
Merge branch 'development' into tweak/gravity
2017-08-28 03:11:38 +10:00
1ae403b742
Merge pull request #1667 from pi-hole/install-space
...
Remove erroneous space
2017-08-24 14:00:20 +10:00
18b41adbf6
Merge branch 'development' into tweak/gravity
2017-07-29 17:14:39 +01:00
0a9965292c
Additional check to fix any existing cases of "24h" in setupVars.conf automatically.
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-28 19:40:13 +01:00
4fb66e632f
The other h
2017-07-28 16:30:03 +01:00
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>
2017-07-28 16:10:13 +01:00
d90489b31d
Include branch we're switching from
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-27 22:21:25 +01:00
f38912a0c9
- Correctly overwrite ${INFO} boxes with ${CROSS} etc
...
- Notify user that branch has been changed
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-27 21:33:41 +01:00
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>
2017-07-27 12:34:26 +10:00
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>
2017-07-26 18:00:08 +01:00
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>
2017-07-26 17:15:23 +01:00
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
2017-07-25 23:03:23 +01:00
61ff0452e1
Remove duplicate code
...
* Make RestartDNS() use `pihole restartdns`
Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
2017-07-24 21:27:12 +10:00
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>
2017-07-24 21:26:39 +10:00
0a062d26e6
Merge pull request #1611 from pi-hole/developmentNew
...
Sort out Merge conflicts with master
2017-07-17 14:49:55 +01:00
eb8333c772
Merge branch 'development' into developmentNew
2017-07-16 16:45:33 +01:00
247d3ed729
list availible branches for FTL
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-16 13:54:23 +01:00
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
2017-07-16 13:34:20 +01:00
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>
2017-07-16 13:33:00 +01:00
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
2017-07-16 22:32:34 +10:00
783f50657b
Merge branch 'development' into tweak/checkout_FTL
...
Signed-off-by: Adam Warner <adamw@rner.email>
# Conflicts:
# advanced/Scripts/piholeCheckout.sh
2017-07-16 12:25:27 +01:00
3631d1349e
Prevent Web Admin from printing restartdns colour codes ( #1575 )
...
* Prevent Web Admin from printing unnecessary msgs
* Make DNS restart behaviour consistent
2017-07-15 11:11:06 +01:00
7d56e2a937
`FTL` has an `L` in it, innit?
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-14 20:54:41 +01:00
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
2017-07-14 16:53:45 +01:00
fb66fb12c5
put "no password will be set" on a newline.
2017-07-06 20:54:09 -05:00
042dcf795c
fixes #1430
2017-07-06 20:44:40 -05:00
cb65907e60
Merge branch 'development' of https://github.com/pi-hole/pi-hole into revamp/debug
...
merge in development to avoid shellcheck from travis
2017-07-05 16:55:34 -05:00
bb8a263d70
ShellCheck
2017-07-05 19:34:20 +02:00
70fd94edb3
Edit message when requested branch of FTL is not available
2017-07-05 19:30:05 +02:00
1bebcef265
Make Chronometer usable on smaller screens ( #1518 )
2017-07-04 13:52:51 +10:00
6ce79ae1d0
Fix git commands ( #1577 )
2017-07-01 23:52:10 +02:00
b3eb5c4f0e
Colour Tweaks ( #1549 )
2017-07-01 22:08:17 +10:00
ec4e9780ed
Accept underscores when validating domain names ( #1571 )
2017-06-30 22:52:33 +10:00
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
2017-06-29 19:47:32 +01:00
05a724afae
codacy appeasement: remove useless cats
2017-06-29 11:49:28 -05:00
1957b002bc
add comments about X-Headers and further explain the file descriptor cod.
2017-06-29 11:37:58 -05:00
04cef25add
remove color character codes before uploading so the log is more readable on our plaintext tricorder server
2017-06-29 11:17:19 -05:00
98afb0e998
pihole checkout ftl
2017-06-27 14:28:05 +02:00
e9d81fc883
Backend additions for aufit log feature ( #1399 )
2017-06-27 10:53:24 +02:00
22fac5e1e0
additional shellcheck fixes
2017-06-26 22:03:45 -05:00
b6a2a4ad5a
more shellcheck fixes
2017-06-26 21:51:41 -05:00
5f00347019
appease shellcheck by removing two unneccesary functions and making some if/else blocks
2017-06-26 21:34:39 -05:00
8dc94e014f
Merge branch 'development' into fix/invalid-ipv6-wildcard
2017-06-25 18:04:38 -04:00
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>
2017-06-25 14:39:09 -07:00
cb09e0bc9a
Strip `/*` from the end of the IPv6 address
...
Fixes #1536
2017-06-24 11:14:23 -04:00
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"
2017-06-21 21:49:05 +10:00
aff5ff08d5
Trim version output when update is successful ( #1527 )
2017-06-15 09:50:05 +02:00
fc0440546f
add functions to parse head and tails of gravity.list and pihole.log
2017-06-10 23:20:27 -05:00
172b8d2427
parse ftl log
2017-06-10 22:18:33 -05:00
6d10a498a5
implement a limit on how many lines of a file we want to view
2017-06-10 21:57:17 -05:00
881819ed5f
ignore big files we dont need to know about; also fix diagnosing pihole processes
2017-06-10 18:37:28 -05:00
3275c5f710
more comments to help understand the script
2017-06-10 15:54:27 -05:00
b0cc1a38c3
adjust minor formatting for better readability
2017-06-10 15:28:04 -05:00
e10182c839
only parse files required by Pi-hole
2017-06-10 12:27:05 -05:00
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
64171fa2a1
small color and formatting changes
2017-06-09 15:42:54 -05:00
048eacd305
parse array in correct location
2017-06-07 12:31:08 -05:00
24aa72c19d
condense repetative code into functions; parse the content of each file
2017-06-07 12:25:00 -05:00
92b5fe4be4
check arch compatibility and add gateway faq url
2017-06-05 14:55:58 -05:00
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
2516a1e298
Make clear that NO is the default if the user just hits return ( #1514 )
2017-06-03 17:23:47 +02:00
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
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
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
2017-04-11 12:04:44 -05: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
20fd61468d
Require branch to check out
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-10 11:04:37 -08:00
0a0d25dff4
Script runs in subshell, no need to cd back to pwd.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-10 10:57:46 -08:00
2b3afbfef8
Merge pull request #1310 from pi-hole/new/piholecheckout
...
Pi-hole checkout feature
2017-03-09 00:43:35 +01:00
81a1057cac
Fix something Dan has overlooked
2017-03-09 00:30:36 +01:00
fd310c6445
Back to how we had it before, because --unshallow does not work at all
2017-03-09 00:28:02 +01:00
a9b52518bf
Shift numbers for argument identifiers, functions are called after `shift`
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-08 14:29:51 -08:00
87da40068c
Always `exit`ed with value 1, now exits with proper value.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-08 14:18:08 -08:00
b8f1eadb7f
Shift off `checkout` from being passed to script from `pihole`
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-08 14:17:56 -08:00
b522d8eaf6
Source and reuse existing variables, centralize code.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-08 13:41:11 -08:00
89ff99322d
Don't need to remember `pwd` inside a function, calling function doesn't change directories.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-08 13:30:08 -08:00
56e17d1010
Source functions and variables from basic-install.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-08 13:28:24 -08:00
d2ab0694b7
Add "master" shortcut
2017-03-08 13:18:34 +01:00
8a14a63d5d
Pi-hole checkout feature
2017-03-08 13:16:40 +01:00
8235b18854
Remove duplicated line
2017-03-08 12:09:34 +01:00
e0e9ebbe74
Merge pull request #1307 from pi-hole/fix/versionwithoutwebinterface
...
Don't try to obtain version of web interface it it is not installed
2017-03-07 23:54:32 +01:00
10bc8414b9
Move FTL querying before clearing the terminal to avoid flashing on Pi B+
2017-03-07 18:10:05 +01:00
4e25e0dc5c
Add missing } to JSON output
2017-03-07 17:57:57 +01:00
b1a9793d94
Let Chronometer query all data from FTL (no need for having the API). Fixes #1305
2017-03-07 17:54:11 +01:00
6dea00668e
Don't try to obtain version of web interface it it is not installed. Fixes #1303
2017-03-07 13:08:01 +01:00
ae9182c92e
Merge pull request #1301 from pi-hole/fix/removewildcard
...
Remove wildcard entry when adding the very same domain either the white- or blacklist
2017-03-06 23:53:06 +01:00
cf31561267
Remove wildcard entry when adding the very same domain either the white- or blacklist
2017-03-06 16:25:35 +01:00
a97f0b1298
Merge pull request #1300 from pi-hole/fix/deletehostrecord
...
Bugfix for when deleting host-record
2017-03-06 16:16:42 +01:00
d1e0f3ae18
Merge pull request #1294 from pi-hole/tweak/debugDNS
...
Tweak DNS debugging
2017-03-06 05:50:37 -08:00
47a6786e8f
Use proper test syntax
2017-03-06 14:02:56 +01:00
a69fcbb91e
Bugfix for when deleting host-record
2017-03-06 13:44:13 +01:00
8e2b51b391
Merge pull request #1296 from pi-hole/fix/debugVersion
...
Debug version detection improvements
2017-03-05 07:13:41 -08:00
560af43204
Merge pull request #1293 from pi-hole/fix/version
...
Account for hash in versioning
2017-03-05 07:10:18 -08:00
baefec86f2
Add CLI teleporter feature
2017-03-05 14:08:44 +01:00
512c650441
Shellchecking.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 19:07:55 -08:00
dc44fc9e27
Version check amalgamation and removal of && || logic.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 17:54:38 -08:00
6f2fb57c08
Protocol specific records checks.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 15:16:33 -08:00
2547cc4c8d
Only run IPv6 if enabled, split out Chaos TXT checks.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 15:06:34 -08:00
9f4ef66f41
Add IPv6 resolver test
2017-03-04 22:38:52 +01:00
086f0790fc
Add Google's IPv6 address for potential IPv6 resolver tests
2017-03-04 22:31:18 +01:00
709b44f736
IPv4 DNS tests
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 12:16:43 -08:00
6cd4ff6d68
Organize functions and function calls.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 12:16:32 -08:00
abd3e828de
Optimize normalOutput
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 07:46:00 -08:00
b85af50d14
Generate only the information that is actually asked for
2017-03-04 14:08:11 +01:00
0e8fd49669
Function...
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-03 23:30:57 -08:00
945e22874e
Collapse duplicate functions, and take out argument loops.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-03 23:12:28 -08:00
77ab47a984
Awk for perl
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-03 22:34:55 -08:00
ed8088f203
Functions for Core/Web version and hash. And only check first argument in each section.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-03 22:10:32 -08:00
8831b22fc8
Prototype function for getting version of local repo
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-03 21:36:38 -08:00
0341bd1758
Optimize code, undoc flag for current hash.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-03 20:32:26 -08:00
9bb4a5fb25
Factor out variables from display.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-03 20:16:53 -08:00
ebfffea5dc
Always show something, even if it's just the short hash of the latest commit.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-03 20:04:55 -08:00
81939ab265
Get short hash of local and remote
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-03 19:14:30 -08:00
f2fe84c9d3
Merge pull request #1292 from pi-hole/master
...
Merge patches back into devel
2017-03-03 23:45:29 +01:00
dd971b6ee5
Default behavior is old behavir (listen on gravity interface (e.g. eth0), permit all origins)
2017-03-03 22:58:41 +01:00
f1b8abf503
Merge pull request #1146 from pi-hole/tweak/chronometer_recentlyblocked
...
[FTL] Show most recently blocked domain in chronometer
2017-03-03 12:20:43 +01:00
66b7d04b82
Merge branch 'development' into new/FTL-binary
2017-03-01 12:42:48 +01:00
7ba47f504c
Add special "except-interface" line in case of listening on all interfaces
2017-03-01 12:15:04 +01:00
0be1717ff4
Fix config error
2017-03-01 11:46:48 +01:00
189a4e0078
Add option to skip restarting of dnsmasq
2017-03-01 11:26:06 +01:00
3adf8785d8
Move "all" down in help text to not suggest that it is the default
2017-03-01 11:07:05 +01:00
b74862bfc5
Actually apply new setting by restarting dnsmasq
2017-03-01 11:02:08 +01:00
01273124ea
Change to -i, interface
2017-03-01 10:59:55 +01:00
721ada7e16
Fix typo
2017-03-01 10:52:21 +01:00
bd9dc91396
Add response for users manually setting this up via CLI
2017-03-01 10:50:13 +01:00
de6c43a8d3
Setup interface listening behavior of dnsmasq
2017-03-01 10:46:20 +01:00
83b0600863
Carriage return or newline based webcalls.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-27 11:03:57 -08:00
6c130b7960
Vebiage and highligh the token, also `:::`
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-27 10:27:11 -08:00
7244d44a1d
Notify user that log is being uploaded.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-27 10:02:00 -08:00
9b060aab34
Debug auto mode engaged
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-26 18:22:06 -08:00
ce6c465942
Merge pull request #1266 from pi-hole/new/host-record
...
Add host-record option
2017-02-23 17:32:10 +01:00
7a1a2dec67
update license to EUPL on core files
2017-02-22 11:55:20 -06:00
7ed1bbad49
Add host-record option
2017-02-22 14:43:07 +01:00
078cc7660e
Improved updater logic
2017-02-22 11:00:45 +01:00
af2893d2ce
Updater implementation for FTL
2017-02-22 10:43:13 +01:00
a64211123f
Some debug additions
2017-02-21 16:46:54 +01:00
053b38e0bd
Set up for IP matching in detection.
2017-02-16 19:45:44 -08:00
2aa3a109a0
Ping gateways and Internet.
2017-02-16 18:38:05 -08:00
472708376d
Split out IP checks.
2017-02-16 18:30:15 -08:00
cfed3d59e9
Begin fixing IP detection functions.
2017-02-16 16:49:14 -08:00
af8e629df4
Merge pull request #1239 from pi-hole/tweak/debug48h
...
Change description as we want to save the debug log for 48h instead of only 24h
2017-02-10 20:46:12 +01:00
01f980d49c
Change description as we want to save the debug log for 48h instead of only 24h
2017-02-10 17:45:20 +01:00
99fab7e52a
Scan whole dnsmasq.d directory for cofigurations files
2017-02-10 17:42:37 +01:00
ba67144e34
Merge branch 'development' into adminPageAsOption
2017-02-09 16:27:07 -05:00
7785dac50e
Merge pull request #1228 from r0ckarong/development
...
Justify and improve help texts, add missing wildcard description
2017-02-08 14:05:53 +01:00
01f643e5eb
fixup! Fix spacing for wildcard help in list script
2017-02-08 12:56:28 +01:00
8037f3e332
Fix spacing for wildcard help in list script
2017-02-08 12:55:14 +01:00
afe5176e01
Justify help output to match main script
2017-02-08 12:41:53 +01:00
a48317883d
Fix indentation
2017-02-07 18:14:41 -05:00
4fcf8fd23f
Merge in `development` branch - resolve conflict in update.sh
2017-02-05 19:39:02 +00:00
DL6ER
WaLLy3K
Adam Warner
Adam Warner
Mcat12
Jacob Salmela
Jacob Salmela
DL6ER
Dan Schaper
Adam Warner
Dan Schaper
Adam Hill
Hans Geiblinger
gedetil
Flo
Patrick O'Brien
Markus Napp
Dan Schaper