Dan Schaper
2aa3a109a0
Ping gateways and Internet.
8 years ago
Dan Schaper
472708376d
Split out IP checks.
8 years ago
Dan Schaper
cfed3d59e9
Begin fixing IP detection functions.
8 years ago
DL6ER
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
8 years ago
DL6ER
01f980d49c
Change description as we want to save the debug log for 48h instead of only 24h
8 years ago
DL6ER
99fab7e52a
Scan whole dnsmasq.d directory for cofigurations files
8 years ago
Mcat12
ba67144e34
Merge branch 'development' into adminPageAsOption
8 years ago
DL6ER
7785dac50e
Merge pull request #1228 from r0ckarong/development
...
Justify and improve help texts, add missing wildcard description
8 years ago
Markus Napp
01f643e5eb
fixup! Fix spacing for wildcard help in list script
8 years ago
Markus Napp
8037f3e332
Fix spacing for wildcard help in list script
8 years ago
Markus Napp
afe5176e01
Justify help output to match main script
8 years ago
Mcat12
a48317883d
Fix indentation
8 years ago
Promofaux
4fcf8fd23f
Merge in `development` branch - resolve conflict in update.sh
8 years ago
Promofaux
10a30344e5
No need to source setupVars, as basic-install.sh is sourced, which sources setupVars itself. Sourception.
8 years ago
Promofaux
b764d17c64
comment
8 years ago
Promofaux
ba0abdb88d
wrap update logic in admin_installed bool check
8 years ago
Promofaux
1428b58dde
source setupVars and only check admin repo if it is enabled
8 years ago
Mcat12
18eb8a2159
Merge pull request #1185 from pi-hole/cleanup/git_functions
...
Move git functions to one script
8 years ago
DL6ER
3239c7023a
Merge pull request #1170 from pi-hole/new/DHCPstaticleases
...
Backend changes for static DHCP leases
8 years ago
DL6ER
3d4516dc95
Improve regex
8 years ago
DL6ER
509c864cc3
Merge branch 'development' into fix/regex
8 years ago
Mcat12
f8944177a0
Fix chronometer interpreting summaryRaw
8 years ago
DL6ER
06873fe69e
Remove misplaced start of string expression. Fixes #1191
8 years ago
Dan Schaper
3d9d13222b
Use constants for leading paths.
8 years ago
Dan Schaper
745adabb05
Path to source basic-install.sh
8 years ago
Dan Schaper
3861b57dc6
Start moving reused utility functions to one script.
8 years ago
Dan Schaper
99a4a80017
Spelling
8 years ago
Mcat12
033ba26041
Stay in repo directory until we error check
8 years ago
DL6ER
08cddba200
There should be no echo here
8 years ago
DL6ER
1bf43b0425
Improved regex: Remove all leading points from domain (.....xyz => .xyz). Return not only a part, but fill validated domain
8 years ago
DL6ER
85b3fef08d
Use perl instead of grep?
8 years ago
DL6ER
15037fa888
Typo
8 years ago
DL6ER
d595fef18f
Fix regex
8 years ago
Dan Schaper
be5fa22b6f
Merge pull request #1174 from pi-hole/tweak/logrotate_insecure_directory
...
Improve logrotate support
8 years ago
DL6ER
6fd7e0311c
Install customized version of logrotate script
8 years ago
DL6ER
1bcf2dd0fc
Tweak CLI domain filter
8 years ago
DL6ER
dad18dc5de
Changed keywords
8 years ago
DL6ER
5c95c4074b
Remove static leases from DHCP static leases file
8 years ago
DL6ER
4301b9a12a
Add static DHCP leases to new file
8 years ago
DL6ER
6a89c6bf3b
Silence rm warning if no DHCP server is used
8 years ago
Promofaux
fe8c365d17
codacy never lies
8 years ago
Promofaux
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.
8 years ago
Promofaux
1ad23a065e
switch out `wc -l` with `grep -c ^`
8 years ago
Promofaux
de102fde5c
Add line count and size check for pihole.log
8 years ago
DL6ER
8bb9dd460b
Be able to disable the DHCP domain name
8 years ago
Mcat12
58f3ff69d8
Align comment with referenced line
8 years ago
DL6ER
72d8d10e64
Show most recently blocked domain in chronometer (using FTL). Fixes #717
8 years ago
Mcat12
63d02df0bc
Merge pull request #1130 from pi-hole/new/logrotate
...
Use logrotate for pihole.log
8 years ago
DL6ER
08f08fea61
Merge pull request #1135 from pi-hole/new/multipleDNSservers
...
Allow multiple DNS servers
8 years ago
DL6ER
1ed2a8637f
Removed debug echo's
8 years ago
Mcat12
d196c13f2c
Merge pull request #1131 from pi-hole/chronometerJsonUnixTools
...
No excuse for chronometer not to match API
8 years ago
DL6ER
bd1c5a42e8
Allow multiple DNS servers
8 years ago
DL6ER
845d8c0e63
Ensure LC_NUMERIC=C is set when evaluating floating point number (non-English systems might expect "," as decimal separator
8 years ago
Promofaux
b4c32e47c6
Missed one!
8 years ago
Promofaux
248d8680f7
actual codacy complaints
8 years ago
Promofaux
1bda965a7c
Codacy complaints
8 years ago
Promofaux
2ee305769d
Replace all calculations with values read directly web admin API. Parse JSON using native unix tools, no additional requirements needed.
8 years ago
DL6ER
3a8a936575
Corrected path
8 years ago
DL6ER
3fd2ffd466
Add logrotate for pihole.log
8 years ago
DL6ER
b56ca2b834
Add DNSSEC support to Pi-hole core
8 years ago
DL6ER
a263936243
Merge branch 'development' into wildcardblacklisting
8 years ago
DL6ER
2935275227
Merge branch 'development' into wildcardblacklisting
8 years ago
DL6ER
74a4e62cc9
Codacy fix
8 years ago
DL6ER
63a414a544
Align outputs
8 years ago
DL6ER
7d1f5091a7
Fixed small typo
8 years ago
DL6ER
3b54cab3bc
Show branches and revisions (incl. possible dirty state) in debug log
8 years ago
DL6ER
d9e949b27c
Merge pull request #1096 from pi-hole/fix/updater
...
Fix updater failing on non-English systems
8 years ago
DL6ER
168397e90d
Fixed typo in webpage.sh
8 years ago
DL6ER
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
8 years ago
DL6ER
200995bf29
Make IPv6 features of Pi-hole DHCP server switchable
8 years ago
DL6ER
3a90c1c192
Source setupVars.conf before trying to access variables
8 years ago
Adam Warner
12bec1df68
Merge pull request #1048 from pi-hole/tweak/simplify_webpage.sh
...
Major simplification of webpage.sh + extend DHCP to IPv6
8 years ago
DL6ER
ad61852804
Test against empty string
8 years ago
DL6ER
dbd8aee4ee
Add 'local' domain if not set in setupVers.conf
8 years ago
DL6ER
677694b01a
Set 24h lease time if settings was empty before
8 years ago
DL6ER
85f0241c0d
Reprocess DHCP settings after update
8 years ago
DL6ER
ebf0db4bbf
Typo fixed
8 years ago
DL6ER
9ac265980f
Add .conf to filename
8 years ago
DL6ER
40798da6b1
Add blacklisting wildcard support
8 years ago
Dan Schaper
fc596e41d4
All scripts set executable
8 years ago
DL6ER
5c7fc05a32
Enable DHCP logging by default
8 years ago
DL6ER
9181a4a1d8
Apply dhcp lease time also for IPv6
8 years ago
DL6ER
3268e1611a
Backend accept and apply dhcp lease time
8 years ago
DL6ER
cf724176dc
Do stateful DHCPv6 and SLAAC
8 years ago
DL6ER
1e627c7e8f
Make webpage.sh fully library style
8 years ago
DL6ER
9af26cbaac
Major simplification of webpage.sh
8 years ago
DL6ER
321ea8a3a9
Merge branch 'development' into webUIprivacymode
8 years ago
Dan Schaper
ef8292d371
Merge branch 'development' into updater_rewrite
8 years ago
DL6ER
e50947eb58
mend
8 years ago
DL6ER
ca056d32d2
Remove git -C
8 years ago
DL6ER
e15548cbf5
Add --quiet to git fetch in GitCheckUpdateAvail()
8 years ago
DL6ER
5e28e6b9ac
Removed remaining git -C
8 years ago
Dan Schaper
3365ef7aaa
`is_repo()` returns values to caller, silence function.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
68c17b26dc
Bashisms
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
e647efd471
Shell script, not javascript
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
DL6ER
15db1ffdd5
Remove variables not needed any more
8 years ago
DL6ER
4632b0f797
Updated updater logic
8 years ago
DL6ER
65c35a5530
Use new subroutine to determine if updates are available
8 years ago
DL6ER
c449a1c0e0
Added GitCheckUpdateAvail()
8 years ago
DL6ER
b020010f0d
Removed some of the &> /dev/null
8 years ago
DL6ER
0276c72fe2
replace 'git -C' with long version (see #1009 )
8 years ago
DL6ER
04a9791be2
Save empty password
8 years ago
Promofaux
9a62026830
remove `DNS_BOGUS_PRIV` from setupVars.conf
8 years ago
Adam Warner
ef1ce66793
Merge pull request #1013 from pi-hole/fix/chronometer
...
Fix chronometer.sh
8 years ago
Adam Warner
3bc5d1bae0
Merge pull request #989 from pi-hole/APIresolveclientsandupstream
...
Implement backend for AdminLTE/#253
8 years ago
DL6ER
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
8 years ago
DL6ER
bcf8139708
Removed cat where we don't need it
8 years ago
DL6ER
9b0390c9da
Space to Tab
8 years ago
DL6ER
e88f58c34e
Remove grpping for today's log entries, because we flush the log every day
8 years ago
DL6ER
ee8f29d178
Fixed typo, extended help text
8 years ago
DL6ER
da363070c7
Added Kelvin
8 years ago
DL6ER
715838cf89
Allow disabling second DNS server
8 years ago
DL6ER
7a243f890e
Backend for privacyMode on webUI
8 years ago
DL6ER
afabb5957b
Implement backend for https://github.com/pi-hole/AdminLTE/pull/253
8 years ago
DL6ER
2977168da1
dnsmasq "bogus-priv" property
8 years ago
DL6ER
85e3f37503
dnsmasq "domain-needed" property
8 years ago
DL6ER
ba015c1918
Set domain name via Settings page
8 years ago
DL6ER
1556adb678
Also remove quiet-dhcp setting when disabling/enabling the Pi-Hole DHCP server
8 years ago
Adam Warner
6bfe729112
Merge pull request #979 from pi-hole/wwwdatapassword
...
Prevent web UI password change by web user
8 years ago
DL6ER
207422f83a
Added a missing space
8 years ago
DL6ER
004ba28378
Prevent web UI password change by web user
8 years ago
DL6ER
6f38801ed8
Add "Interface appearence" option
8 years ago
DL6ER
b8d2bfc890
Wait 5 seconds before rebooting so the web UI can finish loading before being unreachable due to the reboot
8 years ago
DL6ER
bc91716082
Suppress logging of DHCP actions to /var/log/pihole.log
8 years ago
DL6ER
8dc0dc4d69
Add DHCP-Server backend
8 years ago
DL6ER
2f4b7ce3dd
Update dnsmasq file when changing upstream DNS servers and restart the service to get it active
8 years ago
DL6ER
d4f83cb1d4
Be able to set API_QUERY_LOG_SHOW
8 years ago
DL6ER
aaab3306a8
Add restart DNS capability
8 years ago
DL6ER
2bafa2f2ac
Add reboot option
8 years ago
DL6ER
9ac378ae09
Set domains and clients which are excluded by the API
8 years ago
DL6ER
bf867bd9fd
Set DNS servers from web UI
8 years ago
Mcat12
f98de3d5db
Merge pull request #941 from DL6ER/caseinsensitive
...
Improvements for black-/whitelist scripts
8 years ago
DL6ER
78cb43d0dc
Revert "Simplified EscapeRegexp()"
...
This reverts commit 509cfd15f2
.
8 years ago
DL6ER
509cfd15f2
Simplified EscapeRegexp()
8 years ago
DL6ER
2061daa902
Don't forget to escape also the slash "/"
8 years ago
DL6ER
629ca970a1
Changed from single quoted filter expression to double quotes as reqeusted by codacy
8 years ago
DL6ER
c8ad6f23a8
Properly escape any special characters before using them in regexp manner
8 years ago
Dan Schaper
925c80edd4
Catch more 1's
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
2ec4acfe52
Begin fixing exit values.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
DL6ER
7b26b308ad
No need for echo and pipe here!
8 years ago
DL6ER
4c10634d85
Convert domain names to lower case before checking validity of the domain
8 years ago
Adam Warner
de4401823e
Merge pull request #924 from DL6ER/webpage.sh
...
Add webpage.sh
8 years ago
DL6ER
f50cbe74cb
Changed -web (webpage) to -a (admin)
8 years ago
DL6ER
33b6fe72da
Extended help text
8 years ago
DL6ER
733919be4a
Implement possibility to remove password using "pihole -web -p"
8 years ago
Dan Schaper
68cb0782c0
Add countdown timer
8 years ago
Dan Schaper
0f4c8d4923
Set default timeout to 60 seconds
8 years ago
Dan Schaper
6d2c5b2312
Add debug timeoute
8 years ago
Dan Schaper
a95ce11ca6
Add debug timeoute
8 years ago
DL6ER
88c161769d
Capitalized variable names.
8 years ago
DL6ER
01bf1ae92d
Compute double hashes to avoid rainbow table vulnerability
8 years ago
DL6ER
9193c71cff
Minor change
8 years ago
DL6ER
db278d81e4
Added webpage.sh
8 years ago
Adam Warner
b191cd73a7
Update piholeDebug.sh
...
wording
8 years ago
Jacob Salmela
ca56ca5bd8
promo-tweak
...
Better logic introduced by @PromoFaux
8 years ago
Jacob Salmela
a0f0dff88e
replace hardcoded interface with var
...
setupVars.conf is already sourced, so we just need to replace the
hardcoded value with the variable name.
8 years ago
Dan Schaper
8c08e9e473
Merge pull request #891 from pi-hole/bugfix/chronometer-domain-count
...
Bugfix/chronometer domain count
8 years ago
Adam Warner
4300759287
Fix logic. If both v6 and v4 divide by two, else dont.
8 years ago
Promofaux
d7d6d6f991
Update to use new Var name
8 years ago
Promofaux
2f976504e8
switch out -eq for ==
8 years ago
Dan Schaper
4b7b859db9
Gotta catch 'em all...'
8 years ago
Dan Schaper
f7d0de53bb
Compare string to string.
8 years ago
Dan Schaper
603ec997ba
Remove testing block.
8 years ago
Dan Schaper
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.
8 years ago
Dan Schaper
3d43e1568c
Use explicit calls for function to self-document
8 years ago
Dan Schaper
c1a3f003e8
Rename the only utilty function left that didn't say `repo`
8 years ago
Dan Schaper
3f61aea7fc
Utility functions fully quiet now. Calling functions have the echos.
8 years ago
Dan Schaper
bd68db51e0
ShellCheck split local declaration and assignment.
8 years ago
Dan Schaper
b8a5ed710e
Take echos out of utility functions and move up a level.
8 years ago
Dan Schaper
34be601dd7
Test for lexicographically less than tag version.
8 years ago
Dan Schaper
1d64ad1ccd
Stash all changed files, clean directory and pull updates.
8 years ago
Dan Schaper
f2d7a3d26d
Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks
8 years ago
Adam Warner
ee37c37cab
fix update output logic. version number variables should not be read only!
8 years ago
Dan Schaper
b636c1e1f8
Whitespace.
8 years ago
Dan Schaper
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
8 years ago
Dan Schaper
ece1667fb0
Refactor and move some bits.
8 years ago
Adam Warner
50bd8b4a09
Further tweaks to local repo handling
8 years ago
Dan Schaper
93d91353a1
All tabs now spaced
8 years ago
Dan Schaper
8dc9143b34
Just delete, no need to cd there first.
8 years ago
Dan Schaper
a0d9a1133c
Factoring and combining functions
8 years ago
Dan Schaper
035e4bf727
Move value checks to `if` calls.
8 years ago
Dan Schaper
9ec5bbd560
Actually get `is_repo` to return a value and have it expected.
8 years ago
Dan Schaper
34482c5ed6
Modified `is_repo`
8 years ago
Dan Schaper
7d414b5628
Move version messages to main function, check for repos.
8 years ago
Dan Schaper
d9528dfd09
Bash is funny with returns.
8 years ago
Dan Schaper
9c83825cb8
Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks
8 years ago
Dan Schaper
7a22471787
New naming convention, and reorder functions as bash would prefer them to be.
8 years ago
diginc
c30478bf4a
cleanup and use sentintel in is_repo
8 years ago
diginc
d986746ef9
missing quote added
8 years ago
diginc
a8fa061f2e
quote all the assignments prevent accidental glob splitting
8 years ago
Jacob Salmela
f8e9726922
source setupVars and check for the correct variable
8 years ago
Jacob Salmela
884363bd05
remove ipv6 check since it's already in setupVars
8 years ago
Dan Schaper
bdd240ecb6
Shellcheck catch for always true expansion.
8 years ago
Dan Schaper
04da292df9
Missed one spinner, updated and exit script if github is unreachable.
8 years ago
Dan Schaper
85b8676b8e
Remove spinner, no functions here should last that long, and it masks a few potential exit avenues.
8 years ago
Dan Schaper
114bc13c23
Specify path, cron may not know where the files are located.
8 years ago
Dan Schaper
5fef5f1ed4
Break down `is_repo` to make sure it does what is expected.
8 years ago
Dan Schaper
807b60b0e6
Missed the second reinstaller....
8 years ago
Dan Schaper
fbc800e556
If unattened reinstall fails, notify user and exit script immediately.
8 years ago
Dan Schaper
1991ee7a7d
Google Style Guide. `readonly` and cap constants.
8 years ago
Dan Schaper
ffbfadbccf
Detail what the script does.
8 years ago
Dan Schaper
c3e2bce956
Variables declared as strings, make sure they are strings when we use them in functions.
8 years ago
Dan Schaper
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.
8 years ago
Dan Schaper
1e7e5230cc
Clarify what exactly is being called and the expected returned value format
8 years ago
Dan Schaper
f1efc97357
Clairfy condition to make sure they operate as per the specs of the logic flow layout.
8 years ago
Adam Warner
d6fe48112c
Merge pull request #857 from pi-hole/feature/debugUpdate
...
Debug Updates
8 years ago
Dan Schaper
dcf6e6b14d
Clarify user action required to end the scripts.
8 years ago
Dan Schaper
908697a963
User token instructions, and small bugfix for missing separator.
8 years ago
Dan Schaper
fad2d6b1d1
Return values start showin up now. Logic operators too...
8 years ago
Dan Schaper
9cd830b6aa
Start to refine tests and clean up code.
8 years ago
Dan Schaper
d9a16b0ff4
Clear up bottom half of script with fewer redundenicies.
8 years ago
Dan Schaper
cb5c94ef5e
Sorry, left that gravity.list parser in. Big debug files. Cleared that up.
8 years ago
Dan Schaper
85fbd66871
Good commit point, number of changes
8 years ago
Eric Warnke
3da75d6125
Grep was leaking a file not found if blacklist didn't exist
8 years ago
Dan Schaper
d4a3a5c180
Trying to implement The Brontide Idiom for design.
8 years ago
Dan Schaper
71e3a473d6
Fix = underbar
8 years ago
Dan Schaper
c2cfc09f63
Clean up more of the UX and log. Lots to go.
8 years ago
Dan Schaper
01f10b56e8
Refactor out some more reudndant code.
8 years ago
Dan Schaper
90ec0a610e
Tricorder is introduced.
8 years ago
Dan Schaper
42bff1ce1b
Move parse utility to be near other parsing functions.
8 years ago
Dan Schaper
e3c7a1f31f
Top half user output updated.
8 years ago
Dan Schaper
0debbffa70
Add a couple of parsing utility functions.
8 years ago
Dan Schaper
f9570a82cc
Remove glitchy daemon detection.
8 years ago
Dan Schaper
36285ead57
Just becuase this is bugging me, but I'll fix it later.
8 years ago
Dan Schaper
13e488dace
Daemon check for lighttpd and dnsmasq.
8 years ago
Dan Schaper
f169da8fd0
Set for quiet temporarily.
8 years ago
Dan Schaper
60741298b7
Cut more verbosity. Prep for `lsof` parsing and daemon tests.
8 years ago
Dan Schaper
f73734acb0
Only check IPv6 Gateway if it exists.
8 years ago
Dan Schaper
fc360abe43
Only check IPv6 if system is enabled.
8 years ago
Dan Schaper
98db002770
Tighten IP test reponse to user.
8 years ago
Adam Warner
0d6a6b97f9
remove whitelist and blacklist scripts
8 years ago
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.
8 years ago
Dan Schaper
4269626f5d
Attribute source for bashism.
8 years ago
Dan Schaper
8fa897aadb
Add back in sourcing files (setupVars.conf) and tweak `ip_check`
8 years ago
Dan Schaper
f549618d12
Move environment IPv6 interface check to `ip_check` and fix IPv6 source routing issue.
8 years ago
Dan Schaper
2fa47aaf31
Source routing is deprecated by RFC5095
8 years ago
Dan Schaper
b0874fb23a
Temporarily get rid of gateway sourcing from setupVars, temporarily.
8 years ago
Dan Schaper
fb70fd77e8
Prototype version_check, add helper functions for logging and echo.
8 years ago
Dan Schaper
01f17f9cbb
Reduce header verbosity. New header writer.
8 years ago
Adam Warner
aba0d93fda
Merge pull request #814 from pi-hole/promoTweaksTheSecond
...
Various tweaks and fixes: Part 2 (Plus Pause/Resume button functionality!)
8 years ago
Promofaux
b49384ffe4
intent
8 years ago
Promofaux
7fb622638b
flip reload logic. Do not reload if there are not changes made to blacklist.txt
8 years ago
Promofaux
bd0cc134bf
MERGE FAIL :ashamed_face:
8 years ago
Promofaux
476fd1f695
indentation
8 years ago
Promofaux
96053d13be
Flip reload logic. Do not reload lists if no changes made to whitelist.txt
8 years ago
Promofaux
c958bed418
Consistency changes. Replace MOST uses of `echo >> ${DebugLog}` with usage of `log_write` function
8 years ago
Promofaux
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
8 years ago
Promofaux
b79392ba2c
exit after displaying white/blacklist
8 years ago
Promofaux
d0826b2c33
Merge branch 'development' of https://github.com/airencracken/pi-hole into airencracken-dev
8 years ago
Marcus Hildum
07a66a70fc
Consistency
...
More of the same
8 years ago
Marcus Hildum
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.
8 years ago
Marcus Hildum
a30c75ef71
Consistency
...
Cleanup!
8 years ago
Marcus Hildum
d0b3727c5d
Consistency
...
Yet more cleanup
8 years ago
Marcus Hildum
6e94bf5b6d
Consistency
...
You know the drill
8 years ago
Marcus Hildum
0f04e270a7
consistency
...
Just more cleanup
8 years ago
Promofaux
c0012540ed
Re-add shebang
8 years ago
Promofaux
9ab6df0e54
Merge branch 'development' into promoTweaksTheSecond
...
# Conflicts:
# advanced/Scripts/blacklist.sh
# advanced/Scripts/whitelist.sh
8 years ago
Marcus Hildum
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.
8 years ago
Marcus Hildum
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.
8 years ago
Promofaux
a64f4cd871
whitelist script now only directly edits whitelist.txt. DOES NOT TOUCH HOST FILE, instead calls gravity with a no download argument
8 years ago
Promofaux
a41eff1276
Blacklist script now only directly edits blacklist.txt. DOES NOT TOUCH HOST FILE, instead calls gravity with a no download argument
8 years ago
Adam Warner
b66f23cfd0
account for new update script
8 years ago
Adam Warner
27d6e5d8cf
Complete overhaul of update logic. Moved to seperate script
8 years ago
Adam Warner
ce46c4dec4
remove prematurely added code
8 years ago
Adam Warner
013d77488a
complete overhaul of version script. Now with optional arguments!
8 years ago
Adam Warner
29ad2496b6
don't output "elevating with sudo" in pihole script, just do it.
8 years ago
Promofaux
8c0f860601
Use systemctl/service calls instead of killall to restart/reload dnsmasq
8 years ago
Promofaux
090fbd04af
Remove ${SUDO} usages and root checks from scripts called by `pihole` command as they should not be called directly.
8 years ago
Dan Schaper
9a421d510a
Ignore comments in adlists.list section.
8 years ago
Dan Schaper
a9c3e2c7ba
Add log_write function. Update version_check to use logical conditionals.
8 years ago
Dan Schaper
7fcb40739d
Close IF statement
8 years ago
Dan Schaper
5a3d319677
Add fail check to dig local and remote.
8 years ago
Dan Schaper
8466d0b681
Change NSLOOKUP to dig for resolver tests, add dnsmasq specific records check
8 years ago
Dan Schaper
5de179f1eb
Remove blacklist comparison.
8 years ago
Dan Schaper
36e10595cc
Change netstat to lsof.
8 years ago
Dan Schaper
edd7f28104
Add internet checks to IP section
8 years ago
Dan Schaper
dba1ab3fc0
Remove compareWhitelist
8 years ago
Dan Schaper
3df9c48012
Include ping statistics in default gateway checks.
8 years ago
Dan Schaper
ac1c299369
Revert overzealous renaming of Pi-hole in pihole.log detection.
8 years ago
Dan Schaper
5bbb3ac49a
Standardize Pi-hole naming.
8 years ago
Dan Schaper
014bdf911a
Add open port detection
8 years ago
Dan Schaper
874853fe18
Add lighttpd to version check
8 years ago
Dan Schaper
274b71f8bc
Relocate hostname checks
8 years ago
Dan Schaper
c41d543d81
Handle lack of IPv6 gracefully.
8 years ago
Dan Schaper
7729ddab30
Mode code realignment. Handle lack of IPv6 gateway gracefully.
8 years ago
Dan Schaper
60c0e59a83
Add IPv6 intelligence to debug
8 years ago
Adam Warner
dcedf6bfd0
Merge branch 'development' into PromoFaux-patch-1
8 years ago
Adam Warner
b1a7b0a186
Update piholeDebug.sh
...
I can spell, honest.
8 years ago
Promofaux
a3ef9efd2f
remove updateDashboard script
8 years ago
Adam Warner
8cb2f85a08
Replace `truncate` command with `echo " " >`
8 years ago
Promofaux
b3e7619048
curly brackets all the variables!
8 years ago
Adam Warner
95edb49bb8
Add option for uploading debug log to termbin
8 years ago
Promofaux
e11ef5a7f0
Add version display script. Also checks current version on web and reports version.
8 years ago
diginc
5fb6c5b012
Making the whitelist re-block echo consistent with other WL/BL echos
8 years ago
diginc
3affa73257
Only re-block whitelist deletions if in adlists
...
* Prevent blocking benign/untracked domains deleted off whitelist
* Issue #581
8 years ago
Dan Schaper
ce8f07750f
Remove trailing slash on os-release check
...
Fixes #CLOSED
Remove trailing slash that would cause an os-check to always fail out.
8 years ago
Promofaux
61ff12e8d4
Change header to match the rest of the scripts.
8 years ago
Promofaux
e942440bb7
Dan forgot this : `}`
8 years ago
Promofaux
6f068e0b9c
Replace sprunge.us with termbin, which appears to be more reliable.
8 years ago
Sander
11f2524b9b
Instead of an or, cat *release
8 years ago