Commit graph

283 commits

Author SHA1 Message Date
DL6ER
f20e4ddf3b
Change message for unknown state to something more useful
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-30 22:28:15 +02:00
DL6ER
40656641b6
Merge branch 'development' into tweak/reload_on_enable_disable 2018-08-30 22:26:57 +02:00
DL6ER
0ebd68f17f
Review comments
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-14 09:55:16 +02:00
DL6ER
337cc5ca18
BLOCKING -> BLOCKING_ENABLED
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-13 17:22:10 +02:00
DL6ER
4e4d6b5d1f
Adjust "pihole status" command
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-13 15:02:00 +02:00
DL6ER
b011adc453
Use new setupVars BLOCKING variable to determine which file to update via gravity
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-13 14:19:59 +02:00
DL6ER
d8abc1d266
Storing BLOCKING=true/false in setupVars.conf
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-13 13:49:47 +02:00
WaLLy3K
d163e38380
Ensure regex-blocked lines are red
* Add `regex.list` to seds list

Signed-off-by: WaLLy3K <wally3k@pihole.net>
2018-08-13 14:56:38 +10:00
DL6ER
20b946eae5
Instead of changing the dnsmasq configuration, we replace gravity.list and black.list by empty files for disabling. When pihole-FTL receives SIGHUP, it will clear its cache and reload all configured lists. If the files are empty, blocking will be disabled as no content to be blocked will be imported.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-12 19:31:00 +02:00
DL6ER
c00357663b
Reload pihole-FTL instead of restart the entire service on "pihole enable/disable"
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-12 19:17:20 +02:00
WaLLy3K
a1bf9fad98
Fix colour tail for use with new blocking methods
Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
2018-08-11 12:55:18 +10:00
Dan Schaper
dbc82cfb6a
Merge pull request #2236 from pi-hole/new/regex-lists
Use regex lists instead of wildcards for blocking
2018-07-14 06:10:44 -07:00
Mcat12
941a766aa3
Replace -wild and -regex with --wild and --regex
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-07-12 21:38:43 -04:00
Mcat12
c5bb404d6a
Emulate wildcard blacklisting via -wild and move regex to -regex
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-07-08 14:37:33 -04:00
Mcat12
4763969c8f
Move processWildcards to query.sh
Closes #2255

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-06-30 22:03:53 -04:00
Mcat12
0f4968d75c
Merge remote-tracking branch 'origin/development' into new/regex-lists 2018-06-29 23:12:34 -04:00
Mcat12
3077c22e4f
Change help strings from wildcard to regex blacklist
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-06-29 23:10:49 -04:00
DL6ER
a7c73036f0
pihole -t: Warn user if Pi-hole's logging is disabled
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-06-17 13:37:41 +02:00
Rob Gill
2255d05664
Remove scanlist(), now in query.sh
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-06-13 16:09:49 +10:00
Rob Gill
b1207949ac
Call query.sh to replace queryFunc()
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-06-13 15:49:52 +10:00
Rob Gill
40bc390c3b
Admin Console -> "Web Interface"
User facing --help text changes
Admin Console --> Web Interface
and additional branch option

Signed-Off-By: Rob Gill <rrobgill@protonmail.com>
2018-06-04 13:34:42 +10:00
RamSet
2f24e5ceb7 Minor correction for double instance of the word "found".
Signed-off-by: RamSet <RamSet@gmail.com>
2018-05-14 12:21:20 -06:00
Adam Warner
e49a9096a5
accidentally a 'shift'
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-15 18:46:35 +01:00
Adam Warner
33148ba832
Add help text to pihole command to document new flag
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-15 18:30:13 +01:00
Adam Warner
bca23dd896
Allow passing of --check-only to update script.
Don't run installer for updating web files, it's handled by getGitFiles.
I think this works...

Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-15 18:25:35 +01:00
Adam Warner
310d33b8ee
Merge dev > FTLDNS fix merge conflicts
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-13 17:01:54 +01:00
Razvan Radu
7361d5d3ea Update pihole lolcahost probe for DNS status
Signed-off-by: Razvan Radu <ramset@gmail.com>
2018-04-05 11:14:39 -06:00
Adam Warner
0b87f489d5
Look for pihole-FTL, not dnsmasq!
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-03 15:59:56 +00:00
DL6ER
7ed45d26c2
Remove " " at some places where they shouldn't be
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-26 17:26:51 +01:00
DL6ER
e8ec0dc701
Use pihole-FTL resolver in pihole and gravity
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-25 09:34:04 +01:00
DL6ER
d7dde06552
Add "pihole logging off noflush" command
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-18 17:08:46 +01:00
DL6ER
05d015169c
Check for local version and branches every 10 minutes, check for remote versions only once a day
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-09 19:00:46 +01:00
Jacob Salmela
9631519eb1
Merge pull request #1752 from pi-hole/new/bashupdatechecker
Add bash / cron based update checker for Pi-hole
2017-11-08 20:38:40 -06:00
DL6ER
6ca47dc3b3
Add bash / cron based update checker for Pi-hole 2017-10-28 13:20:02 +02:00
Mcat12
8dba2a88e2 Move FTL re-parsing call after dnsmasq restart 2017-10-25 23:07:45 -04:00
DL6ER
b9ae01d819
Send SIGHUP to pihole-FTL when restarting/reloading dnsmasq
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-25 17:46:24 +02:00
WaLLy3K
645d8e0ebd Fix issue where wildcarding didn't restart dnsmasq
Signed off by WaLLy3K <wally3k@pi-hole.net>
2017-10-19 17:51:20 +11:00
WaLLy3K
80c40e6050 Prevent full stop being interpreted as regex
Signed off by WaLLy3K <wally3k@pi-hole.net>
2017-10-16 10:12:27 +11:00
WaLLy3K
3b300a4d6a Fix query option handling
Signed off by WaLLy3K <wally3k@pi-hole.net>
2017-10-13 11:42:49 +11:00
WaLLy3K
664d0ea023 Correctly retrieve IPv4/6 addresses for tailFunc()
* Add comments for readability
* Use `sed -E` for readability
* Move `date` into `sed`
* Use updated colour codes
2017-09-23 11:27:40 +10:00
Adam Warner
a0bd517380 Merge pull request #1694 from pi-hole/fix/qf-opt
Slow query fix & queryFunc optimisation
2017-09-21 20:05:42 +01:00
WaLLy3K
56990618e9 Prevent Block Page issue
* Block Page expects to see a full stop, otherwise it will throw an unhandled error
2017-09-18 01:12:19 +10:00
WaLLy3K
54a85d3a63 Fix invalid option case
* Ensure `pihole -q doubleclick.com asd` exits with error
2017-09-18 00:58:56 +10:00
WaLLy3K
c2d3e99ddd Slow query fix & queryFunc optimisation
* Validate modified code using Shellcheck & Strict Bash
* Added and/or elaborated more comments

* scanlist() should exit if /etc/pihole is not available
* Add `export LC_CTYPE=C` to prevent extreme grep slowdown
* Consider "domain.com#comment" an exact match
* Add specialised wildcard searching grep

* Optimise and simplify queryFunc() for readability
* Replace IDN `python` parsing with `idn2`, as `python` is not guaranteed to be available
* Use ${COL_BOLD} when printing filenames
2017-09-18 00:41:26 +10:00
WaLLy3K
4d39ab9753 Allow force-reload to be used when restarting DNS
* Remove duplicate coltable variable definition and source
* Minor comment modifications
* Add "$2" to restartdns
2017-09-14 16:39:25 +10:00
WaLLy3K
56b8c4bfdb Merge branch 'development' into tweak/gravity 2017-09-01 10:01:41 +10:00
WaLLy3K
15a5f425bf Replace nc with psuedo-device
* Also fix minor conditional style issue
2017-08-31 20:32:02 +10:00
WaLLy3K
3125d24ded Replace superseded netstat command
* Make colfile readonly, and use path of PI_HOLE_SCRIPT_DIR
* Rename piholeStatus function to statusFunc for function name consistency
* Replace superseded netstat command with nc
* Perform addn-hosts check using a single grep subshell
2017-08-31 17:39:41 +10:00
WaLLy3K
cc4ada99d8 Use SIGHUP instead of force-reload 2017-08-01 20:48:43 +10:00
Adam Warner
18b41adbf6 Merge branch 'development' into tweak/gravity 2017-07-29 17:14:39 +01:00
WaLLy3K
e0eb5eb2b1 Fix queryFunc if adlists URLs have been removed (#1618)
* Fix queryFunc if adlists URLs have been removed

* Allow for -adlists command line switch (where the "s" is a typo)
* Add error message when unable to find associated adlists URL

* Provide PR fix on current dev version

* Add blResult variable for white/black match

* Supporting Block Page queryFunc fixes

* Re-add unmerged lines
2017-07-25 23:07:06 +01:00
WaLLy3K
a2825be819 Add dnsmasq "force-reload" option
* Made use of $PI_HOLE_SCRIPT_DIR
* Fix #1610 & #1624
* Add "$2" to restartDNS options

Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
2017-07-24 21:25:04 +10:00
Adam Warner
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
WaLLy3K
3a50b91722 User-friendly queryFunc() output (#1483)
* User-friendly queryFunc() output

* Silence grep errors
* Provide 'pihole -q -h' help output
* Rewrite option handling
* Loop through grep stdout to make query output user friendly
* Add -adlist option to show block list URL instead of internal file name
* Limit general searches to 10 matches per block list
* Add -all option to override 10 match limit
* Fixed 'pihole -h' wording

* Further query optimisations

* Optimised scanList() output by switching folder
* Re-added processWildcards() function
* Added "-bp" exact matching option for use with block page
* Standardised query output
* Separated wildcard search from blacklist/whitelist search
* Optimised sorting by sorting glob output and not scanList() output

* Fixed result skipping

* Add text for wildcard result on exact query

* Fix wildcard result output

* Multiple wildcard matches on exact query could cause unexpected output

* Remove unnecessary replacement

* Make grep only output matching text

* HOSTS format lists will also output the IP address
* That substitution was necessary

* Remove IP address from HOSTS format lists

* Filter unwanted content

* Add /dev/null to grep, to always print file name (even when searching only one block list)
* Use three seds to remove unwanted content from block lists

* Merge with development

* Simplify queryFunc code
2017-07-15 11:56:40 +01:00
WaLLy3K
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
WaLLy3K
209fbf82c4 Colourise tailFunc (#1550)
* Colourise tailFunc

* Strip month, day number and dnsmasq[PID]
* Blocked domains show as light red
* Queries show as standard colour
* Everything else as dark gray

* Change tailFunc highlighted lines

* Highlight Blocked/Blacklist/Wildcard lines as red
* Make DHCP lines default colour

* Make sure tailFunc doesn't match on domain names
2017-07-02 15:21:00 +02:00
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"
2017-06-21 21:49:05 +10:00
DL6ER
e4cc5b3847
Disable black.list on "pihole disable" 2017-06-17 14:49:02 +02:00
WaLLy3K
6823a62644 Add tricorderFunc back as usable function (#1515)
As per #1464
2017-06-03 19:13:40 +02:00
WaLLy3K
2b8a8b03a8 Roll back merge #1417 (#1494) 2017-05-27 22:42:44 +02:00
DL6ER
d913534793 Move wildcards file if blocking is disabled (#1495)
* Move wildcards file if blocking is diabled

* Delete newline
2017-05-27 17:51:41 +02:00
WaLLy3K
2f2825f15e Tricorder: Insecure Opt-out 2017-05-20 10:45:26 +10:00
WaLLy3K
a620a5c430 Formatting consistency 2017-05-18 12:53:32 +10:00
WaLLy3K
1f3db8b602 Confirm Tricorder is online
* Scan port 9998 to confirm the availability of "tricorder.pi-hole.net"
* Exit codes for upload process
2017-05-18 12:43:17 +10: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
075f00cecd Merge branch 'development' into tc-insecure-optout 2017-05-16 09:49:42 +10:00
WaLLy3K
b9f2ba0717 Wording changes and bug fix 2017-05-16 09:48:46 +10:00
Adam Warner
bc8a5916d8
fix merge conflicts 2017-05-14 16:17:04 +01:00
WaLLy3K
da9ff0cc66 Tricorder: Insecure Opt-out
* Check to see if Tricorder is being called directly
* Provide opt-out for insecure transmission of debug log
* Remove mention of internal function from help menu
2017-05-14 19:27:14 +10:00
WaLLy3K
39b74ebfd4 Show help for "pihole checkout --help" 2017-05-14 12:22:19 +10:00
WaLLy3K
4eb7d2868c Fix "pihole disable --help" and "pihole -l --help" 2017-05-14 11:53:40 +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
DL6ER
7abf349730
Use echo "ABC" | pihole tricorder to upload to Pi-hole's medical tricorder. Uses SSL if available. 2017-05-13 21:08:21 +02:00
WaLLy3K
c35c7b2cea Wrap in double brackets 2017-05-11 20:21:23 +10:00
WaLLy3K
58353e2839 Update queryFunc() to search Whitelist
If there is a match in Whitelist/Blacklist/Wildcards, `[ ! -t 1 ]` will cause the search to end if the terminal is closed when the script is called. This has the intended effect of allowing a user to search for a W/B/W domain (as well as all the adlists it's found in) using `pihole -q` via Terminal, but the script will stop searching after a W/B/W match when called by the block page.
2017-05-11 19:58:35 +10:00
WaLLy3K
3081c151bd Perform EXACT searches on HOSTS lists correctly
`\s` on the end may be overkill, but it is the existing scanList() behaviour.
2017-05-11 09:13:32 +10:00
WaLLy3K
a0603ad3b7 Update queryFunc()
* Allow scanList() to search files using a wildcard by removing quotes wrapped around `${list}`
* scanList() will not provide a domain ouput on each string if exact is specified (`grep -l`)
* Remove unused processWildcards() function
* Return a message if no domain is specified
* IDN domains are converted to punycode when running a `pihole -q` search if the `python` package is available, otherwise will revert to current behaviour
* Scan Blacklist & Wildcards first, exiting from search if a match is found (Fixes #1330)
* Use one `grep` subshell to search for all "*.domains" lists at once (opposed to looping to get every matching file name, and then spawning a `grep` instance for every matching file)
* queryFunc() will not return "(0 results)" output from files where no match is found
* Sort results based off list number
* Return a message if no results are found
2017-05-02 17:13:55 +10:00
Anthony Giorgio
fd584dd03b Formatting cleanup.
Convert backticks to quotes to fix error message.
Make Pi-hole capitalization consistent.
 Make Pi-hole capitalization consistent.
2017-03-18 20:47:13 -04:00
Mcat12
c4b43f92ce Fix help text bug
Fixes #1325
2017-03-14 13:19:43 -04:00
Dan Schaper
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
DL6ER
8a14a63d5d
Pi-hole checkout feature 2017-03-08 13:16:40 +01:00
DL6ER
dce3e50a00
Check for existence of wildcard blocking list before trying to acces it 2017-03-06 16:44:56 +01:00
Dan Schaper
17b0db6515
Fix for calling -w without -a.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-27 11:40:20 -08:00
Dan Schaper
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
Dan Schaper
38961fb31b
Help text clarification and addition of the automated debuggin flag.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-27 10:49:25 -08:00
Dan Schaper
ba5bbf3523
Modify pihole for -d -a arguments. 2017-02-26 15:36:53 -08:00
Jacob Salmela
7a1a2dec67
update license to EUPL on core files 2017-02-22 11:55:20 -06:00
Markus Napp
19e30b829a Add wildcard description to help text, improve other help texts 2017-02-08 12:42:14 +01:00
Jacob Salmela
51acdfa633
remove pihole -s flag 2017-01-27 10:12:51 -06:00
DL6ER
2935275227
Merge branch 'development' into wildcardblacklisting 2017-01-09 14:53:01 +01:00
Adam Warner
12bec1df68 Merge pull request #1048 from pi-hole/tweak/simplify_webpage.sh
Major simplification of webpage.sh + extend DHCP to IPv6
2017-01-02 14:28:26 +00:00
DL6ER
2b778695b1
Implement querying ad lists support for wildcards (what hell of a bash experience) 2017-01-02 14:27:13 +01:00
DL6ER
40798da6b1 Add blacklisting wildcard support 2016-12-31 12:49:04 +00:00
DL6ER
d0cd39a25f Added space behind :53 to only match port 53 2016-12-28 20:32:56 +01:00
DL6ER
1e627c7e8f Make webpage.sh fully library style 2016-12-28 16:25:14 +00:00
DL6ER
9170488b0a Test if DNS service is listening on local port 53 2016-12-28 15:58:48 +00:00
DL6ER
c674a175ee
Make grep case insensitive 2016-12-23 17:02:56 +01:00
Promofaux
906a1753be specifically comment out gravity.list addn-host 2016-12-14 19:42:20 +00:00
Adam Warner
bebb569c43 Merge pull request #964 from pi-hole/queryadsonlyexactmatches
pihole -q: Add option to show all partial or only exact matches
2016-12-09 23:25:15 +00:00
Mcat12
74e33bb1a0 Merge pull request #973 from pi-hole/taillog
Add tail argument to automatically "tail -f" pihole.log
2016-12-08 16:40:17 -05:00
Mcat12
b591df55b0 Tell user how to exit tail command 2016-12-08 16:35:50 -05:00
Mcat12
b9e0e88fe9 Update pihole 2016-12-08 15:47:30 -05:00
DL6ER
5120d9ec33 Add tail option 2016-12-08 21:15:03 +01:00
DL6ER
c0886cb5c6 pihole -q <domain> is partial matching (as before), pihole -q <domain> -exact is exact matching (new behavior) 2016-12-06 13:18:01 +01:00
DL6ER
294df8690c Do only one grep on each of the lists and count the number of non-empty lines in the result. Improves speed by factor of 2x 2016-12-06 09:55:17 +01:00
DL6ER
fb72ac9904 Show only exact matches for pihole -q 2016-12-06 08:18:49 +01:00
DL6ER
74cb79252c Only looking for blocking entries (do not scan whitelist.txt) 2016-12-05 17:12:28 +01:00
DL6ER
6cd3c93472 Also query white- and blacklist 2016-12-05 17:09:49 +01:00
DL6ER
eb63e75379 No need for pipe here 2016-12-05 17:06:20 +01:00
Dan Schaper
2ec4acfe52
Begin fixing exit values.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-01 12:21:08 -08:00
Mcat12
3ba7d7640f Merge pull request #933 from DL6ER/delayedreactivation
Add possiblity for delayed reactivation of blocking
2016-11-21 08:26:26 -05:00
DL6ER
7bf0985a57 Extended help text of main pihole command 2016-11-21 11:30:34 +01:00
DL6ER
f50cbe74cb Changed -web (webpage) to -a (admin) 2016-11-20 15:15:27 +01:00
DL6ER
291ca0874a Fixed two more typos 2016-11-18 12:16:26 +01:00
DL6ER
96f2aa1803 fixed typo 2016-11-17 23:36:53 +01:00
DL6ER
c6857501aa Removed check for availability of nohup 2016-11-17 23:31:11 +01:00
DL6ER
3aba1607b2 Removed debug echos 2016-11-17 23:04:46 +01:00
DL6ER
f667298b64 Added possiblity for delayed reactivation of blocking 2016-11-17 22:58:00 +01:00
DL6ER
db278d81e4 Added webpage.sh 2016-11-16 21:34:43 +01:00
Dan Schaper
1d64ad1ccd Stash all changed files, clean directory and pull updates. 2016-11-02 10:39:27 -07:00
Dan Schaper
dfb4ac0365 Keep .yml's from going to user local repos. 2016-11-02 09:52:15 -07:00
Dan Schaper
0ef8832b04 whitespace 2016-11-02 09:36:30 -07:00
Dan Schaper
e42a037b7d Grep -i instead of cat. 2016-11-02 09:28:00 -07:00
Dan Schaper
fe18d69b65 Grep should start at the beginning of line to make sure it doesn't fire on # beginning lines. 2016-11-02 09:25:32 -07:00
Adam Warner
f36e4ba336 Cherry picking 3f049fa79, conflict fix 2016-11-02 04:34:02 -07:00
Adam Warner
c47c5e466f consistency 2016-11-02 04:18:52 -07:00
Promofaux
1d21b0da9a enable or disable logging from pihole command 2016-11-02 04:10:43 -07:00
Adam Warner
469ff45f01 create list.sh. Combines whitelist and blacklist scripts in an effort to reduce code duplication.
update pihole script to reflect new white/blacklist command.
2016-10-26 09:36:02 +01:00
Promofaux
8ee98f0a4a remove a space 2016-10-23 19:47:31 +01:00
Promofaux
82e78fb651 Add output to pihole disable and pihole enable 2016-10-23 19:44:40 +01:00
Promofaux
d0826b2c33 Merge branch 'development' of https://github.com/airencracken/pi-hole into airencracken-dev 2016-10-23 19:33:28 +01:00
Marcus Hildum
640398ced4 Consistency
We went with tabs earlier, may as well make that the "standard".
Easy enough to switch to spaces too if that's desired with expand(1)
2016-10-21 23:17:14 -07:00
Marcus Hildum
5ebfa5ecf7 heredoc for helpfunc in pihole 2016-10-21 22:53:04 -07:00
tuplink
e199f6db87 spelling updates 2016-10-20 21:15:11 -04:00
tuplink
c83dd3ccd7 change spacing 2016-10-20 18:45:27 -04:00
tuplink
78fbafa1cd test out new status logic 2016-10-20 18:40:03 -04:00
Tommy Huff
685b775b68 rework status if statments 2016-10-20 11:24:34 -04:00
Tommy Huff
9056a5a7b6 fix spelling / replace tabs with spaces in help 2016-10-20 11:05:49 -04:00
Tommy Huff
3ca3eaa62c change restartdnsmasq to restartdns 2016-10-20 09:40:45 -04:00
Tommy Huff
aaee895b2b add pihole status web option to return 1 or 0 for easy use with php 2016-10-20 08:58:36 -04:00
Tommy Huff
7d7e17b351 add toggle to enable or disable pi-hole 2016-10-20 08:45:20 -04:00
Adam Warner
b66f23cfd0 account for new update script 2016-10-18 14:19:44 +01:00
Adam Warner
ce46c4dec4 remove prematurely added code 2016-10-18 12:11:02 +01:00
Adam Warner
77e8be09a1 handle passing arguments to version script 2016-10-18 12:07:42 +01:00
Adam Warner
29ad2496b6 don't output "elevating with sudo" in pihole script, just do it. 2016-10-18 12:05:48 +01:00
Promofaux
a43577fa26 add reconfigure flag to -r command 2016-10-15 20:43:03 +01:00
Promofaux
090fbd04af Remove ${SUDO} usages and root checks from scripts called by pihole command as they should not be called directly. 2016-10-15 17:54:04 +01:00
Promofaux
461de48625 function declarations as per basic-install.sh 2016-10-15 17:25:17 +01:00
Promofaux
9352ba6e4a about time we exit 0'd 2016-10-15 17:16:44 +01:00
Promofaux
5e883239f9 remove calls for ${SUDO} as per basic-install.sh. 2016-10-15 17:15:59 +01:00