2fd88a1c6a
Merge branch 'FTLDNS' of github.com:pi-hole/pi-hole into FTLDNS
2018-03-23 22:47:13 +00:00
fbab930cb1
Allow install script to install FTL instead of the checkout script. Utilises the /etc/pihole/ftlbranch file.
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-03-23 22:46:41 +00:00
238a56cac3
Remove CreateLogFile function, as this is handled by the FTL service
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-03-23 10:53:22 +00:00
51765b1f65
chown pihole log to pihole:pihole, rather than pihole:root
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-03-23 10:15:40 +00:00
d26ea2b948
remove trailing whitespace
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-03-18 00:38:34 +00:00
5584a9ce5d
Merge branch 'development' into FTLDNS
2018-03-18 00:29:08 +00:00
e2e8b733a8
tidy up function
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-03-18 00:13:10 +00:00
f18bf35b20
use systemctl is-enabled to check enabled status of service
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-03-17 22:56:50 +00:00
44d8cb77e3
Kill off mask_service function
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-03-17 22:48:11 +00:00
fc10e3fcac
Merge pull request #2025 from pi-hole/FTLDNSremoveDnsmasq
...
Disable dnsmasq FTLDNS
2018-03-16 11:27:52 +00:00
b92ccb2de4
Additionally mask the dnsmasq service on systems with systemctl
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-03-14 20:01:06 +00:00
84bd86f1ee
- Test to see if dnsmasq service is enabled before stopping and disabling it.
...
- Some formatting tweaks to the `start_service` `stop_`service` `disable_service` and `enable_service` commands
Signed-off-by: Adam Warner <adamw@rner.email >
2018-03-07 23:31:28 +00:00
7193f40b87
remove libnettle, missed a >/dev/null
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-03-07 22:23:05 +00:00
acd69fa4b0
silence push/popd
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-03-07 22:21:09 +00:00
856a2096eb
Merge pull request #2030 from pi-hole/new/StickFTLCheckoutBranch
...
Store checked out FTL branch in /etc/pihole/ftlbranch
2018-03-07 21:51:52 +00:00
76cb129d3c
don't forget master and development branches!
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-03-07 21:48:09 +00:00
246d5cd587
store checked out FTL branch in /etc/pihole/ftlbranch
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-03-07 21:41:00 +00:00
24219422df
Merge branch 'development' into FTLDNSremoveDnsmasq
2018-03-06 20:43:27 +00:00
aed20cf7c6
Merge pull request #2017 from pi-hole/fix/NoWhitelistGravity
...
Gravity falls over when there is no whitelist file
2018-03-06 20:39:32 +00:00
6584933e92
fix stickler complaints
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-03-06 18:51:02 +00:00
8cf8da4c78
- Check file /etc/pihole/ftlbranch for current FTL branch, download from github if master, or pi-hole.net if other
...
- Check if downloaded binary file can resolve queries, if so stop and disable dnsmasq
- Add service_disable function
- Add dependency libcap2-bin on debian to enable setcap. Need to check other distos
-Always download FTL binary if /etc/pihole/ftlbranch does not contain "master"
- Change some strings/variables that reference dnsmasq and change them to pihole/pihole-FTL
Signed-off-by: Adam Warner <adamw@rner.email >
2018-03-06 18:44:57 +00:00
ad1f210528
As we no longer add source lists to the whitelist by default, gravity falls over on new installs.
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-03-06 18:29:28 +00:00
cadab61a21
Merge branch 'development' into FTLDNS
2018-03-05 21:33:53 +00:00
0b87f489d5
Look for pihole-FTL, not dnsmasq!
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-03-03 15:59:56 +00:00
e3e5e016d5
Merge pull request #2016 from pi-hole/bugfix/mktemp
...
Bugfix mktmp > mktemp
2018-03-02 16:03:11 -05:00
3425b9a82e
Fix mktmp > mktemp
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2018-03-02 12:28:53 -08:00
6011dd7372
Merge pull request #2000 from pi-hole/fix/FTL_Install
...
Use pushd/popd and create random temporary directory
2018-02-26 21:55:12 -08:00
7ed45d26c2
Remove " " at some places where they shouldn't be
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-02-26 17:26:51 +01:00
fcdc85eab8
Remove dnsmasq from dependencies
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-02-25 23:47:11 +01:00
56a2924a33
Unprivileged processes are subject to full permission checking based on the process's credentials, we have to explicitly allow pihole-FTL to bind to ports < 1024 (port 53 for DNS) and for various advanced network-related operations (to allow for handling DHCP requests)
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-02-25 23:42:26 +01:00
09886a3f11
Add resolveconf config to pihole-FTL.service
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-02-25 10:11:11 +01:00
e8ec0dc701
Use pihole-FTL resolver in pihole and gravity
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-02-25 09:34:04 +01:00
41d9d57c84
Merge pull request #1996 from pi-hole/fix/AlternativeWhitelistFromWebFix
...
Specifty `LC_ALL=C` when dealing with sorted lists.
2018-02-24 07:22:44 -08:00
b87bcc8f5f
Modifications in pihole-FTL.service for FTLDNS
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-02-24 13:23:06 +01:00
4606693e62
Use pushd/popd and create random temporary directory to prevent potential backdoor binary injection.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2018-02-22 20:13:38 -08:00
6b4685b333
much more elegant to export LC_ALL at the beginning of the script!
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-02-21 11:33:29 +00:00
d4ac818a0b
Specifty LC_ALL=C when dealing with sorted lists.
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-02-21 11:23:07 +00:00
f14184df30
Merge pull request #1982 from LudovicRousseau/master
...
Create blacklist.txt if not existant
2018-02-18 15:32:01 -05:00
47bbea9ba7
Use " " to protect parameter substitution
...
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr >
2018-02-18 21:20:04 +01:00
7265935cd4
Merge pull request #1915 from ryanknapper/development
...
Add conditional forwarding options to webpage.sh
2018-02-18 12:51:46 -05:00
40bda4b3d1
Merge pull request #1981 from pi-hole/fix/always_repair_pihole-FTL.service
...
Always replace pihole-FTL.service
2018-02-18 17:26:17 +01:00
b7891f92a5
Create blacklist.txt if not existant
...
Closes: https://github.com/pi-hole/pi-hole/issues/1888
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr >
2018-02-18 14:19:49 +01:00
8b79017d0f
Always replace pihole-FTL.service
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-02-18 13:07:22 +01:00
5465ac9ba0
Merge pull request #1929 from pi-hole/fix/flushDB
...
pihole -f: Flush database
2018-02-17 17:45:15 +01:00
b8eaa9a527
Use double quotes to precent globbing and word splitting
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-02-17 13:01:00 +01:00
5d274008db
Use possibly user-defined database location when flushing
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-02-17 12:58:57 +01:00
220e755596
Merge pull request #1973 from pi-hole/tweak/stop-autowhitelisting
...
Don't auto-whitelist blocking list domains
2018-02-17 12:23:14 +01:00
fc5034696d
Don't auto-whitelist blocking list domains
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-02-16 19:42:33 +01:00
4a6f77bc59
Merge pull request #1967 from pi-hole/master
...
Git flow Pi-hole v3.3
2018-02-15 21:09:22 +01:00
1e87850952
Merge pull request #1943 from pi-hole/release/3.3
...
Pi-hole v3.3
2018-02-14 12:48:40 -08:00
