bcambl
24b4aabae9
allow installer to continue with additional rpm based distros
...
- FedBerry (Fedora based ARM image)
- Scientific Linux (CentOS based)
- Add prompt to continue installing on unsupported RPM based distros
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-08-29 20:49:06 -06:00
Mark Drobnak
a9c6d79cda
Merge pull request #2394 from pi-hole/fix/pihole-FTL_owner_group
...
Ensure proper unprivileged user if pihole-FTL is started as root
2018-08-29 11:17:39 -04:00
DL6ER
45bf4b02e7
Ensure that when pihole-FTL is launched as user root, it will drop permissions as soon as this is possible. We tell pihole-FTL to change UID/GID to pihole:pihole instead of the default nobody:nogroup. This default causes conflicts with our SQLite3 database. See that corresponding pull request for further details.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-27 16:51:33 +02:00
Mark Drobnak
667c5138cc
Merge pull request #2381 from pi-hole/fix/existing_dnsmasq.conf
...
Improve /etc/dnsmasq.conf handling
2018-08-25 18:55:12 -05:00
DL6ER
b9d47d0dd2
Merge pull request #2378 from pi-hole/fix/pihole-FTL-no-caps
...
Start pihole-FTL as root if capabilities are not supported by the system
2018-08-21 14:11:24 +02:00
DL6ER
1813c25117
If config file was backed up: Print info message
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-21 13:07:23 +02:00
DL6ER
940c9c3bae
Merge pull request #2383 from pi-hole/feature/privacy-level-4
...
Add support for privacy level 4
2018-08-21 13:03:41 +02:00
Mark Drobnak
9235a11d5f
Merge pull request #2382 from pi-hole/tweak/no-extra-logging
...
Don't use extra query logging
2018-08-20 18:33:42 -04:00
Mcat12
f141b9f778
Add support for privacy level 4
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-08-20 17:36:16 -04:00
DL6ER
1dca1efbc6
Don't use extra query logging
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-20 23:11:23 +02:00
DL6ER
28c6b1393f
Backup existing /etc/dnsmasq.conf if present and ensure that /etc/dnsmasq.conf contains only "conf-dir=/etc/dnsmasq.d"
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-20 22:52:22 +02:00
DL6ER
6c97b8b875
Merge pull request #2377 from pi-hole/fix/service-touch-leases
...
Touch dhcp.leases to ensure it exists
2018-08-20 11:24:44 +02:00
DL6ER
ec2426b24d
Add clarifying comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-19 19:55:47 +02:00
DL6ER
5cd3b11391
Start pihole-FTL as root if capabilities are not supported by the system
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-19 14:32:19 +02:00
DL6ER
d30b565d98
Touch dhcp.leases to ensure it exists. There are some systems out there where the installer didn't finish on the first run and some users don't have this file being created. Although /etc/pihole should be owned by pihole:pihole, pihole-FTL sometimes fails to open this file and - if this is the case and DHCP is enabled - refuses to start altogether.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-19 13:53:34 +02:00
Mark Drobnak
74008d28a7
Merge pull request #2367 from realtebo/fix-enabling-ftl
...
Fix to enable pihole-FTL service before starting it
2018-08-16 16:15:46 -04:00
Realtebo
0d1b3cee4f
Enable FTL service before starting it
...
Signed-off-by: Realtebo <mirkotebaldi@yahoo.it>
2018-08-16 17:52:47 +02:00
Realtebo
0b44cb4426
Merge branch 'development' of https://github.com/pi-hole/pi-hole into development
2018-08-16 17:48:35 +02:00
Mark Drobnak
eb8e4496b2
Merge pull request #2354 from realtebo/development
...
Create adlist file while running unattended setup
2018-08-16 11:26:07 -04:00
Realtebo
30f45d4df7
Merge branch 'development' of https://github.com/pi-hole/pi-hole into development
2018-08-16 16:52:18 +02:00
Mark Drobnak
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
Mirko Tebaldi
476fecbcf5
Fixed typos as suggestes
...
Signed-off-by: Realtebo <mirkotebaldi@yahoo.it>
2018-08-14 15:04:42 +02:00
Mirko Tebaldi
327b58fa03
Merge pull request #1 from pi-hole/development
...
Merge with current main development branch
2018-08-14 14:55:18 +02:00
DL6ER
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
DL6ER
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
Mark Drobnak
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
WaLLy3K
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
Realtbo
d9195970b7
Create adlist file while running unattended setup
...
Signed-off-by: Realtebo <mirkotebaldi@yahoo.it>
2018-08-12 23:21:01 +02:00
WaLLy3K
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
Mark Drobnak
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
DL6ER
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
Mark Drobnak
ef8aaba014
Merge pull request #2320 from TronPaul/fix/no-tty
...
set noninteractive during unattended install
2018-08-08 19:28:12 -04:00
Mark Drobnak
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
DL6ER
760dd01b50
Use grep invert-match
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-07 18:36:06 +02:00
DL6ER
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
DL6ER
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
DL6ER
f2b820079a
Merge pull request #2329 from pi-hole/tweak/remove-ppc
...
Remove PowerPC from FTL binaries
2018-08-07 16:02:11 +02:00
WaLLy3K
083024496a
Merge pull request #2327 from pi-hole/header-fix
...
Fix Chronometer heading
2018-08-07 12:29:45 +10:00
Mcat12
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
WaLLy3K
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
DL6ER
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
Dan Schaper
5b628a4c77
Merge branch 'development' into release/v4.0
2018-08-05 21:16:19 -07:00
Mark McGuire
0081a7ca92
set noninteractive during unattended install
...
Signed-off-by: Mark McGuire <mark.b.mcg@gmail.com>
2018-08-05 10:12:43 -05:00
Dan Schaper
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
Mcat12
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
Mcat12
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
Mark Drobnak
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
Dan Schaper
993beab3b7
Changed wording.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-31 11:14:26 -07:00
Dan Schaper
06875f2cc9
Merge branch 'release/v4.0' into fix/parse_pihole-FTL.conf
2018-07-30 14:32:29 -07:00
Dan Schaper
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