3fab34687c
Redirect pi.hole to pi.hole/admin/
2017-02-21 20:38:09 +01:00
b2d78edae9
Redirect pi.hole to pi.hole/admin/
2017-02-21 20:36:59 +01:00
a64211123f
Some debug additions
2017-02-21 16:46:54 +01:00
4f85ace525
Force pihole user to use sh-shell (instead of nologin)
2017-02-21 14:46:53 +01:00
e8fde702a0
Also chown the other files
2017-02-21 11:52:07 +01:00
e339f3852c
Change ownership of FTL log to pihole user
2017-02-21 11:50:08 +01:00
032f94afc0
Don't suppress su's output
2017-02-21 11:46:31 +01:00
90ccbef431
pihole-FTL init.d script
2017-02-21 11:18:47 +01:00
a7def771c8
Revert "redirect pi.hole to pi.hole/admin"
2017-02-19 20:12:32 +00:00
543f1243e2
Merge pull request #1241 from pi-hole/feature/redirect-pi-hole-to-admin
...
redirect pi.hole to pi.hole/admin
2017-02-18 20:59:03 +00: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
26cb6a1929
redirect pi.hole to pi.hole/admin
2017-02-11 20:46:27 -06:00
7c63bbfe44
Merge pull request #1233 from ProtoFoo/patch-1
...
Add manual edit warnings to lighttpd.conf.* files
2017-02-11 08:10:35 -06: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
162d9d7d57
Add manual edit warning
...
Added text block from 01-pihole.conf to warn user that manual changes to lighttpd config will be overwritten.
Slight cosmetic adjustments (tabs -> spaces).
2017-02-09 17:00:52 +01:00
357f5a2cfd
Add manual edit warning
...
Added text block from dns config file to warn user that manual changes to lighttpd config will be overwritten.
Slight cosmetic adjustments (tabs -> spaces).
2017-02-09 16:46:55 +01: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
da05491992
Merge pull request #1192 from pi-hole/fix/regex
...
Remove misplaced start of string expression
2017-01-30 21:25:45 +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
8b22f435ad
Change how user and group are stored in the logrotate config file (necessary on Ubuntu 16.04.1)
2017-01-29 19:58:53 +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
bcb8a52418
Added user to cron file
2017-01-13 11:57:07 +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
6b6fbc4709
Remove --force on @reboot
2017-01-12 20:41:25 +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
df7671d393
Add a few comments and remove debug output
2017-01-11 18:01:27 -05:00
a263936243
Merge branch 'development' into wildcardblacklisting
2017-01-11 18:25:51 +01:00
11924d425b
Hide whitelist option if we detected that the domain as blocked due to wildcard blocking
2017-01-11 17:07:08 +01:00
6b3aea933d
Add info that whitelisting blocked pages does not work
2017-01-09 15:02:31 +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
7bcc15e416
Adjust blocking page paths from admin restructure
2016-12-30 15:36:53 -05:00
1a3bdbaabf
Merge pull request #1057 from pi-hole/new/whitelistonblockingpage
...
Allow whitelisting from blocking page
2016-12-30 21:07:34 +01:00
5e35fdbc52
Save blocking page CSS to pihole directory instead of admin
2016-12-30 14:42:15 -05:00
ab2c486f25
Fix password Enter handling
...
Also remove extranious form information, since JS handles that
2016-12-30 14:13:15 -05:00
7fd7430d38
Use pi.hole when getting js and css
...
If a user is able to get to this page, they must be using Pi-hole
2016-12-30 13:43:29 -05:00
089b98430f
Fix formatting
2016-12-30 12:59:05 -05:00
5c7fc05a32
Enable DHCP logging by default
2016-12-30 16:31:57 +00:00
09bbc81470
Add notice that the user might have to flush his DNS cache
2016-12-30 12:27:33 +00:00
f7274addcd
Delete swapfile generator, haven't used this in a long time.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-30 04:08:32 -08:00
09bfa2ef77
Add whitelisting on blocking page feature
2016-12-30 12:03:45 +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
c5f5252145
Merge pull request #961 from pi-hole/customblockpage
...
Custom Pi-Hole block page
2016-12-27 10:25:03 -08:00
62d001225a
Merge pull request #1040 from pi-hole/fix/updater_git-C
...
Remove git -C from update.sh
2016-12-25 12:28:42 -08:00
e50947eb58
mend
2016-12-25 21:26:06 +01:00
ca056d32d2
Remove git -C
2016-12-25 21:22:59 +01:00
a0e0465036
Revert "Merge pull request #1018 from pi-hole/diginc-patch-1"
...
This reverts commit ff3c36a7a29355a8ad0e
2016-12-25 17:32: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
c1982c04ff
Merge pull request #1029 from pi-hole/bogusDNS_BOGUS_PRIVentries
...
remove `DNS_BOGUS_PRIV` from setupVars.conf
2016-12-23 19:32:13 +00:00
9a62026830
remove `DNS_BOGUS_PRIV` from setupVars.conf
2016-12-23 19:27:02 +00:00
2fb0dc0a4a
add warning if SELinux is Enforcing
2016-12-23 10:27:52 -06: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
ff3c36a7a2
Merge pull request #1018 from pi-hole/diginc-patch-1
...
pihole.cron reduce duplication
2016-12-23 09:41:48 +00:00
5e53f484be
Update pihole.cron
...
Stop repeating the path.
2016-12-22 22:00:17 -06:00
bb28d94884
Merge branch 'development' into customblockpage
...
Conflicts:
automated install/basic-install.sh
2016-12-22 19:22:09 +01: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
4626b8ced5
Removed fixed username from sudoers file
2016-12-22 13:18:38 +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
a0019d86c5
Merge pull request #983 from pi-hole/cronpath
...
Fix missing path information for cron
2016-12-15 07:01:20 -05:00
3c4a9bba78
Minor change
2016-12-15 10:38:24 +01:00
4348653431
Merge pull request #985 from pi-hole/pi.hole
...
A man has no name. Even though his name is Jaqen H'ghar
2016-12-15 08:49:22 +00:00
e7713a9028
add missing pihole autocomplete commands
2016-12-14 19:53:40 +00:00
684ac98c8e
Remove hostname and pi.hole entries, move to /etc/pihole/local.list
2016-12-14 19:28:01 +00:00
9a2ffabc33
Fix missing path information
2016-12-14 17:33:20 +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
505c9e8979
Minor change
2016-12-06 14:08:45 +01:00
75deb02961
Don't query pihole if page is hidden anyhow
2016-12-06 14:05:48 +01:00
480211033d
Detect if blocking page is loaded within frame or iframe. If so, hide everything
2016-12-06 14:05:02 +01:00
ca9321624c
Added padding for ad list results
2016-12-05 14:40:48 +01:00
40f18df90f
Simplified CSS, removed external contents
2016-12-05 14:39:07 +01:00
0d63cfd6c3
Add 1x1 pixel GIF image. Can apparently be used to trick some of the please-don't-use-adblocker pages as many of them contain code like `if ($('Ad').height() == 0) { prevent access to this page; }`
2016-12-05 12:34:30 +01:00
3d6b22de6c
Update index.php to include more detailed output
2016-12-05 12:12:01 +01:00
fc233fcdd3
Fixed typo
2016-12-05 12:10:05 +01:00
20370d4348
Update CSS file
2016-12-05 11:26:21 +01:00
0f90671241
Updated index.php to use CSS file unter admin/
2016-12-05 10:51:41 +01:00
a866c4e388
Place blockingpage.css (former index.css) unter admin/ so we can load it also from some blocked sub-directories
2016-12-05 10:50:19 +01:00
e7241a989c
Include CSS file
2016-12-04 22:20:51 +01:00
6e788668f9
Updated index.php
2016-12-04 22:17:33 +01:00
b246dba7e7
Rename index.html to index.php
2016-12-04 21:41:26 +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
ProtoFoo
DL6ER
Adam Warner
Dan Schaper
Jacob Salmela
Jacob Salmela
DL6ER
Mcat12
Markus Napp
Promofaux
Dan Schaper
Dan Schaper
bcambl
Adam Hill
DL6ER