Adam Warner
33148ba832
Add help text to pihole command to document new flag
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
bca23dd896
Allow passing of --check-only to update script.
...
Don't run installer for updating web files, it's handled by getGitFiles.
I think this works...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
310d33b8ee
Merge dev > FTLDNS fix merge conflicts
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
8b5dcc3872
Match change made by 7edab27
to prevent merge conflict
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
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
6 years ago
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.
6 years ago
Ludovic Rousseau
7edab27e53
Stylistic change to use an explicit if/then/fi
...
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
6 years ago
Ludovic Rousseau
9b3531f634
Fix stylistic issue
...
Expand variable using ${FTLconf}
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
6 years ago
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>
6 years ago
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>
6 years ago
Mark Drobnak
c2fcbbb0c6
Merge pull request #2090 from Razvici/master
...
Update pihole locahost probe for DNS status
6 years ago
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>
6 years ago
Mark Drobnak
331472b592
Merge pull request #1999 from pi-hole/tweak/RedundantInstallCode
...
adlists.default no longer used. No need to reference it.
6 years ago
DL6ER
82d5afe996
Silence error in log flush subroutine when no pihole-FTL.conf can be found
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
Razvan Radu
7361d5d3ea
Update pihole lolcahost probe for DNS status
...
Signed-off-by: Razvan Radu <ramset@gmail.com>
6 years ago
DL6ER
6086614274
Add "-l, privacylevel" description to "pihole -a"
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
Adam Warner
6bb4780d32
Merge pull request #2077 from pi-hole/tweak/FTLDNSExperiments
...
FTLDNS tweaks
6 years ago
Adam Warner
631f5b4848
Change order of updatable components to match the end output
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
DL6ER
0f17712f6c
Merge pull request #2085 from pi-hole/FTLDNS-privacylevels
...
Backend changes needed to be able to set the privacy level
6 years ago
DL6ER
4941e0f8ad
Backend changes needed to be able to set the privacy level
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
Jacob Salmela
fbee18e24d
Merge pull request #2056 from pi-hole/release/v3.3.1
...
Pi-hole core v3.3.1
6 years ago
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>
6 years ago
Adam Warner
56278c6394
Fix shellcheck complaints
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
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>
6 years ago
Mark Drobnak
1200a77b22
Merge pull request #2075 from everettsouthwick/development
...
Add support for public Cloudflare DNS servers.
6 years ago
Mark Drobnak
bb9a18ef08
Merge pull request #1987 from ryanknapper/patch-1
...
Proper output for debug CPU detection
6 years ago
Everett Southwick
a8b493cb7d
Add support for public Cloudflare DNS servers.
...
Signed-off-by: Everett Southwick <everett@everettsouthwick.com>
6 years ago
Mark Drobnak
971e6f2664
Merge pull request #2064 from Perflyst/chronometer-1
...
Add RaspberryPi 3B+ to Chronometer
6 years ago
Mark Drobnak
a1d6ef04ec
Merge pull request #1758 from mettacrawler/fix-for-RHELish-ifcfg
...
basic-install.sh - no CIDR in ifcfg-*
6 years ago
DL6ER
ff47ab12fb
Save number of effectively blocked domains in /etc/pihole/numBlocked
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
Dan Schaper
a97e361661
Merge pull request #2061 from dflamand/development
...
Remove dead link from CONTRIBUTING.md
6 years ago
Dan Schaper
34d84522dd
Merge pull request #2054 from theLMGN/patch-1
...
Link to the admin panel on the splash page.
6 years ago
Perflyst
3390fbf238
Add RaspberryPi 3B+
...
Signed-off-by: Perflyst <mail@perflyst.de>
6 years ago
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
6 years ago
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>
6 years ago
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>
6 years ago
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>
6 years ago
Mark Drobnak
d31a498e6c
Merge pull request #2031 from pi-hole/tweak/BegonePullApprove
...
Remove PA YAML file
6 years ago
Adam Warner
2fd88a1c6a
Merge branch 'FTLDNS' of github.com:pi-hole/pi-hole into FTLDNS
6 years ago
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>
6 years ago
Leo MG Nesfield (LMGN)
bfcbd72e4b
Link to the admin panel on the splash page.
6 years ago
Adam Warner
238a56cac3
Remove CreateLogFile function, as this is handled by the FTL service
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
51765b1f65
chown pihole log to pihole:pihole, rather than pihole:root
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Mark Drobnak
e131395cce
Merge pull request #2037 from justinamcafee/master
...
Adds FamilyShield DNS server address to the "Choose DNS" screen in installer.
6 years ago
Adam Warner
d26ea2b948
remove trailing whitespace
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
5584a9ce5d
Merge branch 'development' into FTLDNS
6 years ago
Adam Warner
e2e8b733a8
tidy up function
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
f18bf35b20
use `systemctl is-enabled` to check enabled status of service
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
44d8cb77e3
Kill off `mask_service` function
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
fc10e3fcac
Merge pull request #2025 from pi-hole/FTLDNSremoveDnsmasq
...
Disable dnsmasq FTLDNS
6 years ago