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

822 Commits

Author SHA1 Message Date
Adam Warner
76654c7856
Actually check for dnsmasq's existence before attempting to interact with it's service
Signed-off-by: Adam Warner <adamw@rner.email>
2018-05-03 21:16:31 +01:00
Adam Warner
a6e4b0fea5
- Test for existence of remote non-master branch of FTL before attemtping to check for update
- Move some functions from checkout to basic-install
- provide helpful error message on downlaod not existing

Signed-off-by: Adam Warner <adamw@rner.email>
2018-05-01 23:15:26 +01:00
Adam Warner
a07891e3e6
0 is not 1!!
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-30 23:53:51 +01:00
Adam Warner
e946a35b18
Move dnsmasq check into FTLcheckUpdate
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-30 23:50:35 +01:00
Adam Warner
68d7337f98
switch up dnsmasq detection logic
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-30 23:42:41 +01:00
Adam Warner
8b4198fd8d
Merge pull request #1835 from Fauxsys/development
Fix for unattended installations #1767 #1768 #1834
2018-04-30 23:06:46 +01:00
Adam Warner
e17e69604c
Merge branch 'development' into new/RemoveDefaultBlocklists 2018-04-29 18:40:53 +01:00
Adam Warner
0c8a32b9ae
No need to stop services
This causes issues on a `pihole -r reconfigure`

Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-29 18:27:10 +01:00
Adam Warner
d8c60aaae7
Merge pull request #2142 from bcambl/fix_fedora_ip_check
Fix static IP checking on Fedora
2018-04-29 14:36:07 +01:00
Adam Warner
3216d65353
Merge branch 'development' into new/RemoveDefaultBlocklists 2018-04-29 13:39:17 +01:00
bcambl
1d8ea9e869 Fix static IP checking on Fedora
This bug was introduced by #1758 where the CIDR was removed from the static IP check.
The CIDR was acting as a boundary so we need to test for a boundary or a slash character.

Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-04-23 06:42:36 -06:00
Adam Warner
8ead0b5483
@fourdee dropped this: /
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-23 11:59:39 +01:00
Fauxsys
72c081cfd6 Fix for unattended installations #1767 #1768 #1834
Removed updatePihole() function and updated if/then statements in installPihole() and main(). Corrected minor typos.

Signed-off-by: Fauxsys <fiber.cipher@gmail.com>
2018-04-23 04:53:57 -04:00
Dan
acfc49fd41
Merge branch 'development' into Install-Web-Server 2018-04-22 09:23:11 +01:00
Daniel (Fourdee)
60bcca54eb Minor
+ indentation
2018-04-21 08:29:21 +01:00
Daniel (Fourdee)
eccea8a911 Minor
+ Fix indentation
+ Stick with case, add "On" to provide INFO print out, although its not
technically required as INSTALL_WEB_SERVER=true is default value.
2018-04-21 08:27:31 +01:00
Michele Bologna
55fce489bc Fix: add psmisc as dependency
Debian 9.4 does not install `psmisc` by default and the following error will happen during installation:

```
  [✗] /usr/local/bin/pihole: line 353: killall: command not found
/usr/local/bin/pihole: line 364: killall: command not found
```

This patch adds `psmisc` (that contains `killall`) as dependency

Signed-off-by: Michele Bologna <michele.bologna@gmail.com>
2018-04-19 23:41:23 +02:00
Daniel (Fourdee)
c2c1dc7469 Ensuring bot pleasure
https://github.com/pi-hole/pi-hole/pull/2115#pullrequestreview-113066748
2018-04-18 04:38:07 +01:00
Daniel (Fourdee)
47c1071bb8 Minor
+ Add info in regards to disabling web server install:
https://github.com/pi-hole/pi-hole/pull/2115
2018-04-18 04:24:48 +01:00
Daniel (Fourdee)
e401651f09 Update https://github.com/pi-hole/pi-hole/pull/2115
+ Patch existing systems with the new variable changes using
'accountForRefactor'
+ Prompt user to install webserver
2018-04-18 04:11:32 +01:00
Adam Warner
7455ac9bfb
Run chooseBlocklists on EVERY reconfigure, not only if the adlist file does not esist.
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-17 19:46:36 +01:00
Adam Warner
b6b1dcb275
delete adlists.list if user cancels out of this dialog
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-17 19:35:46 +01:00
Adam Warner
2e4f49a223
Default all to on, change up wording. This commit can be rolled back, it's just an option!
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-17 17:10:53 +01:00
Adam Warner
88d4108f92
- Add new whipstail to choose from example blocklists on new install
- remove adlists.default
- do not copy non-existent adlists.default on run of gravity

Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-17 10:33:06 +01:00
Daniel (Fourdee)
3a483a1b20 install_web_server
+ Splits web interface and server into two variables.
+ Option to disable forced install of Lighttpd.
2018-04-15 02:08:16 +01: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
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
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
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
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
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
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
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
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
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
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
cadab61a21
Merge branch 'development' into FTLDNS 2018-03-05 21:33:53 +00: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
DL6ER
fcdc85eab8
Remove dnsmasq from dependencies
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-25 23:47:11 +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