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
10a30344e5
No need to source setupVars, as basic-install.sh is sourced, which sources setupVars itself. Sourception.
2017-02-05 19:29:56 +00:00
b764d17c64
comment
2017-02-05 19:18:27 +00:00
ba0abdb88d
wrap update logic in admin_installed bool check
2017-02-05 19:12:09 +00:00
1428b58dde
source setupVars and only check admin repo if it is enabled
2017-02-05 19:07:04 +00:00
18eb8a2159
Merge pull request #1185 from pi-hole/cleanup/git_functions
...
Move git functions to one script
2017-01-31 19:05:53 -05:00
3239c7023a
Merge pull request #1170 from pi-hole/new/DHCPstaticleases
...
Backend changes for static DHCP leases
2017-01-31 21:07:36 +01:00
3d4516dc95
Improve regex
2017-01-29 20:27:20 +01:00
509c864cc3
Merge branch 'development' into fix/regex
2017-01-29 20:27:04 +01:00
f8944177a0
Fix chronometer interpreting summaryRaw
2017-01-29 13:32:48 -05:00
06873fe69e
Remove misplaced start of string expression. Fixes #1191
2017-01-29 13:54:39 +01:00
3d9d13222b
Use constants for leading paths.
2017-01-28 17:42:55 -08:00
745adabb05
Path to source basic-install.sh
2017-01-28 17:38:14 -08:00
3861b57dc6
Start moving reused utility functions to one script.
2017-01-28 17:32:42 -08:00
99a4a80017
Spelling
2017-01-28 17:08:38 -08:00
033ba26041
Stay in repo directory until we error check
2017-01-28 20:00:02 -05:00
08cddba200
There should be no echo here
2017-01-28 21:49:31 +01:00
1bf43b0425
Improved regex: Remove all leading points from domain (.....xyz => .xyz). Return not only a part, but fill validated domain
2017-01-28 21:48:19 +01:00
85b3fef08d
Use perl instead of grep?
2017-01-28 00:39:10 +01:00
15037fa888
Typo
2017-01-28 00:17:32 +01:00
d595fef18f
Fix regex
2017-01-28 00:15:06 +01:00
be5fa22b6f
Merge pull request #1174 from pi-hole/tweak/logrotate_insecure_directory
...
Improve logrotate support
2017-01-27 11:18:06 -08:00
6fd7e0311c
Install customized version of logrotate script
2017-01-27 14:16:24 +01:00
1bcf2dd0fc
Tweak CLI domain filter
2017-01-27 00:45:57 +01:00
dad18dc5de
Changed keywords
2017-01-25 10:35:45 +01:00
5c95c4074b
Remove static leases from DHCP static leases file
2017-01-25 10:35:03 +01:00
4301b9a12a
Add static DHCP leases to new file
2017-01-25 10:33:25 +01:00
6a89c6bf3b
Silence rm warning if no DHCP server is used
2017-01-23 15:06:36 +01:00
fe8c365d17
codacy never lies
2017-01-22 20:53:30 +00:00
9acc3aac01
pipe `du -h` output to awk to ensure we only get the file size, and not the filename too. Yeah that's right Dom, pipe.
2017-01-22 20:44:07 +00:00
1ad23a065e
switch out `wc -l` with `grep -c ^`
2017-01-22 20:38:46 +00:00
de102fde5c
Add line count and size check for pihole.log
2017-01-22 20:38:09 +00:00
8bb9dd460b
Be able to disable the DHCP domain name
2017-01-18 12:22:03 +01:00
58f3ff69d8
Align comment with referenced line
2017-01-16 18:51:13 -05:00
72d8d10e64
Show most recently blocked domain in chronometer (using FTL). Fixes #717
2017-01-16 22:39:58 +01:00
63d02df0bc
Merge pull request #1130 from pi-hole/new/logrotate
...
Use logrotate for pihole.log
2017-01-16 15:11:11 -05:00
08f08fea61
Merge pull request #1135 from pi-hole/new/multipleDNSservers
...
Allow multiple DNS servers
2017-01-13 23:48:38 +01:00
1ed2a8637f
Removed debug echo's
2017-01-13 23:39:57 +01:00
d196c13f2c
Merge pull request #1131 from pi-hole/chronometerJsonUnixTools
...
No excuse for chronometer not to match API
2017-01-13 16:34:51 -05:00
bd1c5a42e8
Allow multiple DNS servers
2017-01-13 17:49:55 +01:00
845d8c0e63
Ensure LC_NUMERIC=C is set when evaluating floating point number (non-English systems might expect "," as decimal separator
2017-01-13 12:59:49 +01:00
b4c32e47c6
Missed one!
2017-01-12 22:07:07 +00:00
248d8680f7
actual codacy complaints
2017-01-12 21:51:10 +00:00
1bda965a7c
Codacy complaints
2017-01-12 21:50:16 +00:00
2ee305769d
Replace all calculations with values read directly web admin API. Parse JSON using native unix tools, no additional requirements needed.
2017-01-12 21:23:58 +00:00
3a8a936575
Corrected path
2017-01-12 21:01:52 +01:00
3fd2ffd466
Add logrotate for pihole.log
2017-01-12 20:39:25 +01:00
b56ca2b834
Add DNSSEC support to Pi-hole core
2017-01-12 16:02:41 +01:00
a263936243
Merge branch 'development' into wildcardblacklisting
2017-01-11 18:25:51 +01:00
2935275227
Merge branch 'development' into wildcardblacklisting
2017-01-09 14:53:01 +01:00
74a4e62cc9
Codacy fix
2017-01-08 11:26:56 +01:00
63a414a544
Align outputs
2017-01-08 11:21:50 +01:00
7d1f5091a7
Fixed small typo
2017-01-08 11:21:10 +01:00
3b54cab3bc
Show branches and revisions (incl. possible dirty state) in debug log
2017-01-08 11:17:25 +01:00
d9e949b27c
Merge pull request #1096 from pi-hole/fix/updater
...
Fix updater failing on non-English systems
2017-01-06 23:36:42 +01:00
168397e90d
Fixed typo in webpage.sh
2017-01-05 21:45:06 +01:00
e3c1fcd2c6
NEW LOGIC FOR THE UPDATER
...
Compare local and remote hashes. Update is available if current remote hash is different from current local hash since we assume that local should never be newer than remote for user
2017-01-05 13:10:19 +01:00
200995bf29
Make IPv6 features of Pi-hole DHCP server switchable
2017-01-03 14:24:33 +01:00
3a90c1c192
Source setupVars.conf before trying to access variables
2017-01-03 13:34:01 +01:00
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
ad61852804
Test against empty string
2017-01-02 11:10:38 +01:00
dbd8aee4ee
Add 'local' domain if not set in setupVers.conf
2017-01-02 11:08:54 +01:00
677694b01a
Set 24h lease time if settings was empty before
2017-01-02 11:05:40 +01:00
85f0241c0d
Reprocess DHCP settings after update
2017-01-02 10:50:59 +01:00
ebf0db4bbf
Typo fixed
2016-12-31 17:17:46 +00:00
9ac265980f
Add .conf to filename
2016-12-31 13:41:19 +00:00
40798da6b1
Add blacklisting wildcard support
2016-12-31 12:49:04 +00:00
fc596e41d4
All scripts set executable
2016-12-30 18:35:16 -08:00
5c7fc05a32
Enable DHCP logging by default
2016-12-30 16:31:57 +00:00
9181a4a1d8
Apply dhcp lease time also for IPv6
2016-12-29 14:26:23 +00:00
3268e1611a
Backend accept and apply dhcp lease time
2016-12-29 14:19:44 +00:00
cf724176dc
Do stateful DHCPv6 and SLAAC
2016-12-28 20:02:48 +00:00
1e627c7e8f
Make webpage.sh fully library style
2016-12-28 16:25:14 +00:00
9af26cbaac
Major simplification of webpage.sh
2016-12-28 02:14:47 +00:00
321ea8a3a9
Merge branch 'development' into webUIprivacymode
2016-12-27 21:27:11 +01:00
ef8292d371
Merge branch 'development' into updater_rewrite
2016-12-27 11:59:52 -08:00
e50947eb58
mend
2016-12-25 21:26:06 +01:00
ca056d32d2
Remove git -C
2016-12-25 21:22:59 +01:00
e15548cbf5
Add --quiet to git fetch in GitCheckUpdateAvail()
2016-12-25 01:18:58 +01:00
5e28e6b9ac
Removed remaining git -C
2016-12-25 01:17:46 +01:00
3365ef7aaa
`is_repo()` returns values to caller, silence function.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 11:54:04 -08:00
68c17b26dc
Bashisms
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 11:41:42 -08:00
e647efd471
Shell script, not javascript
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 11:24:20 -08:00
15db1ffdd5
Remove variables not needed any more
2016-12-24 15:48:43 +01:00
4632b0f797
Updated updater logic
2016-12-24 15:40:31 +01:00
65c35a5530
Use new subroutine to determine if updates are available
2016-12-24 15:32:25 +01:00
c449a1c0e0
Added GitCheckUpdateAvail()
2016-12-24 15:19:39 +01:00
b020010f0d
Removed some of the &> /dev/null
2016-12-24 15:08:30 +01:00
0276c72fe2
replace 'git -C' with long version (see #1009 )
2016-12-24 15:05:57 +01:00
04a9791be2
Save empty password
2016-12-23 23:41:40 +01:00
9a62026830
remove `DNS_BOGUS_PRIV` from setupVars.conf
2016-12-23 19:27:02 +00:00
ef1ce66793
Merge pull request #1013 from pi-hole/fix/chronometer
...
Fix chronometer.sh
2016-12-23 11:12:20 +00:00
3bc5d1bae0
Merge pull request #989 from pi-hole/APIresolveclientsandupstream
...
Implement backend for AdminLTE/#253
2016-12-23 10:37:48 +00:00
a4f58b0a22
Look for "query[" instead of "query" to avoid false-positives, like listed below
...
root@raspberrypi:/etc/.pihole# grep 'query' /var/log/pihole.log | grep -v 'query\['
Dec 22 16:29:50 dnsmasq[30801]: forwarded code.jquery.com to 208.67.222.222
Dec 22 16:29:50 dnsmasq[30801]: reply code.jquery.com is <CNAME>
Dec 22 16:29:50 dnsmasq[30801]: reply code.jquery.netdna-cdn.com is 94.31.29.54
Dec 22 16:29:50 dnsmasq[30801]: reply code.jquery.netdna-cdn.com is 23.111.11.3
Dec 22 16:29:50 dnsmasq[30801]: reply code.jquery.netdna-cdn.com is 198.232.125.113
2016-12-22 19:09:37 +01:00
bcf8139708
Removed cat where we don't need it
2016-12-22 18:55:14 +01:00
9b0390c9da
Space to Tab
2016-12-22 18:53:44 +01:00
e88f58c34e
Remove grpping for today's log entries, because we flush the log every day
2016-12-22 18:45:53 +01:00
ee8f29d178
Fixed typo, extended help text
2016-12-20 16:28:28 +01:00
da363070c7
Added Kelvin
2016-12-20 12:21:08 +01:00
715838cf89
Allow disabling second DNS server
2016-12-19 13:42:42 +01:00
7a243f890e
Backend for privacyMode on webUI
2016-12-16 17:33:01 +01:00
afabb5957b
Implement backend for https://github.com/pi-hole/AdminLTE/pull/253
2016-12-15 18:55:40 +01:00
2977168da1
dnsmasq "bogus-priv" property
2016-12-14 16:16:25 +01:00
85e3f37503
dnsmasq "domain-needed" property
2016-12-14 16:09:57 +01:00
ba015c1918
Set domain name via Settings page
2016-12-14 14:24:09 +01:00
1556adb678
Also remove quiet-dhcp setting when disabling/enabling the Pi-Hole DHCP server
2016-12-14 12:12:36 +01:00
6bfe729112
Merge pull request #979 from pi-hole/wwwdatapassword
...
Prevent web UI password change by web user
2016-12-13 16:33:41 +00:00
207422f83a
Added a missing space
2016-12-13 15:54:41 +01:00
004ba28378
Prevent web UI password change by web user
2016-12-13 15:52:28 +01:00
6f38801ed8
Add "Interface appearence" option
2016-12-13 14:59:52 +01:00
b8d2bfc890
Wait 5 seconds before rebooting so the web UI can finish loading before being unreachable due to the reboot
2016-12-13 12:42:40 +01:00
bc91716082
Suppress logging of DHCP actions to /var/log/pihole.log
2016-12-12 17:14:52 +01:00
8dc0dc4d69
Add DHCP-Server backend
2016-12-12 15:34:05 +01:00
2f4b7ce3dd
Update dnsmasq file when changing upstream DNS servers and restart the service to get it active
2016-12-12 14:17:02 +01:00
d4f83cb1d4
Be able to set API_QUERY_LOG_SHOW
2016-12-12 13:15:07 +01:00
aaab3306a8
Add restart DNS capability
2016-12-12 10:38:21 +01:00
2bafa2f2ac
Add reboot option
2016-12-11 22:33:27 +01:00
9ac378ae09
Set domains and clients which are excluded by the API
2016-12-11 19:30:04 +01:00
bf867bd9fd
Set DNS servers from web UI
2016-12-11 16:54:27 +01:00
f98de3d5db
Merge pull request #941 from DL6ER/caseinsensitive
...
Improvements for black-/whitelist scripts
2016-12-04 14:33:10 -05:00
78cb43d0dc
Revert "Simplified EscapeRegexp()"
...
This reverts commit 509cfd15f2
2016-12-03 00:32:37 +01:00
509cfd15f2
Simplified EscapeRegexp()
2016-12-02 14:17:34 +01:00
2061daa902
Don't forget to escape also the slash "/"
2016-12-02 14:11:17 +01:00
629ca970a1
Changed from single quoted filter expression to double quotes as reqeusted by codacy
2016-12-02 14:08:54 +01:00
c8ad6f23a8
Properly escape any special characters before using them in regexp manner
2016-12-02 12:57:04 +01:00
925c80edd4
Catch more 1's
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-01 15:10:06 -08:00
2ec4acfe52
Begin fixing exit values.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-01 12:21:08 -08:00
7b26b308ad
No need for echo and pipe here!
2016-11-21 15:50:05 +01:00
4c10634d85
Convert domain names to lower case before checking validity of the domain
2016-11-21 15:49:11 +01:00
de4401823e
Merge pull request #924 from DL6ER/webpage.sh
...
Add webpage.sh
2016-11-20 21:43:44 +00:00
f50cbe74cb
Changed -web (webpage) to -a (admin)
2016-11-20 15:15:27 +01:00
33b6fe72da
Extended help text
2016-11-19 21:57:42 +01:00
733919be4a
Implement possibility to remove password using "pihole -web -p"
2016-11-19 21:50:15 +01:00
68cb0782c0
Add countdown timer
2016-11-18 13:27:06 -08:00
0f4c8d4923
Set default timeout to 60 seconds
2016-11-17 11:00:11 -08:00
6d2c5b2312
Add debug timeoute
2016-11-17 10:58:58 -08:00
a95ce11ca6
Add debug timeoute
2016-11-17 10:39:51 -08:00
88c161769d
Capitalized variable names.
2016-11-16 22:33:28 +01:00
01bf1ae92d
Compute double hashes to avoid rainbow table vulnerability
2016-11-16 22:13:47 +01:00
9193c71cff
Minor change
2016-11-16 21:36:19 +01:00
db278d81e4
Added webpage.sh
2016-11-16 21:34:43 +01:00
b191cd73a7
Update piholeDebug.sh
...
wording
2016-11-15 13:28:18 +00:00
ca56ca5bd8
promo-tweak
...
Better logic introduced by @PromoFaux
2016-11-06 11:16:48 -06:00
a0f0dff88e
replace hardcoded interface with var
...
setupVars.conf is already sourced, so we just need to replace the
hardcoded value with the variable name.
2016-11-06 08:18:57 -06:00
8c08e9e473
Merge pull request #891 from pi-hole/bugfix/chronometer-domain-count
...
Bugfix/chronometer domain count
2016-11-03 13:55:29 -07:00
4300759287
Fix logic. If both v6 and v4 divide by two, else dont.
2016-11-03 08:01:25 +00:00
d7d6d6f991
Update to use new Var name
2016-11-02 21:46:30 +00:00
2f976504e8
switch out -eq for ==
2016-11-02 20:06:21 +00:00
4b7b859db9
Gotta catch 'em all...'
2016-11-02 12:29:55 -07:00
f7d0de53bb
Compare string to string.
2016-11-02 12:11:34 -07:00
603ec997ba
Remove testing block.
2016-11-02 12:09:33 -07:00
f7266ef4c8
Version remote check returns -1 on failure to detect curl silent failing. Update detects loss of contact to GitHub or fallthrough condition and reports to user.
2016-11-02 12:07:59 -07:00
3d43e1568c
Use explicit calls for function to self-document
2016-11-02 11:39:22 -07:00
c1a3f003e8
Rename the only utilty function left that didn't say `repo`
2016-11-02 11:18:13 -07:00
3f61aea7fc
Utility functions fully quiet now. Calling functions have the echos.
2016-11-02 11:09:53 -07:00
bd68db51e0
ShellCheck split local declaration and assignment.
2016-11-02 11:01:50 -07:00
b8a5ed710e
Take echos out of utility functions and move up a level.
2016-11-02 10:51:09 -07:00
34be601dd7
Test for lexicographically less than tag version.
2016-11-02 10:42:05 -07:00
1d64ad1ccd
Stash all changed files, clean directory and pull updates.
2016-11-02 10:39:27 -07:00
f2d7a3d26d
Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks
2016-11-02 09:48:00 -07:00
ee37c37cab
fix update output logic. version number variables should not be read only!
2016-11-02 14:29:20 +00:00
b636c1e1f8
Whitespace.
2016-11-02 07:00:43 -07:00
8b9f0487c0
Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks
...
# Conflicts:
# advanced/Scripts/update.sh
# automated install/basic-install.sh
2016-11-02 06:57:33 -07:00
ece1667fb0
Refactor and move some bits.
2016-11-02 06:41:51 -07:00
50bd8b4a09
Further tweaks to local repo handling
2016-11-02 13:34:57 +00:00
93d91353a1
All tabs now spaced
2016-11-02 05:49:33 -07:00
8dc9143b34
Just delete, no need to cd there first.
2016-11-02 05:45:29 -07:00
a0d9a1133c
Factoring and combining functions
2016-11-02 05:34:39 -07:00
035e4bf727
Move value checks to `if` calls.
2016-11-02 03:55:04 -07:00
9ec5bbd560
Actually get `is_repo` to return a value and have it expected.
2016-11-02 03:38:35 -07:00
34482c5ed6
Modified `is_repo`
2016-11-02 03:09:59 -07:00
7d414b5628
Move version messages to main function, check for repos.
2016-11-02 01:12:02 -07:00
d9528dfd09
Bash is funny with returns.
2016-11-02 00:51:38 -07:00
9c83825cb8
Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks
2016-11-01 22:20:32 -07:00
7a22471787
New naming convention, and reorder functions as bash would prefer them to be.
2016-11-01 22:19:40 -07:00
c30478bf4a
cleanup and use sentintel in is_repo
2016-11-01 23:21:50 -05:00
d986746ef9
missing quote added
2016-11-01 23:07:20 -05:00
a8fa061f2e
quote all the assignments prevent accidental glob splitting
2016-11-01 23:02:06 -05:00
f8e9726922
source setupVars and check for the correct variable
2016-11-01 19:01:48 -05:00
884363bd05
remove ipv6 check since it's already in setupVars
2016-11-01 19:01:28 -05:00
bdd240ecb6
Shellcheck catch for always true expansion.
2016-11-01 15:36:27 -07:00
04da292df9
Missed one spinner, updated and exit script if github is unreachable.
2016-11-01 12:17:38 -07:00
85b8676b8e
Remove spinner, no functions here should last that long, and it masks a few potential exit avenues.
2016-11-01 12:16:46 -07:00
114bc13c23
Specify path, cron may not know where the files are located.
2016-11-01 12:03:26 -07:00
5fef5f1ed4
Break down `is_repo` to make sure it does what is expected.
2016-11-01 11:54:14 -07:00
807b60b0e6
Missed the second reinstaller....
2016-11-01 11:44:16 -07:00
fbc800e556
If unattened reinstall fails, notify user and exit script immediately.
2016-11-01 11:42:18 -07:00
1991ee7a7d
Google Style Guide. `readonly` and cap constants.
2016-11-01 11:36:44 -07:00
ffbfadbccf
Detail what the script does.
2016-11-01 11:33:04 -07:00
c3e2bce956
Variables declared as strings, make sure they are strings when we use them in functions.
2016-11-01 11:26:57 -07:00
0c9520d7e3
Protect against unexepcted return values (GitHub not responding as we'd expect.) And make sure bash doesn't maul the variables and cause firing of unattended reinstall of application when values returned aren't as expected.
2016-11-01 11:18:41 -07:00
1e7e5230cc
Clarify what exactly is being called and the expected returned value format
2016-11-01 11:15:21 -07:00
f1efc97357
Clairfy condition to make sure they operate as per the specs of the logic flow layout.
2016-11-01 11:04:33 -07:00
d6fe48112c
Merge pull request #857 from pi-hole/feature/debugUpdate
...
Debug Updates
2016-10-29 23:15:07 +01:00
dcf6e6b14d
Clarify user action required to end the scripts.
2016-10-29 12:24:22 -07:00
908697a963
User token instructions, and small bugfix for missing separator.
2016-10-29 12:04:18 -07:00
fad2d6b1d1
Return values start showin up now. Logic operators too...
2016-10-28 15:53:18 -07:00
9cd830b6aa
Start to refine tests and clean up code.
2016-10-28 15:37:45 -07:00
d9a16b0ff4
Clear up bottom half of script with fewer redundenicies.
2016-10-28 15:25:06 -07:00
cb5c94ef5e
Sorry, left that gravity.list parser in. Big debug files. Cleared that up.
2016-10-28 15:13:04 -07:00
85fbd66871
Good commit point, number of changes
2016-10-28 14:52:08 -07:00
3da75d6125
Grep was leaking a file not found if blacklist didn't exist
2016-10-28 17:28:04 -04:00
d4a3a5c180
Trying to implement The Brontide Idiom for design.
2016-10-28 10:42:30 -07:00
71e3a473d6
Fix = underbar
2016-10-28 07:16:16 -07:00
c2cfc09f63
Clean up more of the UX and log. Lots to go.
2016-10-28 07:06:05 -07:00
01f10b56e8
Refactor out some more reudndant code.
2016-10-28 06:51:30 -07:00
90ec0a610e
Tricorder is introduced.
2016-10-28 04:42:45 -07:00
42bff1ce1b
Move parse utility to be near other parsing functions.
2016-10-28 03:53:53 -07:00
e3c7a1f31f
Top half user output updated.
2016-10-28 03:49:03 -07:00
0debbffa70
Add a couple of parsing utility functions.
2016-10-28 03:45:07 -07:00
f9570a82cc
Remove glitchy daemon detection.
2016-10-27 00:58:24 -07:00
36285ead57
Just becuase this is bugging me, but I'll fix it later.
2016-10-27 00:32:18 -07:00
13e488dace
Daemon check for lighttpd and dnsmasq.
2016-10-27 00:30:51 -07:00
f169da8fd0
Set for quiet temporarily.
2016-10-26 14:48:11 -07:00
60741298b7
Cut more verbosity. Prep for `lsof` parsing and daemon tests.
2016-10-26 14:33:47 -07:00
f73734acb0
Only check IPv6 Gateway if it exists.
2016-10-26 13:57:57 -07:00
fc360abe43
Only check IPv6 if system is enabled.
2016-10-26 12:22:20 -07:00
98db002770
Tighten IP test reponse to user.
2016-10-26 11:38:19 -07:00
0d6a6b97f9
remove whitelist and blacklist scripts
2016-10-26 09:56:45 +01:00
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
4269626f5d
Attribute source for bashism.
2016-10-25 21:53:41 -07:00
8fa897aadb
Add back in sourcing files (setupVars.conf) and tweak `ip_check`
2016-10-25 21:39:28 -07:00
f549618d12
Move environment IPv6 interface check to `ip_check` and fix IPv6 source routing issue.
2016-10-25 21:25:57 -07:00
2fa47aaf31
Source routing is deprecated by RFC5095
2016-10-25 20:53:18 -07:00
b0874fb23a
Temporarily get rid of gateway sourcing from setupVars, temporarily.
2016-10-25 19:53:00 -07:00
fb70fd77e8
Prototype version_check, add helper functions for logging and echo.
2016-10-25 17:50:14 -07:00
01f17f9cbb
Reduce header verbosity. New header writer.
2016-10-25 17:19:33 -07:00
aba0d93fda
Merge pull request #814 from pi-hole/promoTweaksTheSecond
...
Various tweaks and fixes: Part 2 (Plus Pause/Resume button functionality!)
2016-10-25 17:43:40 +06:00
b49384ffe4
intent
2016-10-23 22:44:21 +01:00
7fb622638b
flip reload logic. Do not reload if there are not changes made to blacklist.txt
2016-10-23 22:44:06 +01:00
bd0cc134bf
MERGE FAIL :ashamed_face:
2016-10-23 22:43:11 +01:00
476fd1f695
indentation
2016-10-23 22:38:18 +01:00
96053d13be
Flip reload logic. Do not reload lists if no changes made to whitelist.txt
2016-10-23 22:38:06 +01:00
c958bed418
Consistency changes. Replace MOST uses of `echo >> ${DebugLog}` with usage of `log_write` function
2016-10-23 22:31:20 +01:00
2b2c240d39
Fix shebang line broken in #831
...
Remove root check and references to ${SUDO}
Check for /etc/pihole/setupVars.conf and use piholeInterace in IPv6 checks as suggest by @jacobsalmela https://github.com/pi-hole/pi-hole/pull/831#issuecomment-255606854
2016-10-23 22:15:10 +01:00
b79392ba2c
exit after displaying white/blacklist
2016-10-23 19:49:51 +01:00
d0826b2c33
Merge branch 'development' of https://github.com/airencracken/pi-hole into airencracken-dev
2016-10-23 19:33:28 +01:00
07a66a70fc
Consistency
...
More of the same
2016-10-22 10:12:05 -07:00
69ba8a3c2f
Consistency
...
Again trying to move the repo to one style. Doesn't matter if it's
changed afterwards, but one style instead of about five seems
saner.
2016-10-22 10:01:15 -07:00
a30c75ef71
Consistency
...
Cleanup!
2016-10-22 00:35:44 -07:00
d0b3727c5d
Consistency
...
Yet more cleanup
2016-10-22 00:32:36 -07:00
6e94bf5b6d
Consistency
...
You know the drill
2016-10-22 00:14:38 -07:00
0f04e270a7
consistency
...
Just more cleanup
2016-10-22 00:10:25 -07:00
c0012540ed
Re-add shebang
2016-10-20 21:08:07 +01:00
9ab6df0e54
Merge branch 'development' into promoTweaksTheSecond
...
# Conflicts:
# advanced/Scripts/blacklist.sh
# advanced/Scripts/whitelist.sh
2016-10-20 21:06:28 +01:00
0efda04920
Use heredocs instead of multiple calls to echo
...
There were a lot of places (like in help functions) that used multiple
echo calls instead of heredocs. Personal opinion but this seems cleaner.
2016-10-19 20:46:37 -07:00
28eeaf201b
Standardize function declaration
...
There were no fewer than three styles of function declaration going
on in these files, so I attempted to standardize them to the typical
myfucn() {
}
style.
2016-10-19 19:47:45 -07:00
a64f4cd871
whitelist script now only directly edits whitelist.txt. DOES NOT TOUCH HOST FILE, instead calls gravity with a no download argument
2016-10-19 23:17:20 +01:00
a41eff1276
Blacklist script now only directly edits blacklist.txt. DOES NOT TOUCH HOST FILE, instead calls gravity with a no download argument
2016-10-19 23:16:52 +01:00
b66f23cfd0
account for new update script
2016-10-18 14:19:44 +01:00
27d6e5d8cf
Complete overhaul of update logic. Moved to seperate script
2016-10-18 14:19:25 +01:00
ce46c4dec4
remove prematurely added code
2016-10-18 12:11:02 +01:00
013d77488a
complete overhaul of version script. Now with optional arguments!
2016-10-18 12:07:11 +01:00
29ad2496b6
don't output "elevating with sudo" in pihole script, just do it.
2016-10-18 12:05:48 +01:00
DL6ER
Dan Schaper
DL6ER
Jacob Salmela
Dan Schaper
Mcat12
Markus Napp
Promofaux
Dan Schaper
Adam Warner
DL6ER
Jacob Salmela
Adam Warner
diginc
Eric Warnke
Marcus Hildum