gaspersic/pi-hole
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,148 Commits 27 Branches 79 Tags
b89154ca306af9840fd604331b01c2b9414e709f
Commit Graph

3148 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DL6ER
b89154ca30 Worked in review comments, inlined script content (we don't actually need setcap in the systemd unit as setcap is used in the installer/updater and even in the Makefile so capabilites should always be there) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-05-13 17:41:07 +02:00
DL6ER
824c4cdcc9 Use PermissionStartOnly to be granted root permissions for prestart commands 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-21 16:43:59 +02:00
DL6ER
e0d41c4a60 Rename systemd unit file inside the repo to confuse Github less 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-19 08:14:38 +02:00
DL6ER
39ead75b86 Quote to prevent word splitting (although not expected to see spaces in there) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-19 08:12:20 +02:00
DL6ER
fb00b5ab17 Use exit code directly 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-15 21:55:34 +02:00
DL6ER
df49761e45 Select init.d or systemd unit depending on used init system 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-15 21:51:35 +02:00
DL6ER
55f1adeb39 Use pihole-FTL-prestart.sh the installer will place in /opt/pihole 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-15 21:42:50 +02:00
DL6ER
ee0cf07ee3 Install both, init.d and systemd scripts 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-15 20:58:04 +02:00
DL6ER
ba1e97787b Re-add init.d script 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-15 08:11:27 +02:00
DL6ER
57fb1b79bf Add "nss-lookup.target" and explanation why we want it 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-14 13:21:34 +02:00
DL6ER
7923ae77a6 Add shebang 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-14 11:35:15 +02:00
DL6ER
ea4f47fed1 Temporarily disable one test as we are not able to use setcap on Travis CI 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-14 11:16:43 +02:00
DL6ER
b1f483394e Set permissions for pihole-FTL.service to 644 (rw-r--r--) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-14 11:12:44 +02:00
DL6ER
998138695a Use SIGHUP for reloading DNS lists 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-14 11:09:00 +02:00
DL6ER
cd332a8eca Remove old init.d script if present as it cannot coexist with the systemd unit we are installing now 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-14 10:41:20 +02:00
DL6ER
9b0aa6e561 Enable systemd service unit + set capabilities for executable after installing the two files 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-14 10:35:21 +02:00
DL6ER
d273f58e67 Write systemd unit file for pihole-FTL, delete old init.d file 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-14 10:28:19 +02:00
Adam Warner
310d33b8ee Merge dev > FTLDNS fix merge conflicts 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-13 17:01:54 +01:00
Adam Warner
8b5dcc3872 Match change made by 7edab27 to prevent merge conflict 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-13 16:53:57 +01:00
Adam Warner
36d9af10f0 Merge pull request #2108 from LudovicRousseau/fix_No_such_file_or_directory 
Fix sed: can't read /etc/pihole/pihole-FTL.conf: No such file or directory
 2018-04-13 16:47:59 +01:00
Dan Schaper
0c8fcbc684 Merge pull request #2105 from pi-hole/feature/self_dco 
Do not require DCO for Pi-hole Org members with GPG signed commits.
 2018-04-13 05:42:04 -07:00
Ludovic Rousseau
7edab27e53 Stylistic change to use an explicit if/then/fi 
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
 2018-04-13 12:19:55 +02:00
Ludovic Rousseau
9b3531f634 Fix stylistic issue 
Expand variable using ${FTLconf}

Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
 2018-04-13 11:48:34 +02:00
Ludovic Rousseau
d8f85a8981 Avoid a "No such file or directory" error 
Check the file /etc/pihole/pihole-FTL.conf exists before trying to use
it.
without the patch I get, each day, in my logs:
sed: can't read /etc/pihole/pihole-FTL.conf: No such file or directory

I use a variable FTLconf to not repeat the file name twice.

Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
 2018-04-13 11:16:58 +02:00
Ludovic Rousseau
3b229489c2 Fix regex to find DBFILE= from configuration file 
The regex ^\s^.DBFILE\s*=\s* does not work to match "DBFILE="
I don't know what the second '^' is used for.

With the change I now have the results:

DBFILE=/foo/bar
-> /foo/bar

  DBFILE=/foo/bar
-> /foo/bar

 # DBFILE=/foo/bar
-> /etc/pihole/pihole-FTL.db

xDBFILE=/foo/bar
-> /etc/pihole/pihole-FTL.db

Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
 2018-04-13 11:16:50 +02:00
Mark Drobnak
c2fcbbb0c6 Merge pull request #2090 from Razvici/master 
Update pihole locahost probe for DNS status
 2018-04-12 11:17:33 -04:00
Dan Schaper
952f1271b4 Do not require DCO for Pi-hole Org members with GPG signed commits. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-04-11 10:13:09 -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
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
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