eb8e4496b2
Merge pull request #2354 from realtebo/development
...
Create adlist file while running unattended setup
2018-08-16 11:26:07 -04:00
24e1c78d52
Merge pull request #2358 from pi-hole/fix/restart_FTl_on_logflush
...
Restart pihole-FTL after log flushing
2018-08-16 10:34:25 -04:00
476fecbcf5
Fixed typos as suggestes
...
Signed-off-by: Realtebo <mirkotebaldi@yahoo.it >
2018-08-14 15:04:42 +02:00
327b58fa03
Merge pull request #1 from pi-hole/development
...
Merge with current main development branch
2018-08-14 14:55:18 +02:00
d3eea9404d
Merge pull request #2331 from pi-hole/tweak/improve_FTL_download_errormsg
...
Improve error message when downloading FTL failed
2018-08-14 13:20:47 +02:00
ca309d3b28
Restart pihole-FTL after log flushing to force reloading history. Fixes #2339
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-08-14 13:16:17 +02:00
3696373609
Merge pull request #2345 from pi-hole/NXDOMAIN-tail
...
Fix colour tail for use with new blocking methods
2018-08-13 15:01:35 -04:00
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
d9195970b7
Create adlist file while running unattended setup
...
Signed-off-by: Realtebo <mirkotebaldi@yahoo.it >
2018-08-12 23:21:01 +02:00
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
afdc4219d0
Merge pull request #2343 from pi-hole/tweak/audit_log
...
Add facility to add multiple audit list entries at once and to nuke audit list
2018-08-10 18:06:23 -04:00
94e4ed6644
Add facility to add multiple audit list entries at once and to nuke audit list
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-08-10 18:22:55 +02:00
ef8aaba014
Merge pull request #2320 from TronPaul/fix/no-tty
...
set noninteractive during unattended install
2018-08-08 19:28:12 -04:00
d2ae07e69b
Merge pull request #2334 from pi-hole/fix/gravity-count-regex
...
Fix gravity's regex counting logic
2018-08-08 16:22:50 -04:00
760dd01b50
Use grep invert-match
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-08-07 18:36:06 +02:00
5bf90cb77d
Use alternative logic for counting regex file entries, skipping commented out lines
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-08-07 18:02:01 +02:00
f5c3dc5d9d
Improve download error message that is shown when downloading or verifying the binary failed
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-08-07 16:51:58 +02:00
f2b820079a
Merge pull request #2329 from pi-hole/tweak/remove-ppc
...
Remove PowerPC from FTL binaries
2018-08-07 16:02:11 +02:00
083024496a
Merge pull request #2327 from pi-hole/header-fix
...
Fix Chronometer heading
2018-08-07 12:29:45 +10:00
e01eea8ba8
Remove PowerPC from FTL binaries
...
It is no longer built, and may cause 404 errors if it attempts to
download the binary.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-08-06 21:15:16 -04:00
eef948d797
Fix header newlines
...
* Added \\n to each $xxx_ver_str, resolving issue #2325
Signed-off-by: WaLLy3K <wally3k@pi-hole.net >
2018-08-07 10:45:30 +10:00
8017be7d09
Merge pull request #2322 from pi-hole/release/v4.0
...
Git Flow - Release/v4.0 merge back to development.
2018-08-06 09:57:28 +02:00
5b628a4c77
Merge branch 'development' into release/v4.0
2018-08-05 21:16:19 -07:00
0081a7ca92
set noninteractive during unattended install
...
Signed-off-by: Mark McGuire <mark.b.mcg@gmail.com >
2018-08-05 10:12:43 -05:00
e80ae4906f
Merge pull request #2318 from pi-hole/tweak/wildcard-regex-format
...
Use simpler regex format for wildcards
2018-08-01 01:01:08 -07:00
e4e22fb58e
Fix permissive regex
...
The `\.?` is too permissive, letting in anything that ends in the domain
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-07-31 22:16:40 -04:00
7086a400e8
Use simpler regex format for wildcards
...
Use `\.?domain\.com$` instead of `((^)|(\.))domain\.com$`
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-07-31 21:36:29 -04:00
a25a13fde0
Merge pull request #2317 from pi-hole/fix/parse_pihole-FTL.conf
...
Add empty pihole-FTL.conf file
2018-07-31 19:51:34 -04:00
993beab3b7
Changed wording.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2018-07-31 11:14:26 -07:00
06875f2cc9
Merge branch 'release/v4.0' into fix/parse_pihole-FTL.conf
2018-07-30 14:32:29 -07:00
448fc7231c
Installed to /etc/pihole
as PI_HOLE_CONFIG_DIR variable.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2018-07-30 14:26:07 -07:00
d0d030bafc
Moved file creation to proper function. Included bash variables for file
...
location. Set to pihole:pihole ownership with 644 permissions.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2018-07-30 14:02:18 -07:00
833131e15f
Merge pull request #2315 from pi-hole/fix/regex-file-ownership
...
Allow PHP to edit the regex file if web is installed
2018-07-30 06:36:20 -07:00
fb2810557a
Allow web user group to access regex.list
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2018-07-29 16:09:03 -07:00
82a64db42b
Merge pull request #2313 from pi-hole/fix/pihole-man-usage
...
Fix wildcard/regex usage formatting
2018-07-29 15:43:19 -07:00
57af0ba0a4
Use install
to make the regex file
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-07-29 18:26:00 -04:00
17c1e64f7e
Moved FTL configuration copy in to scripts copy function.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2018-07-29 09:06:51 -07:00
af13ceac24
Touch file as ${USER} instead of copying template.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2018-07-29 08:42:59 -07:00
af2ec61965
Convert [] to ()
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2018-07-29 08:17:57 -07:00
a55cc55338
Only touch
the regex file if it doesn't already exist
...
The other permission calls will always be run so that the file is in the
expected state after install and repair.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-07-28 23:07:35 -04:00
b2fb3fd35a
Merge pull request #2310 from pi-hole/feature/pihole-FTL.conf
...
Include template pihole-FTL.conf
2018-07-28 20:04:39 -07:00
94b7c8eb59
Added header for file. Not using standard Pi-hole copyright header.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2018-07-28 19:58:23 -07:00
6d671007dd
Merge pull request #2314 from pi-hole/fix/ftl-install-error-output
...
Fix FTL install leaking error output
2018-07-28 19:53:04 -07:00
1a8d5fb4a9
Allow PHP to edit the regex file if installed
...
Fixes permissions error on the web interface when modifying the regex.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-07-28 21:57:39 -04:00
f90c412b35
nroff checked pihole.8 for formatting. nroff -man pihole.8
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2018-07-28 18:28:25 -07:00
c73b5456eb
Fix "which" error leaking
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-07-28 21:12:05 -04:00
3d87398721
Fix check_service_active
leaking error output
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-07-28 20:50:04 -04:00
96681887b8
Fix wildcard/regex usage formatting
...
Fix whitespace issue and missing backslashes in the regex example.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-07-28 20:35:15 -04:00
f2c675cff6
Formatted pihole-FTL.conf for readability.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2018-07-28 16:16:16 -07:00
1844bf17a7
Merge pull request #2311 from pi-hole/fix/git-head-flag
...
Fix wrong git command flag
2018-07-28 10:48:29 -07:00