1
0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 23:08:07 +00:00
Commit Graph

3198 Commits

Author SHA1 Message Date
Leo MG Nesfield (LMGN)
bfcbd72e4b
Link to the admin panel on the splash page. 2018-03-23 16:17:31 +00:00
Jacob Salmela
d9d3caec22
new head tail function and get head tail of pihole-FTL.log instead of just head
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
2018-03-23 06:56:40 -05:00
Adam Warner
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
Adam Warner
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
Jacob Salmela
7159ecb632
reduce ping times for faster script completion
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
2018-03-23 00:11:21 -05:00
Jacob Salmela
11f3425876
update donation and affiliate links. also link to trademark guidelines. update an image. and add a project.
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
2018-03-22 23:51:12 -05:00
Mark Drobnak
e131395cce
Merge pull request #2037 from justinamcafee/master
Adds FamilyShield DNS server address to the "Choose DNS" screen in installer.
2018-03-21 17:47:24 -04:00
Adam Warner
d26ea2b948
remove trailing whitespace
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-18 00:38:34 +00:00
Adam Warner
5584a9ce5d
Merge branch 'development' into FTLDNS 2018-03-18 00:29:08 +00:00
Adam Warner
e2e8b733a8
tidy up function
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-18 00:13:10 +00:00
Adam Warner
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
Adam Warner
44d8cb77e3
Kill off mask_service function
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-17 22:48:11 +00:00
Adam Warner
fc10e3fcac
Merge pull request #2025 from pi-hole/FTLDNSremoveDnsmasq
Disable dnsmasq FTLDNS
2018-03-16 11:27:52 +00:00
Adam Warner
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
justinamcafee
30af6e73be
added ;; to line 825
Misformated case. Updated correct case
2018-03-10 17:36:47 -06:00
justinamcafee
2895b9bfb7
Added support for FamilyShield from OpenDNS
With a very minor code change, individuals can now implement restrictions on dangers, disturbing, or otherwise adult oriented content without the need for managed restrictions.
This is a fairly non-invasive change and will benefit users who intend to use VPN for home or small business uses where access to such material may be undesirable.
2018-03-10 17:33:31 -06:00
Adam Warner
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
Adam Warner
7193f40b87
remove libnettle, missed a >/dev/null
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-07 22:23:05 +00:00
Adam Warner
acd69fa4b0
silence push/popd
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-07 22:21:09 +00:00
Adam Warner
71d8f5f96f
remove PA YAML file
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-07 22:00:14 +00:00
Adam Warner
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
Adam Warner
76cb129d3c
don't forget master and development branches!
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-07 21:48:09 +00:00
Adam Warner
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
Riley Avron
f390671018 Improve scheme matching to avoid inadvertent blocking
Signed-off-by: Riley Avron <riley.avron@gmail.com>
2018-03-06 22:03:56 -08:00
Riley Avron
512ec7fb87 Remove unneeded ifs in awk
Signed-off-by: Riley Avron <riley.avron@gmail.com>
2018-03-06 22:03:43 -08:00
Adam Warner
24219422df
Merge branch 'development' into FTLDNSremoveDnsmasq 2018-03-06 20:43:27 +00:00
Adam Warner
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
Adam Warner
6584933e92
fix stickler complaints
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-06 18:51:02 +00:00
Adam Warner
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
Adam Warner
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
Adam Warner
cadab61a21
Merge branch 'development' into FTLDNS 2018-03-05 21:33:53 +00:00
Adam Warner
0b87f489d5
Look for pihole-FTL, not dnsmasq!
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-03 15:59:56 +00:00
Mark Drobnak
e3e5e016d5
Merge pull request #2016 from pi-hole/bugfix/mktemp
Bugfix mktmp > mktemp
2018-03-02 16:03:11 -05:00
Dan Schaper
3425b9a82e
Fix mktmp > mktemp
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-03-02 12:28:53 -08:00
Dan Schaper
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
DL6ER
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
DL6ER
fcdc85eab8
Remove dnsmasq from dependencies
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-25 23:47:11 +01:00
DL6ER
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
DL6ER
09886a3f11
Add resolveconf config to pihole-FTL.service
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-25 10:11:11 +01:00
DL6ER
e8ec0dc701
Use pihole-FTL resolver in pihole and gravity
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-25 09:34:04 +01:00
Dan Schaper
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
DL6ER
b87bcc8f5f
Modifications in pihole-FTL.service for FTLDNS
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-24 13:23:06 +01:00
Dan Schaper
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
Adam Warner
e61d8e4fb8
adlists.default no longer used. No need to reference it.
Use --force switch of gravity to force the cache refresh

Signed-off-by: Adam Warner <adamw@rner.email>
2018-02-22 14:45:31 +00:00
Adam Warner
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
Adam Warner
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
Ryan Knapper
c17d95bfed
Proper output for debug CPU detection
Inserted "log_write" to properly output CPU detection lines.

Signed-off-by: Ryan Knapper (ryanknapper@gmail.com>
2018-02-19 10:22:28 -05:00
Mark Drobnak
f14184df30
Merge pull request #1982 from LudovicRousseau/master
Create blacklist.txt if not existant
2018-02-18 15:32:01 -05:00
Ludovic Rousseau
47bbea9ba7 Use " " to protect parameter substitution
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
2018-02-18 21:20:04 +01:00
Mark Drobnak
7265935cd4
Merge pull request #1915 from ryanknapper/development
Add conditional forwarding options to webpage.sh
2018-02-18 12:51:46 -05:00