Commit graph

3686 commits

Author SHA1 Message Date
Dan Schaper
250b445eee
Split declaration and population for stickler.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-04-10 21:37:04 -07:00
Mark Drobnak
331472b592
Merge pull request #1999 from pi-hole/tweak/RedundantInstallCode
adlists.default no longer used. No need to reference it.
2018-04-06 00:17:45 -04:00
DL6ER
82d5afe996
Silence error in log flush subroutine when no pihole-FTL.conf can be found
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-05 22:28:55 +02:00
Razvan Radu
7361d5d3ea Update pihole lolcahost probe for DNS status
Signed-off-by: Razvan Radu <ramset@gmail.com>
2018-04-05 11:14:39 -06:00
DL6ER
6086614274
Add "-l, privacylevel" description to "pihole -a"
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-04 18:10:23 +02:00
Adam Warner
6bb4780d32
Merge pull request #2077 from pi-hole/tweak/FTLDNSExperiments
FTLDNS tweaks
2018-04-04 17:00:03 +01:00
Adam Warner
631f5b4848 Change order of updatable components to match the end output
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-04 16:35:11 +01:00
DL6ER
0f17712f6c
Merge pull request #2085 from pi-hole/FTLDNS-privacylevels
Backend changes needed to be able to set the privacy level
2018-04-04 14:41:16 +02:00
DL6ER
4941e0f8ad
Backend changes needed to be able to set the privacy level
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-04 13:12:39 +02:00
Jacob Salmela
fbee18e24d
Merge pull request #2056 from pi-hole/release/v3.3.1
Pi-hole core v3.3.1
2018-04-02 19:29:39 -05:00
Adam Warner
f37b2bc7c1
move call to get_binary_name into FTLcheckUpdate() to avoid having to run that first
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-02 23:22:06 +01:00
Adam Warner
56278c6394
Fix shellcheck complaints
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-02 22:06:36 +01:00
Adam Warner
b1d6c03190
Break out binary name funtion to it's own function
Remove duplicate code. get_binary_name is now in the install script
Add some "version" checking to ftl download when using an alt branch, uses checksum
Greatly simplify update process. Source pihole-FTL version checker from basic-install.sh
Always run install script to finalise changes.
Install script now outputs versions after an update
(This is a Squash of previous work into one commit)

Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-02 21:53:32 +01:00
Mark Drobnak
1200a77b22
Merge pull request #2075 from everettsouthwick/development
Add support for public Cloudflare DNS servers.
2018-04-02 00:03:50 -04:00
Mark Drobnak
bb9a18ef08
Merge pull request #1987 from ryanknapper/patch-1
Proper output for debug CPU detection
2018-04-02 00:00:14 -04:00
Everett Southwick
a8b493cb7d Add support for public Cloudflare DNS servers.
Signed-off-by: Everett Southwick <everett@everettsouthwick.com>
2018-04-01 17:59:16 -05:00
Jacob Salmela
1a275ba184
debug user locale; improve function to parse variables and files
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
2018-04-01 06:40:48 -05:00
Jacob Salmela
187848660c
try another fix for #2028
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
2018-03-31 16:12:29 -05:00
Jacob Salmela
c3f391dc5a
maybe fixes #2028 by deleting null bytes
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
2018-03-31 14:08:48 -05:00
Mark Drobnak
971e6f2664
Merge pull request #2064 from Perflyst/chronometer-1
Add RaspberryPi 3B+ to Chronometer
2018-03-30 17:42:50 -04:00
Mark Drobnak
a1d6ef04ec
Merge pull request #1758 from mettacrawler/fix-for-RHELish-ifcfg
basic-install.sh - no CIDR in ifcfg-*
2018-03-30 17:28:52 -04:00
DL6ER
ff47ab12fb
Save number of effectively blocked domains in /etc/pihole/numBlocked
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-03-30 21:01:51 +02:00
Dan Schaper
a97e361661
Merge pull request #2061 from dflamand/development
Remove dead link from CONTRIBUTING.md
2018-03-28 20:10:11 -07:00
Dan Schaper
34d84522dd
Merge pull request #2054 from theLMGN/patch-1
Link to the admin panel on the splash page.
2018-03-28 20:08:39 -07:00
Perflyst
3390fbf238 Add RaspberryPi 3B+
Signed-off-by: Perflyst <mail@perflyst.de>
2018-03-27 12:23:01 +02:00
Mark Drobnak
98ad1feaeb
Merge pull request #2060 from pi-hole/tweak/debug-xheader
add label to x-header so you know which one is being evaluated
2018-03-26 13:23:31 -04:00
Dillon Flamand
37e8a91d5b
Remove dead link from CONTRIBUTING.md
Removed a link to a github repo that no longer exists.

Signed-off-by: D. Flamand <dflamand@users.noreply.github.com>
2018-03-25 21:59:35 -07:00
Jacob Salmela
68c27eb2a1
add label to x-header so you know which one is being evaluated
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
2018-03-25 21:27:40 -05:00
Jacob Salmela
143e75d213
fix empty ports on some systems
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
2018-03-25 09:39:29 -05:00
DL6ER
295ac49f83
Add capability CAP_NET_RAW to allow pihole-FTL to use RAW sockets for being able to create an ICMPv6 socket for IPv6 handling in the DHCP service
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-03-25 09:58:22 +02:00
Mark Drobnak
d31a498e6c
Merge pull request #2031 from pi-hole/tweak/BegonePullApprove
Remove PA YAML file
2018-03-23 22:16:12 -04:00
Adam Warner
2fd88a1c6a
Merge branch 'FTLDNS' of github.com:pi-hole/pi-hole into FTLDNS 2018-03-23 22:47:13 +00:00
Adam Warner
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
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