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
Dan Schaper
Jacob Salmela
Jacob Salmela
DL6ER
DL6ER
Mcat12
ProtoFoo
Markus Napp
Promofaux
Dan Schaper
Adam Warner
Dan Schaper