7d79cf5cce
Only check SELinux states if "getenforce" command exists
...
- Currently, if the SELinux config file exists, installed SELinux is assumed.
- But removing e.g. an APT package via "apt-get remove" leaves config files in place, or they could be present for other reasons.
- If the getenforce command is not present but the config file is, currently the installer exists without error message when calling getenforce due to "set -e".
- With this change, the presence of getenforce command is checked first. If it is not present, selinux-utils is not installed, which is a core part of SELinux, pulled in by selinux-basics as well. So it can be assumed that no SELinux is active if this command is missing.
Signed-off-by: MichaIng <micha@dietpi.com>
2020-05-12 23:45:56 +02:00
9e96ff37de
Fix merge conflicts
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-05-12 22:16:43 +01:00
987ae3810d
binary, here, should be l_binary
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-05-11 22:03:33 +01:00
fdaf815f42
Merge pull request #3203 from MichaIng/patch-1
...
Failsafe checks for available APT package
2020-05-05 10:27:08 +02:00
988b1ff02f
Merge pull request #3204 from MichaIng/patch-3
...
Revert using hardcoded php-intl meta package
2020-05-05 10:24:56 +02:00
df13b9c32a
Merge pull request #3283 from pi-hole/tweak/remove_firewall_config
...
Remove configureFirewall function, the call to it, and related tests
2020-05-02 10:06:31 -07:00
f4965d8493
Merge pull request #3135 from pvogt09/development
...
Move permission change behind git reset
2020-04-28 19:44:58 +02:00
c0cf8dba87
Merge pull request #3226 from MichaIng/patch-6
...
Do not add pihole user to web server group
2020-04-28 19:39:55 +02:00
a9136d752a
Merge pull request #3246 from pvogt09/fix/user_exists
...
fixes #3217 by checking for existing pihole group
2020-04-28 19:38:12 +02:00
d7bac21149
Dot not add pihole user to web server group
...
This is and was never required and the pihole user does in fact not get any additional permissions through that group.
Signed-off-by: MichaIng <micha@dietpi.com>
2020-04-26 15:45:29 +02:00
dc6c53b6a3
Revert using hardcoded php-intl meta package
...
Using the meta package causes several issues:
- Install on Debian prior to Jessie and Ubuntu prior to Xenial is broken, since those do not serve the meta packages but php5-* packages instead.
- If $phpVer != "php", then multiple conflicting PHP versions can be installed.
- If "${phpVer}-intl" does not pull the correct package, then inherently "${phpVer}-xml" etc are wrong, too. This is theoretically possible, e.g. if PHP7.4 was installed while the webserver uses a concurrently installed PHP7.3 instance. Then the "php" shell command output can differ from what the webserver uses. This theoretical issue would need a different approach to derive $phpVer, not based on the shell command output but by asking the webserver somehow in the first place. But using $phpVer for some modules and hardcoded meta for the others can only lead to inconsistencies and issues.
Signed-off-by: MichaIng <micha@dietpi.com>
2020-04-26 15:44:13 +02:00
86d4c9b1e0
Failsafe checks for available APT package
...
When checking for available packages in APT repository, running a dry-run install can fail for other reasons, even if the package is available. Currently, in such case, wrong fallback packages are selected: https://github.com/pi-hole/pi-hole/issues/2888
"apt-cache show <pkg>" is a quicker method to check for available packages. This is now done as well to check if the fallbacks are available. If none is found, the installer exits with meaningful error message and exit code.
In rare cases, the APT list files can be missing when the installer is started. E.g. this could be on a fresh system, APT lists could have been moved to RAM or removed as a cleanup step. "apt-cache" calls will then fail, same as dry-run installs were. To assure that current package lists are checked, update the package cache directly after the Ubuntu universe repo has been added, only in the Debian/Ubuntu block. This renders the variable handling in RH/Fedora block obsolete.
Signed-off-by: MichaIng <micha@dietpi.com>
2020-04-26 15:42:43 +02:00
462457fe7f
Merge branch 'development' into development
2020-04-24 12:09:49 +02:00
94a4f844a8
Remove deprecated list
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-04-20 21:31:20 +01:00
d18a8b1b8a
Merge pull request #3205 from MichaIng/patch-5
...
Reduce apt-get install verbosity
2020-04-19 15:28:48 +01:00
a37dba2c81
remove configureFirewall function, the call to it, and related tests
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-04-19 14:52:01 +01:00
e6dcccc7bd
Revert "- Added 2 new DNS entries for the new Cloudflare DNS for families, which comes in 2 flavors ( #3276 )"
...
This reverts commit 7e1a8c1ceb
2020-04-18 20:05:54 +01:00
7e1a8c1ceb
- Added 2 new DNS entries for the new Cloudflare DNS for families, which comes in 2 flavors ( #3276 )
...
1- 1.1.1.2 (No Malware)
2- 1.1.1.3 (No Malware or Adult Content)
This would allow parents to have more control over the safety of their family's network.
Signed-off-by: Mohammed-Swillam <moh.sayed@hotmail.com>
2020-04-18 11:49:01 +01:00
982c1b0059
Merge branch 'release/v5.0' into development
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-04-08 12:02:53 +02:00
40ac3e7eb7
remove pihole group during uninstall
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2020-04-04 19:22:37 +02:00
a993b8b34d
fixes #3217 by checking for existing pihole group
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2020-04-03 13:18:32 +02:00
16f664cdb4
basic_install: remove remaining references to hosts-file.net
...
Commit dc35709a1b
2020-04-02 21:23:55 +02:00
dc35709a1b
Remove hosts-file.net from default lists
2020-03-31 17:39:21 +01:00
4994da5170
Update automated install/basic-install.sh
2020-03-12 18:48:40 +00:00
175d32c5f6
Set nameservers to be that which have been chosen by the user in the whiptail
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-03-11 18:55:43 +00:00
1481cc583f
Don't set nameserver in dhcpcd.conf
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-03-11 18:48:40 +00:00
dbc54b3063
remove resolvconf dep
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-03-11 18:47:59 +00:00
bb936f4fdb
Reduce apt-get install verbosity
...
The new version of the installer moved from debconf-apt-progress to raw apt-get output on installs to solve issues with interactive config file choices. This lead to a largely increases amount of output lines of the installer. To reduce the apt-get output to a minimum, while sustaining interactive input in case of config files, the "-qq" option can be used, which inherits "--yes":
- https://manpages.debian.org/buster/apt/apt-get.8.en.html#OPTIONS
- https://manpages.ubuntu.com/manpages/bionic/man8/apt-get.8.html#options
Signed-off-by: MichaIng <micha@dietpi.com>
2020-03-11 11:01:28 +01:00
7b8611ced0
Assorted typo fixes. ( #3126 )
...
* Assorted typo fixes.
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
2020-03-08 16:53:14 -07:00
d16b472592
Remove wget from PIHOLE_DEPS
...
All external calls have been moved to curl, wget no longer needed as
dependency
Signed-off-by: msamendinger <git@samendinger.de>
2020-03-01 22:06:37 +01:00
6104d81622
Safeguard against colour output in grep commandadd -i to grep to make search for "Location" case-insensitive
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-02-24 20:36:45 +00:00
7be019ff52
No need to determine the latest tag, we can just go direct
...
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-02-17 21:29:25 +00:00
75633f0950
Install php-intl and trust the system to install the right extension. We've seen reports that just installing php5-intl or php7-intl isn't sufficient and that we need the meta package as well.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-02-16 21:24:32 +01:00
1072078e26
Change to use API instead of the Location Header
...
(some trailing whitespace removed)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-02-16 11:47:42 +00:00
b0f1333657
Move permission change behind git reset (like in update_repo()) and remove whitespace at end of line
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2020-02-14 20:43:36 +01:00
0a70bbd255
Merge pull request #3120 from canihavesomecoffee/patch-1
...
Update Cameleon blacklist url to use https
2020-02-08 17:25:49 +00:00
c91d9cc0b6
Update Cameleon blacklist url to use https
...
Switches from http to https for the Cameleon (sysctl.org) blacklist.
Signed-off-by: canihavesomecoffee <canihavesomecoffee@users.noreply.github.com>
2020-02-08 17:06:03 +01:00
cfa909a93d
Add package php-intl for AdminLTE#1130.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2020-01-12 14:09:14 +01:00
e0fde41d87
Merge pull request #3066 from pi-hole/centos8_support
...
Update installer to support CentOS 8
2020-01-05 14:39:24 +00:00
ec8f4050d0
Update installer to support CentOS 8
...
PHP dependency php-json is now required for both the latest Fedora and CentOS.
Package php-json will now be a default web dependency and removed from PIHOLE_WEB_DEPS when installing on CentOS7.
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2020-01-02 06:52:23 -06:00
60c51886e0
remove unused debian deps (apt-utils debconf)
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2020-01-01 13:24:02 -06:00
cbb1461010
add stdout horizontal rule to install_dependent_packages()
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2020-01-01 13:23:31 -06:00
07cc5b501c
replace debconf-apt-progress with apt-get in install_dependent_packages()
...
Removes the need for conditional debconf-apt-progress dependency checking
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2020-01-01 13:11:41 -06:00
ebb1a730c1
remove unused fedora/centos dependency: dialog
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2020-01-01 13:11:41 -06:00
9dff55b212
Installer | Remove "dialog" from Debian/Ubuntu installer deps
...
+ The installer uses `whiptail`, thus `dialog` is not required.
Signed-off-by: MichaIng <micha@dietpi.com>
2020-01-01 13:11:41 -06:00
d1bce7e685
Merge pull request #2995 from pi-hole/tweak/NoFurtherThanLatestTag
...
Don't allow repo to go further than latest tag on master
2019-12-09 20:41:29 +00:00
7c2bbf840a
Merge pull request #2993 from MichaIng/patch-3
...
Minor installer output enhancements
2019-12-04 18:53:58 +00:00
85673b8273
Print name of chosen upstream DNS as well
...
Signed-off-by: MichaIng <micha@dietpi.com>
2019-12-04 18:59:25 +01:00
583ea4d17a
Merge branch 'development' into development
2019-11-27 21:17:05 +00:00
edcdf9f619
Merge pull request #3003 from pi-hole/fix/tbd
...
FTL always determined.
2019-11-27 09:46:17 +00:00
12817c09bb
(Squashed commits)
...
Always ensure we have the correct machine arch by storing to/reading from a file rather than depending on global variable that for some reason is not always populated...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
no need for global variable
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Use a file in the temporary FTL download directory
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Local binary variable named to l_binary. Disambiguate from global binary.
Allow 'binary' to be shadowed for testing.
Use ./ftlbinary in all operations.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Revert shadow ability on binary variable.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Remove unused tests, binary variable can not be overridden.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
This should work here, too
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
binary name is passed through from pihole checkout
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Add comments
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
OK, let's try it this way again
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
we might be getting somewhere.. squash after this I think!
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This is a test to see if it fixes the aarch64 test (we are definitely squashing these commits
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
fix the rest of the tests
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Remove trailing whitespace in the files we've touched here
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-15 19:49:09 +00:00
4840bdb031
add a double space to the beginning of some outputs
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-14 19:06:23 +00:00
a85e7a2a43
Merge pull request #2999 from pi-hole:fix/api_utf8_encoding
...
Add php-xml package as new dependency
2019-11-13 19:03:53 +00:00
61d233f069
Merge pull request #2964 from bcambl/selinux_enforcing
...
Exit installation when SELinux in unsupported state
2019-11-12 21:48:15 +01:00
d457d40e0b
Add php-xml package as new dependency.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-11-12 20:49:46 +01:00
6571a63ffa
Add --tags to descibe command
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-11 20:36:51 +00:00
a7e81c8ea0
remove extra space
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-11 20:12:31 +00:00
73d9abae3e
And finally, we please stickler
...
Signed-off-by: Adam Warner <adamw@rner.email>
2019-11-08 20:58:42 +00:00
c8b9e42649
Please Codefactor.
...
Signed-off-by: Adam Warner <adamw@rner.email>
2019-11-08 19:18:35 +00:00
62c00ae1d8
pushd/popd instead of juggling with a variable
...
Signed-off-by: Adam Warner <adamw@rner.email>
2019-11-08 19:11:55 +00:00
ea67c828cd
Minor installer output enhancements
...
+ Print restart hint after setting IPv4 address on a separate line with [i] prefix to not break text alignment
+ Print final upstream DNS choice as a single printf call and by this fix missing info and linebreak on "Custom" choices.
+ Minor if/then/else code alignment
Signed-off-by: MichaIng <micha@dietpi.com>
2019-11-07 13:59:44 +01:00
3fbb0ac8dd
Adding docker+arm detection & FTL download
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-10-29 22:26:46 -05:00
71903eb27f
Add in checks to reset cloned repo to the lastest available release
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-10-28 22:35:01 +00:00
612d408034
replace echo with printf in install_dependent_packages()
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2019-10-14 20:16:40 -06:00
a86f578139
replace echo with printf in checkSelinux()
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2019-10-14 20:06:23 -06:00
81ca78e7f4
exit installer if SELinux is enforcing
...
The Pi-hole project does not ship a custom SELinux policy as the required policy would lower the overall system security.
Users who require SELinux to be enforcing are encouraged to create an custom policy on a case-by-case basis.
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2019-10-14 12:25:24 -06:00
fc0899b2ad
fix fedora dependency check/install stdout
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2019-10-13 14:35:38 -06:00
149fb0c216
Do not install a blank regex file.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-29 18:03:37 +02:00
61a40c1b43
merge devel into 4.3.2 And Resolve merge conflicts
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-09-22 01:16:44 +01:00
f582344b9a
"No default index.lighttpd.html file found... not backing up" is not an error.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-17 21:59:48 +02:00
4cfe463dfa
Add back dropped binary call.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2019-08-24 04:57:23 -07:00
03c65dd0e9
Convert hardcoded /usr/local/bin to variable
...
Update pihole script with full path to 'pihole'
Variable for webpage.sh 'pihole' call.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2019-08-24 04:49:14 -07:00
1820c2c598
Merge branch 'development' into new/whitelist-regex-support
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-08-22 14:19:51 +02:00
febdbceab1
Fix error when getting latest FTL tag
...
The headers containing the latest FTL tag were not properly input to the
command (`<` vs `<<<`). This caused Bash to try and open the file named
after the header string, which does not exist.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-08-21 10:03:54 -04:00
34727c00c6
Drop indirection from install_dependent_packages
...
Previously, install_dependent_packages would receive an array variable
name as its single parameter, and would use variable indirection to
access it; this change simplifies that function so that it instead
receives the expanded array.
Signed-off-by: David Haguenauer <ml@kurokatta.org>
2019-08-21 04:41:45 -07:00
b107ae2ab9
Use the filtered IPv6 OpenDNS servers
...
The ones we were using previously were not filtered. See
https://support.opendns.com/hc/en-us/articles/227986667-Does-OpenDNS-Support-IPv6-
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-08-21 04:39:10 -07:00
d5d1a607ad
Fix PKG_REMOVE array usage
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-08-21 04:39:07 -07:00
2594164772
Use an array for PKG_REMOVE
...
Fixes shellcheck warning.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-08-21 04:39:05 -07:00
209555c42e
Fix uninstall causing 403 errors and not removing packages
...
The 403 lighttpd errors were caused by removing the lighttpd config
directory and not removing lighttpd itself. This caused a subsequent
Pi-hole reinstall to not have all of the required lighttpd config files.
The error while removing packages was caused by combining arguments into
a string instead of listing each argument.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-08-21 04:39:01 -07:00
da398c3d9c
Print an error message if the FTL release metadata download fails
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-08-21 04:38:51 -07:00
4e0ad52001
Fix ShellCheck issue by refactoring a bit
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-08-21 04:38:24 -07:00
c9829dd3e4
Fix pihole -up showing FTL update when network is down
...
Fixes #1877
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-08-21 04:38:04 -07:00
ab1ea5a366
This change fixes issue #145 "stty: standard input: Inappropriate ioctl for device ".It checks if a real terminal exist, if not it sets the screen size to a fixed value. This helps to avoid nasty and unnecessary logs when running "pihole -up" via e.g. cron.
...
Signed-off-by: B. Olausson <contactme@olausson.de>
2019-08-20 14:48:03 -07:00
10de7f649b
add chkconfig to INSTALLER_DEPS (CentOS/Fedora)
...
chkconfig is a dependency of spawn-fcgi which is a dependency of lighttpd which is installed via PIHOLE_WEB_DEPS in phase 2
adding chkconfig to INSTALLER_DEPS to ensure /etc/init.d is present during the installation prompts (phase 1)
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2019-08-20 11:42:09 -07:00
71d5b42726
Remove the ZeusTracker blocklist from the defaults
...
It is no longer served. Fixes #2843 .
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-08-20 11:05:06 -07:00
4371c9ba03
Ensure proper permissions are set for gravity.db after creation.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-08-05 21:20:07 +02:00
ecd6817aaf
This change fixes issue #145 "stty: standard input: Inappropriate ioctl for device ".It checks if a real terminal exist, if not it sets the screen size to a fixed value. This helps to avoid nasty and unnecessary logs when running "pihole -up" via e.g. cron.
...
Signed-off-by: B. Olausson <contactme@olausson.de>
2019-07-29 19:48:56 +01:00
3420439f31
Merge pull request #2820 from pi-hole/fix/ftl-update-no-network
...
Fix pihole -up showing FTL update when network is down
2019-07-20 14:55:48 -04:00
38ff343134
Print an error message if the FTL release metadata download fails
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-07-19 17:35:21 -07:00
c3ec2e68ad
Remove the ZeusTracker blocklist from the defaults
...
It is no longer served. Fixes #2843 .
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-07-12 20:03:36 -07:00
c156af020c
Use suggested array creation to fix linter error
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-07-10 19:52:17 -07:00
fa8751f9ad
Fix error when checking if IP address is valid
...
During install in `valid_ip`, we split up the IP address into octets to verify it is valid (each is <= 255).
This validation was broken in #2743 when a variable usage was quoted where it should have stayed unquoted:
```
./automated install/basic-install.sh: line 942: [[: 192.241.211.120: syntax error: invalid arithmetic operator (error token is ".241.211.120")
```
Due to this error, `127.0.0.1` would be used instead of the requested IP address. Also, this prevented the user from entering a custom DNS server as it would be marked as an invalid IP address.
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
2019-07-10 19:42:51 -07:00
ec850dc820
add chkconfig to INSTALLER_DEPS (CentOS/Fedora)
...
chkconfig is a dependency of spawn-fcgi which is a dependency of lighttpd which is installed via PIHOLE_WEB_DEPS in phase 2
adding chkconfig to INSTALLER_DEPS to ensure /etc/init.d is present during the installation prompts (phase 1)
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2019-07-06 10:58:19 -06:00
37e7cd5211
Fix ShellCheck issue by refactoring a bit
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-06-28 21:19:07 -07:00
91a2d052a7
Fix pihole -up showing FTL update when network is down
...
Fixes #1877
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-06-28 20:49:56 -07:00
974bba4a45
Fix PKG_REMOVE array usage
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-06-17 16:30:26 -07:00
951732fc1b
Use an array for PKG_REMOVE
...
Fixes shellcheck warning.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-06-17 16:28:55 -07:00
b6700924b2
Fix uninstall causing 403 errors and not removing packages
...
The 403 lighttpd errors were caused by removing the lighttpd config
directory and not removing lighttpd itself. This caused a subsequent
Pi-hole reinstall to not have all of the required lighttpd config files.
The error while removing packages was caused by combining arguments into
a string instead of listing each argument.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-06-17 16:13:31 -07:00
c8987e20c2
Use the filtered IPv6 OpenDNS servers
...
The ones we were using previously were not filtered. See
https://support.opendns.com/hc/en-us/articles/227986667-Does-OpenDNS-Support-IPv6-
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-06-12 19:13:29 -07:00
7de6bbca61
Merge branch 'development' into release/v4.3
2019-05-18 13:18:14 -07:00
be3a21ae07
Put quotes at ends of strings
...
Signed-off-by: David Haguenauer <ml@kurokatta.org>
2019-05-14 15:20:28 -04:00
69081a9175
Drop indirection from install_dependent_packages
...
Previously, install_dependent_packages would receive an array variable
name as its single parameter, and would use variable indirection to
access it; this change simplifies that function so that it instead
receives the expanded array.
Signed-off-by: David Haguenauer <ml@kurokatta.org>
2019-05-14 15:20:28 -04:00
ab2f8a0c09
Quote variables in basic-install.sh
...
This greatly reduces the number of warnings emitted by ShellCheck, and
in turn should make it more likely that errors are caught in the
future.
Signed-off-by: David Haguenauer <ml@kurokatta.org>
2019-05-14 15:20:28 -04:00
8e1bf6e3d4
Merge branch 'development' into new/gravitydb
...
# Conflicts:
# advanced/Scripts/list.sh
# gravity.sh
# pihole
2019-05-12 15:20:52 -07:00
efbd42f7b5
Moves creation of pihole user before FTL installation
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2019-05-12 11:27:25 +02:00
e076db5a4e
Changes ownership of macvendor.db to pihole
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2019-05-10 11:19:28 +02:00
2e6198077d
chmod 644 adlists.list
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2019-05-09 12:23:44 +02:00
95150a5d85
Clone twenty instead of only one commit when installing Pi-hole. This ensures that we clone at least one tagged commit in case we need to push changes to master.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-05-07 19:42:11 +02:00
4d23b3267f
Adds X to chmod for git operations
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2019-05-07 10:46:16 +02:00
e19adccd9c
Moves chmod for /var/www/html into INSTALL_WEB_SERVER block
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2019-05-05 22:34:13 +02:00
a25f331e83
Adds chmod 644 for /var/www and /var/www/html
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2019-05-05 09:20:49 +02:00
69c06ba6fe
Sets permissions for dnsmaq.conf
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2019-05-05 00:32:10 +02:00
2c3a27e9c7
Replaces cp chmod with install and add read permission to repository files after checkout and pull
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2019-05-03 12:27:56 +02:00
8a92fb24c4
Incorporates changes requested by @Mcat12
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2019-05-01 11:20:26 +02:00
5c575e73c7
Adds world readable attribute to files created by Pi-hole to circumvent #2724
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2019-04-30 22:41:12 +02:00
466fd79c66
Fix getting IP address in the presence of similar subnets
...
Change was suggested by @computergeek125 in #2387
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-04-27 12:39:45 -07:00
0efc46260f
Use both old and new strings for detecting whether this is a Pi-hole dnsmasq config file
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-04-26 16:16:30 +02:00
ee4dabeca6
Merge branch 'development' into new/gravitydb
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-04-24 19:12:19 +02:00
c13ebd3a9d
Replace Pi-hole ID string with another line we intend to keep
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-04-24 18:55:25 +02:00
037737d653
Show $UPDATE_PKG_CACHE content in error message.
...
Fixes the typo in update_package_cache(), where the error message
contained the color code twice, instead of the $UPDATE_PKG_CACHE text.
Signed-off-by: Jan Piskvor Martinec <github@piskvor.org>
2019-04-23 16:02:25 +02:00
78c0c58946
Add a link to the documentation on FTL privacy levels during install
...
Closes #2695
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-04-07 12:00:43 -07:00
817b19888f
Merge branch 'development' into fix/FTL_arch_detect_rpm
2019-03-23 08:55:46 +01:00
e9e92368b0
Fix uninstalling lighttpd when it's not installed
...
Signed-off-by: Andrei Picus <NiGhTTraX@users.noreply.github.com>
2019-03-15 15:05:58 +01:00
9867b7fccf
Don't fail when trying to detect OS architecture on RPM-based systems
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-22 18:41:01 +01:00
860ec1a7c4
basic_install: Use install for sudoers
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2019-02-10 08:45:03 +01:00
2f189cd076
basic_install: There is no pihole group, remove it
...
Only a user has been created beforehand. Only some distributions create
a group with the same name based on their configuration. We cannot
assume this is always the default.
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2019-02-08 08:06:12 +01:00
2f0e6a6dda
basic_install: Make sure the PI_HOLE_CONFIG_DIR exists
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2019-02-08 08:06:12 +01:00
f187b42a98
basic_install: Define webroot globally as a variable
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2019-02-08 08:06:02 +01:00
838e1b19ec
basic_install: Set permissons for PI_HOLE_DASHBOARD_DIR
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2019-02-06 10:41:37 +01:00
d5bbb2b640
basic_install: Use a varibale for the pihole dashboard dir
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2019-02-06 10:40:47 +01:00
dc91d4b1f9
basic_install: If a static interface is already set up we are done
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2019-02-06 07:50:21 +01:00
680d6e2d31
Merge branch 'release/v4.2' into development
...
# Conflicts:
# automated install/basic-install.sh
2019-02-03 11:14:09 -08:00
ae654730c4
Update automated install/basic-install.sh
...
Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>
2019-02-02 08:00:58 +01:00
ec79e86bee
We should really use stop_service as it also includes some nice output
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-01 18:06:57 +01:00
e8dabc71af
Don't try to start pihole-FTL after it has been installed. This will be done a few moments later when gravity is invoked.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-01 17:54:21 +01:00
9c0de0f731
Try to stop pihole-FTL before and (re)start pihole-FTL after the install command
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-02-01 17:39:12 +01:00
4948862dce
Fail hard if FTL binary could not be installed
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-01-31 20:10:52 +01:00
1e284f69ea
Merge pull request #2587 from pi-hole/new/network-table
...
Download macvendor database
2019-01-28 20:27:13 -05:00
516ed83638
Add "|| true" to the curl command as a failed download is no show-stopper for the overall install process.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-01-28 20:48:30 +01:00
cc657c0c26
Rename subroutine start_service() to restart_service() because this is what it does
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-01-24 09:37:03 +01:00
d90d7b6927
Call FTL download/installation early on in the installation process.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-01-24 09:36:27 +01:00
de6dc90575
Don't diable pihole-FTL before calling install. root should be able to overwrite the binary in any case. The binary has already been downloaded and hash-verified here so we don't expect any errors in this binary.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-01-24 09:32:33 +01:00
3cdd6204c5
Move dnsmasq disabling and config file rewriting into a dedicated subroutine
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-01-24 09:31:02 +01:00
d996e9c9ee
Fix inconsistent handling of binary variable. get_binary_variable() stores the result into a global variable we pass later on as argument to FTLinstall() and define a local variable with the same name. This is fixed by only using the globa variable in all places not. This is still not a very elegant solution but it is also not subject of the current PR.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-01-24 09:28:09 +01:00
ebba32e1c4
Remove Norton DNS
...
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
2019-01-19 20:45:19 -05:00
7d2507527a
Merge pull request #2593 from TheLastProject/feature/standardized-dns-list
...
Standardize DNS list and write to file for AdminLTE
2019-01-13 11:10:45 -08:00
97decb3a73
Standardize DNS list and write to file for AdminLTE
...
Signed-off-by: Sylvia van Os <sylvia@hackerchick.me>
2019-01-13 19:38:04 +01:00
f360959efc
Download macvendor database from ftl.pi-hole.net when downloading a new FTL binary. Users who want to update the database more frequently than on each FTL release can use the python script from the FTL repository to generate the database themselves. The macvendor database is an optional component so a failing download is no reason to interrupt the installer.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-01-09 19:26:19 +01:00
3035fbf468
remove unused dependency (bc)
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2019-01-04 17:17:42 -06:00
c5da1bb952
Add libcap as Fedora dependency
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-01-03 10:39:46 +01:00
486c41a69a
Add Debain dependency libcap2 needed for FTL's capability check on startup
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-01-03 10:39:10 +01:00
0ef4901e48
Add a blank after printf to avoid 'Command not found' error
...
> curl -L https://install.pi-hole.net | bash /dev/stdin --i_do_not_follow_recommendations
...
/dev/stdin: Zeile 2449: printf %b Skipping free disk space verification\n: Command not found.
Signed-off-by: Florian Freund <mail@floek.net>
2018-12-25 09:02:12 +01:00
eca975a370
add sqlite3 dependency for fedora
...
`sqlite3` is provided by the `sqlite` package on CentOS & Fedora
Signed-off-by: bcambl <blayne@blaynecampbell.com>
(cherry picked from commit 724afc000f
2018-12-19 10:20:47 -08:00
724afc000f
add sqlite3 dependency for fedora
...
`sqlite3` is provided by the `sqlite` package on CentOS & Fedora
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-12-17 21:03:54 -06:00
d24e0a6060
Merge pull request #2540 from pi-hole/release/v4.1
...
Update development with final v4.1 changes
2018-12-09 22:24:42 -05:00
14ebb2fb93
remove 'System' from NetworkManager connection name
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-12-01 12:08:48 -06:00
3261c2e273
Added check for universe repo on ubuntu bionic with user prompts.
...
Signed-off-by: Clayton Dobbs <clayton.dobbs@gmail.com>
2018-11-20 21:39:01 -07:00
c3804877ed
linting: Double quote to prevent globbing and word splitting.
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-11-11 14:48:16 -06:00
c0bc93c7c4
break dhcpcd and ifcfg network configurations into separate functions
...
- move some logic from setStaticIPv4 to setDHCPCD
- breakout ifcfg configuration into separate function which takes a config path as an argument
- setStaticIPv4 now checks for configs and calls the appropriate function accordingly
- add logic to check ifcfg file by _connection name_ if file is not found by _interface name_
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-11-09 15:20:51 -06:00
e1c3c53058
Merge branch 'release/v4.1' into fix/adlists.list_not_created
2018-11-08 20:29:07 +01:00
057fbfc2b9
Change field from digit to string for printf
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-11-08 11:10:09 -08:00
33156071cd
Fix literal "choice" being passed to appendToListsFile()
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-11-08 19:43:35 +01:00
e8c2e26358
Override shellcheck with explanations.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-11-03 13:39:43 -07:00
61c67849d7
Support multiple distributions and release versions in find_IPv4_information().
...
Add basic sanity check to function, remove unused variable.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-11-03 13:20:40 -07:00
2cdbb34763
Merge pull request #2488 from pi-hole/feature/command_function
...
Moved `command -v` calls to function in installer.
2018-11-02 22:16:44 -04:00
1789a2db29
Merge pull request #2384 from pi-hole/feature/install-privacy-level
...
Set FTL Privacy Level During Install
2018-11-01 15:16:11 -04:00
c270b83341
Use printf instead of echo
...
Co-Authored-By: Mcat12 <mark.drobnak@gmail.com>
2018-11-01 15:14:26 -04:00
02f0788033
Moved `command -v` calls to function.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-11-01 12:00:08 -07:00
9d2d45b473
Query php directly for major and minor version id strings.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-11-01 05:59:14 -07:00
0c892e6b3a
Addressed Stickler ShellCheck lints
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-10-31 14:35:55 -07:00
a0fc38d6a2
All terminal echo commands changed to printf.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-10-31 11:14:05 -07:00
e7e03e36de
fix pihole user creation function
...
- fix stdout newlines
- catch failed user creation
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-10-12 11:05:44 -06:00
cc2f375b13
fix for #2450
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-10-07 11:51:36 +01:00
a89615365e
Merge pull request #2410 from stuartskelton/norton_dns_EOL_2018_11_15
...
Remove Norton Connect Safe as its EOL 2018-11-15
2018-09-10 17:52:09 -04:00
3c36c22ca8
Remove Norton Connect Safe as its EOL 2018-11-15
...
Signed-off-by: Stuart Skelton <stuarts@broadbean.com>
2018-09-10 22:37:45 +01:00
6f276ae4bb
Merge pull request #2299 from nullr0ute/net-tools
...
Use ip route rather than old net-tools route in chronometer.sh
2018-09-09 15:11:19 -04:00
3cea1bd423
Fix lighttpd v1.4.50 crashing on startup
...
It has a bug/regression causing it to fail if external.conf does not exist,
so touch external.conf when installing lighttpd config
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
2018-09-07 12:09:37 -04:00
c58e3acc78
add unsupported RPM distro warnings
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-08-31 10:04:52 -06:00
6f8e8e98bb
update centos version check test
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-08-29 22:16:11 -06:00
24b4aabae9
allow installer to continue with additional rpm based distros
...
- FedBerry (Fedora based ARM image)
- Scientific Linux (CentOS based)
- Add prompt to continue installing on unsupported RPM based distros
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-08-29 20:49:06 -06:00
1813c25117
If config file was backed up: Print info message
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-21 13:07:23 +02:00
5d0d7336ff
Echo with newline when setting privacy level
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-08-20 20:21:03 -04:00
6a26a05dbf
Fix privacy level whiptail option format
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-08-20 19:40:43 -04:00
4aafa8cf47
Set the FTL privacy level during install
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-08-20 19:20:29 -04:00
28c6b1393f
Backup existing /etc/dnsmasq.conf if present and ensure that /etc/dnsmasq.conf contains only "conf-dir=/etc/dnsmasq.d"
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-20 22:52:22 +02:00
0d1b3cee4f
Enable FTL service before starting it
...
Signed-off-by: Realtebo <mirkotebaldi@yahoo.it>
2018-08-16 17:52:47 +02:00
476fecbcf5
Fixed typos as suggestes
...
Signed-off-by: Realtebo <mirkotebaldi@yahoo.it>
2018-08-14 15:04:42 +02:00
327b58fa03
Merge pull request #1 from pi-hole/development
...
Merge with current main development branch
2018-08-14 14:55:18 +02:00
d3eea9404d
Merge pull request #2331 from pi-hole/tweak/improve_FTL_download_errormsg
...
Improve error message when downloading FTL failed
2018-08-14 13:20:47 +02:00
d9195970b7
Create adlist file while running unattended setup
...
Signed-off-by: Realtebo <mirkotebaldi@yahoo.it>
2018-08-12 23:21:01 +02:00
ef8aaba014
Merge pull request #2320 from TronPaul/fix/no-tty
...
set noninteractive during unattended install
2018-08-08 19:28:12 -04:00
f5c3dc5d9d
Improve download error message that is shown when downloading or verifying the binary failed
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-08-07 16:51:58 +02:00
e01eea8ba8
Remove PowerPC from FTL binaries
...
It is no longer built, and may cause 404 errors if it attempts to
download the binary.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-08-06 21:15:16 -04:00
5b628a4c77
Merge branch 'development' into release/v4.0
2018-08-05 21:16:19 -07:00
0081a7ca92
set noninteractive during unattended install
...
Signed-off-by: Mark McGuire <mark.b.mcg@gmail.com>
2018-08-05 10:12:43 -05:00
993beab3b7
Changed wording.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-31 11:14:26 -07:00
06875f2cc9
Merge branch 'release/v4.0' into fix/parse_pihole-FTL.conf
2018-07-30 14:32:29 -07:00
448fc7231c
Installed to `/etc/pihole` as PI_HOLE_CONFIG_DIR variable.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-30 14:26:07 -07:00
d0d030bafc
Moved file creation to proper function. Included bash variables for file
...
location. Set to pihole:pihole ownership with 644 permissions.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-30 14:02:18 -07:00
833131e15f
Merge pull request #2315 from pi-hole/fix/regex-file-ownership
...
Allow PHP to edit the regex file if web is installed
2018-07-30 06:36:20 -07:00
fb2810557a
Allow web user group to access regex.list
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-29 16:09:03 -07:00
57af0ba0a4
Use `install` to make the regex file
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-07-29 18:26:00 -04:00
17c1e64f7e
Moved FTL configuration copy in to scripts copy function.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-29 09:06:51 -07:00
af13ceac24
Touch file as ${USER} instead of copying template.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-29 08:42:59 -07:00
a55cc55338
Only `touch` the regex file if it doesn't already exist
...
The other permission calls will always be run so that the file is in the
expected state after install and repair.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-07-28 23:07:35 -04:00
b2fb3fd35a
Merge pull request #2310 from pi-hole/feature/pihole-FTL.conf
...
Include template pihole-FTL.conf
2018-07-28 20:04:39 -07:00
1a8d5fb4a9
Allow PHP to edit the regex file if installed
...
Fixes permissions error on the web interface when modifying the regex.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-07-28 21:57:39 -04:00
c73b5456eb
Fix "which" error leaking
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-07-28 21:12:05 -04:00
3d87398721
Fix `check_service_active` leaking error output
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-07-28 20:50:04 -04:00
47b56d6123
Fix wrong git command flag
...
I could not find documentation on a `--head` flag, but there is a `--heads` flag which does the same thing.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-07-27 23:27:44 -04:00
512d2dd5f8
Source git repo and not /opt location.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-27 15:47:20 -07:00
ad20d5ac1c
Remove -t SOURCE and DIRECTORY reversal flag on install.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-27 15:39:37 -07:00
b79ff05e29
Move template files to own subdir. Include pihole-FTL.conf in templates.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-27 15:21:25 -07:00
32b50f8188
Change the word "folder" to "directory" since the pi-hole is intended to run on rpi with Linux on it.
...
Signed-off-by: Borats Nolan <borats@i.dont.use.email>
2018-07-28 02:35:39 +10:00
32cf94fc74
Merge pull request #2297 from pi-hole/bugfix/locales
...
Fixed locale issue, do not parse for string.
2018-07-26 16:44:52 -07:00
9b1356ad01
Revert #2282
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-07-27 00:27:06 +01:00
45521b377a
Use ip route rather than old net-tools route in chronometer.sh
...
The only use of net-tools is the use of route in chronometer.sh so
instead use the same method as used in piholeDebug.sh to get the
default gateway so there's no need to depend on net-tools anylonger.
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
2018-07-26 17:46:51 +01:00
46a366635c
Fixed locale issue, do not parse for string.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-26 05:30:05 -07:00
1877128fc4
Removes empty comment lines in basic-install.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-20 10:38:13 -07:00
9cd674b528
Merge pull request #2282 from RamSet/tweak/Port53
...
Updated port 53 check #2
2018-07-18 22:56:33 -04:00
5aea7eb860
corrected function indentation
...
Signed-off-by: RamSet <RamSet@gmail.com>
2018-07-17 20:46:18 -06:00
ec30df2020
Merge pull request #2277 from bcambl/centos_fedora_fixes
...
Installer fixes for Fedora & CentOS
2018-07-17 22:06:25 -04:00
bb33427c79
fixed parsing error
...
Signed-off-by: RamSet <RamSet@gmail.com>
2018-07-17 18:09:25 -06:00
28a16cebda
Addressed lint errors.
...
Signed-off-by: RamSet <RamSet@gmail.com>
2018-07-17 18:06:32 -06:00
49c79405bc
changed flag and variable name
...
Signed-off-by: RamSet <RamSet@gmail.com>
2018-07-17 18:04:50 -06:00
3098f32a07
Fixed intentation and corrected comments.
...
Signed-off-by: RamSet <RamSet@gmail.com>
2018-07-17 17:56:13 -06:00
69e06d89ff
Added missing for sourced file.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-16 22:36:58 -07:00
56b04017e7
Port 53 check updated with 4 spaces.
...
Signed-off-by: RamSet <RamSet@gmail.com>
2018-07-16 11:29:12 -06:00
fa9ecbdb81
add php-json to Fedora web deps
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-07-15 15:41:04 -06:00
2bf6b29b8f
trigger an install/upgrade of PHP after enabling the Remi repository
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-07-15 15:40:44 -06:00
9dba9fb366
Convert multiline echos to individual echo statements so they don't lead with different amounts of space.
...
Signed-off-by: Dan Schaper <dan.schaper@pihole.net>
2018-07-06 21:29:20 -07:00
a323b126e5
Finished space conversion
...
Signed-off-by: Dan Schaper <dan.schaper@pihole.net>
2018-07-05 23:47:55 -07:00
0651f1bcd4
Merge pull request #2220 from rrobgill/installedphpcheck
...
Bugfix - Check version of installed php
2018-06-08 23:31:40 -04:00
11f0ade921
comments
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-06-09 13:18:36 +10:00
6381bdbf33
don't use major.minor for PHP 5
...
Signed-off-by: <rrobgill@protonmail.com>
2018-06-09 11:35:30 +10:00
4a75566a3b
Merge remote-tracking branch 'origin/development' into tweak/32bitOS_on_64bitCPU
2018-06-08 20:20:57 -04:00
52aa52c3b1
remove duplicate declaration
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-06-07 08:19:26 +10:00
6689e00e6a
Merge pull request #2212 from rrobgill/man-pages
...
Man page for pilhole-FTL
2018-06-05 21:33:54 -04:00
a3569d88c9
Version strings & bash.
...
Fixed up the version checking. Thanks for your help @dschaper.
No longer uses the version string as returned, but uses the major and minor version numbers extracted from it, against the minimum of 5.5.
Tested against real install of php 7.0, (and the version check logic separately tested against a variety of artificial version numbers, of multiple digits for both major and minor version. - Lesson learned, I'm never trusting bash again)
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-06-05 21:42:42 +10:00
f2f6b6ede9
stickler complaints
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-06-05 09:29:03 +01:00
7f81cfd45a
Stats can still be generated without logging, no need for this sentence
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-06-05 09:09:35 +01:00
13b8e1a2ae
quotes.
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-06-05 15:09:07 +10:00
36dbdf955d
Update basic-install.sh
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-06-05 14:48:24 +10:00
714b6c98ef
codacy
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-06-05 14:45:01 +10:00
7181d7ae6a
Left that fi
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-06-05 14:30:18 +10:00
9422d57283
Check version of installed php
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-06-05 12:08:27 +10:00
feba4da0b8
Merge pull request #2161 from pi-hole/centos_remi-php7
...
CentOS install re-worked to provide PHP7 via Remi Repository
2018-06-03 10:54:32 -07:00
ed7ebfd58d
man page for pihole-FTL
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-06-03 22:15:26 +10:00
23fbb3cf22
Merge pull request #2205 from rrobgill/manual-page
...
Manual page
2018-06-02 21:11:21 -04:00
9970f3786f
Requested change
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-06-02 14:14:55 +10:00
ef65bac79b
change status from INFO to CROSS
...
Signed-Off-By: Rob Gill <rrobgill@protonmail.com>
2018-06-02 11:27:35 +10:00
c0837c726f
blank space
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-06-02 11:18:13 +10:00
ce5429aba7
stickler
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-06-02 11:02:06 +10:00
aa191e9202
Update basic-install.sh
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-06-02 10:46:07 +10:00
a8f0283e93
Update basic-install.sh
...
This hands checking of lighttpd's status over to the existing check_service_active() function.
All other checks of service status within the install script are handled by this function.
Use of existing function:
Avoids duplication of service detection logic.
Uses return code to determine status, thereby avoids parsing text to determine status, and reliance on English language locale to determine activity, (which may also be broken on some systems (# 2204)
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-06-02 10:11:11 +10:00
999e47a26c
Remove manual page
...
Tests for presence of pihole man page.
If it is present, deletes it and runs man-db to rebuild manual database.
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-06-02 09:50:52 +10:00
a8103ca22d
Manual page install function
...
Function to install man page.
Verifies that man pages are installed, and correct directory for the pihole manpage is present.
Copies file, and runs man-db to update man page database.
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-06-02 09:45:04 +10:00
1a30043776
Merge pull request #1768 from Al2Klimov/bugfix/install-invalid-user
...
basic-install.sh: fix "install: invalid user ''"
2018-06-01 19:27:51 -04:00
3be1904653
basic-install.sh: fix "install: invalid user ''"
...
refs #1767
2018-06-01 10:20:40 +02:00
cadd0e4244
move code back to correct location
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-06-01 14:03:13 +10:00
f35ea9a3ca
replace code i missed during merge
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-06-01 11:57:59 +10:00
0971630e01
Merge branch 'development' into uninstall-formatting
2018-06-01 07:17:02 +10:00
b60a9fa371
merge ( #2 )
...
* remove package_check to avoid situations like #1760
Signed-off-by: Adam Warner <adamw@rner.email>
* Prevent redundant entries in to adlists.list
Grep ${args[3]} and only add if grep -c -eq 0
Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>
* lan to local
Reduced differences.
Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>
* Require exact match
Updated to require an exact match to reduce false-positives, as suggested by DL6ER.
Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>
* fix empty ports on some systems
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
* debug user locale; improve function to parse variables and files
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
* Split declaration and population for stickler.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
* implement dschapers suggestions--better command, less subshells, and finer formatting
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
* flip uninstall compatability check
Signed-off-by: bcambl <blayne@blaynecampbell.com>
* Update index.php
Avoiding calling empty() on a function allows this to work under PHP5. Making the check for blocklist generation in this way instead is compatible with both PHP5 and PHP7.
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
* Update index.php
thanks stickler-ci .......
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
* changes as requested
changes as requested
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
* oh stickler bot...
accidentally a space
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
* linting: Double quote to prevent globbing and word splitting
Signed-off-by: bcambl <blayne@blaynecampbell.com>
* unbind resolved on ubuntu 18.04
Stop systemd-resolved from interfering with dnsmasq/ftl
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
* restore resolvd.conf
If dnsmasq is removed, resolved will need to be restored.
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
* Update uninstall.sh
Signed-off-by: Rob Gill <rrobgill@protonmail.com>>
* Minor correction for double instance of the word "found".
Signed-off-by: RamSet <RamSet@gmail.com>
* message text
Signed-off-by: Rob Gill <rrobgill@protonmail.com>>
* relocate as function
The check for systemd-resolved DNSStubListener, and disabling as necessary is a new function, called just prior to start_service pihole-FTL.
The check for ubuntu bionic 18.04 specifically is removed.
The check if resolved is enabled is made with check_service_active()
An additional check that the dnsstublistener is enabled is made.
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
* Regex & case fix
grep & sed regexes match commented or uncommented
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
* Update basic-install.sh
Force reloading of relsolved config where available
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
* reload resloved
reload resolved config if possible, restart otherwise
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
* user-facing messages
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
* move & clarify comments
2018-06-01 07:14:54 +10:00
8523c0da32
Merge pull request #2180 from rrobgill/resolved/ubuntu-bionic
...
Disable SystemD's DNS Stub Resolver On Install
2018-05-31 09:32:49 -04:00
f0dfa4d53d
Stickler-bot...
...
Signed-Off-By: Rob Gill <rrobgill@protonmail.com>
2018-05-31 13:43:49 +10:00
f2bedddce4
Changes from #2167 converted to spaces
...
Signed-Off-By: Rob Gill <rrobgill@protonmail.com>
2018-05-31 13:37:52 +10:00
552138e851
Appease stickler-bot.
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-05-31 13:24:09 +10:00
ff71379a8e
Convert from two to four space indetation
...
Signed-Off-By: Rob Gill <rrobgill@protonmail.com>
2018-05-31 13:14:18 +10:00
34f5db9ed4
Merge branch 'development' into uninstall_compat_check
...
# Conflicts:
# automated install/uninstall.sh
2018-05-30 22:08:20 -04:00
87506852d1
Merge pull request #1761 from pi-hole/tweak/Uninstall
...
Tweak/uninstall
2018-05-30 21:19:59 -04:00
e6893bc419
Update uninstall.sh
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-05-29 19:03:00 +10:00
ebeab06710
Appease Stickler-bot
...
So... originally no changes were made to the code, but Stickler-bot was unimpressed, so I've followed its suggestions.
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-05-29 18:59:55 +10:00
1911c3690d
Style/Tabs to spaces
...
uninstall.sh contains a mix of tabs and spaces for indentation in different parts of the file.
Everywhere that used tabs has been converted to spaces, compatible with the indentation style used in basic_install.sh
No code has been altered, only the use of tabs and spaces in indention.
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-05-29 17:59:39 +10:00
20ccb7b558
move & clarify comments
2018-05-21 08:16:53 +10:00
8cfe89604a
user-facing messages
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-05-17 07:44:07 +10:00
15f0ba839f
reload resloved
...
reload resolved config if possible, restart otherwise
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-05-16 07:35:22 +10:00
c400b914e5
Update basic-install.sh
...
Force reloading of relsolved config where available
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-05-16 07:28:32 +10:00
a431c829cb
Regex & case fix
...
grep & sed regexes match commented or uncommented
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-05-16 07:11:23 +10:00
25d0e125e5
relocate as function
...
The check for systemd-resolved DNSStubListener, and disabling as necessary is a new function, called just prior to start_service pihole-FTL.
The check for ubuntu bionic 18.04 specifically is removed.
The check if resolved is enabled is made with check_service_active()
An additional check that the dnsstublistener is enabled is made.
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-05-15 20:23:36 +10:00
b89a78ce17
message text
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>>
2018-05-15 19:42:18 +10:00
97809277df
Update uninstall.sh
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>>
2018-05-14 19:50:58 +10:00
3d3e7a330c
restore resolvd.conf
...
If dnsmasq is removed, resolved will need to be restored.
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-05-14 19:44:23 +10:00
adf2275018
unbind resolved on ubuntu 18.04
...
Stop systemd-resolved from interfering with dnsmasq/ftl
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-05-14 19:38:12 +10:00
c1ecfbfe63
linting: Double quote to prevent globbing and word splitting
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-05-12 19:39:17 -06:00
d3dda443cd
flip uninstall compatability check
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-05-04 00:02:47 -06:00
ec3802c180
add 'which' dependency (missing on Fedora minimal)
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-05-03 23:41:42 -06:00
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
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
8ad37af70e
CentOS install re-worked to include PHP7 via Remi repository
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-05-01 00:58:21 -06:00
a07891e3e6
0 is not 1!!
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-30 23:53:51 +01:00
e946a35b18
Move dnsmasq check into FTLcheckUpdate
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-30 23:50:35 +01:00
68d7337f98
switch up dnsmasq detection logic
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-30 23:42:41 +01:00
8b4198fd8d
Merge pull request #1835 from Fauxsys/development
...
Fix for unattended installations #1767 #1768 #1834
2018-04-30 23:06:46 +01:00
e17e69604c
Merge branch 'development' into new/RemoveDefaultBlocklists
2018-04-29 18:40:53 +01:00
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
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
3216d65353
Merge branch 'development' into new/RemoveDefaultBlocklists
2018-04-29 13:39:17 +01:00
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
8ead0b5483
@fourdee dropped this: `/`
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-23 11:59:39 +01:00
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
acfc49fd41
Merge branch 'development' into Install-Web-Server
2018-04-22 09:23:11 +01:00
60bcca54eb
Minor
...
+ indentation
2018-04-21 08:29:21 +01:00
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
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
c2c1dc7469
Ensuring bot pleasure
...
https://github.com/pi-hole/pi-hole/pull/2115#pullrequestreview-113066748
2018-04-18 04:38:07 +01:00
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
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
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
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
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
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
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
310d33b8ee
Merge dev > FTLDNS fix merge conflicts
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-13 17:01:54 +01:00
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
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
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
a8b493cb7d
Add support for public Cloudflare DNS servers.
...
Signed-off-by: Everett Southwick <everett@everettsouthwick.com>
2018-04-01 17:59:16 -05:00
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
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
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
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
d26ea2b948
remove trailing whitespace
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-18 00:38:34 +00:00
e2e8b733a8
tidy up function
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-18 00:13:10 +00:00
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
44d8cb77e3
Kill off `mask_service` function
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-17 22:48:11 +00:00
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
30af6e73be
added ;; to line 825
...
Misformated case. Updated correct case
2018-03-10 17:36:47 -06:00
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
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
7193f40b87
remove libnettle, missed a >/dev/null
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-07 22:23:05 +00:00
acd69fa4b0
silence push/popd
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-07 22:21:09 +00:00
6584933e92
fix stickler complaints
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-06 18:51:02 +00:00
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
cadab61a21
Merge branch 'development' into FTLDNS
2018-03-05 21:33:53 +00:00
3425b9a82e
Fix mktmp > mktemp
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-03-02 12:28:53 -08:00
fcdc85eab8
Remove dnsmasq from dependencies
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-25 23:47:11 +01:00
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
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
8b79017d0f
Always replace pihole-FTL.service
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-18 13:07:22 +01:00
5465ac9ba0
Merge pull request #1929 from pi-hole/fix/flushDB
...
pihole -f: Flush database
2018-02-17 17:45:15 +01:00
3472241289
Merge pull request #1962 from floek/master
...
Fixes https://github.com/pi-hole/pi-hole/issues/1772
2018-02-14 13:02:56 -05:00
a944b6ff79
Fixes https://github.com/pi-hole/pi-hole/issues/1772
2018-02-12 21:28:43 +01:00
c5a2ca5c98
Trivial spelling mistakes in basic-install.sh comments
...
Signed-off-by: Sebastian Pucilowski <smopucilowski@gmail.com>
2018-02-07 16:56:21 +11:00
2b6d9c34c9
Fixed a typo
...
Signed-off-by: Elias Ojala <ojala.s.elias@gmail.com>
2018-01-27 14:36:11 +02:00
158ea1d43b
Add sqlite3 dependency
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-21 11:54:49 +01:00
535b8458d4
Merge pull request #1901 from bcambl/epel_check
...
Fix epel-release install for CentOS
2018-01-20 14:03:24 -05:00
9543203610
Echo the right location for the log.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-01-20 08:45:41 -08:00
cacfe4d387
Linting changes
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-01-20 07:39:11 -08:00
a7f0137e5f
Use more secure installation log process.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-01-20 05:55:48 -08:00
b2eb364a4b
Update header
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-01-20 05:36:28 -08:00
bb3b1bc6ba
Move ascii berry to after root check, stops the double berry for the sudo refire.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-01-20 05:13:55 -08:00
cc47bf8f6c
Fix epel-release install for CentOS
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-01-07 22:21:04 -06:00
a154f1540f
Merge pull request #1778 from loganaden/development
...
Add secondary quad9 server
2017-12-30 18:19:55 +01:00
677033afca
Force update of "remote" part in th update checker (may take up to 24hrs for new installs otherwise)
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-28 18:41:22 +01:00
95e5baa967
Source setup vars before we attempt to do anything on an update/repair
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-24 13:09:45 +00:00
f89f7ecd3e
Randomize GitHub API update check time
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-21 12:42:47 +01:00
29ee8250e9
Change package install notification from CROSS to TICK.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-12-11 09:45:30 -08:00
863ea7294f
Merge pull request #1815 from pi-hole/release/3.2
...
Merge Release 3.2 in to development. GitFlow
2017-12-08 13:06:18 -08:00
f89d69b081
check NetworkManager status prior to using the cli ( #1653 )
...
Closes #1653
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2017-12-07 21:43:14 -06:00
79aada0b87
travis didn't like that
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 22:57:05 +00:00
69dc22c10f
fix some codacy and intelliJ idea complaints
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 22:31:12 +00:00
dd6a9a0b84
supress output of `which command` on centos/fedora as per https://github.com/pi-hole/pi-hole/pull/1776#discussion_r155156819
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 15:28:58 +00:00
945dcc6c2b
Indent two spaces as per https://github.com/pi-hole/pi-hole/pull/1776#discussion_r155157116
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 15:17:31 +00:00
f60791ac7c
Add dependencies as per https://github.com/pi-hole/pi-hole/pull/1776#discussion_r155149349
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 14:42:01 +00:00
b64155a165
Add in an extra check to enable lighttpd.
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 14:32:39 +00:00
9c8526db49
Add secondary quad9 server
2017-11-20 22:05:41 +04:00
616962200a
Update the list size to show all the options
2017-11-17 18:18:13 +13:00
eb9c44a347
Add support for Quad9 secure dns server
...
See www.quad9.net
2017-11-17 15:54:04 +13:00
f63267a7f9
Merge pull request #1757 from Mausy5043/development
...
Various small fixes
2017-11-11 16:45:16 -06:00
2c8dcd86e5
remove package_check to avoid situations like #1760
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-11-09 20:47:15 +00:00
9631519eb1
Merge pull request #1752 from pi-hole/new/bashupdatechecker
...
Add bash / cron based update checker for Pi-hole
2017-11-08 20:38:40 -06:00
35dc4800e0
basic-install.sh - no CIDR in ifcfg-*
...
Do not expect CIDR format IP addresses in /etc/sysconfig/network-scripts/ifcfg-* files as it is not a requirement.
Expect only:
IPADDR=10.10.10.10
Do not expect:
IPADDR=10.10.10.10/24
2017-11-05 15:28:44 -05:00
ec4e4d3b72
fix indentation
2017-11-05 11:02:04 +01:00
63312ac4b8
removed duplicate word
2017-11-05 10:18:39 +01:00
d158a7d51e
spelling corrected
2017-11-05 10:16:56 +01:00
209a2ab3ec
grammar corrected (double negative)
2017-11-05 10:05:25 +01:00
06764d0f36
Randomize gravity update time between 03:01 - 04:58 (excluding 04:00)
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-29 15:37:39 +01:00
7362416afb
Force an update of the updatechecker after update/install
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-28 15:40:48 +02:00
c34c3eb016
Shift randomized time interval from 00:00-01:59 to 02:00-03:59
2017-10-21 15:58:37 +02:00
85d159bdd1
Randomize gravity update time
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-21 15:52:53 +02:00
a9ad8d67aa
Remove superseded index.js
...
Signed off by WaLLy3K <wally3k@pi-hole.net>
2017-10-04 01:13:02 +11:00
7884423e05
Merge pull request #1719 from 19wolf/patch-1
...
Update basic-install.sh
2017-10-01 12:51:20 -04:00
1615fa63e3
Update basic-install.sh
...
Fixed comment line 40
2017-09-30 16:34:38 -04:00
feb2150d9b
Fix `LIGHTTPD_ENABLED` dupes in `setupVars.conf`
...
* Fix issue merged [here](fdf2649f2f (diff-689793e68cde6270d074695b71c969afL1488)
2017-09-22 19:14:11 +10:00
a0bd517380
Merge pull request #1694 from pi-hole/fix/qf-opt
...
Slow query fix & queryFunc optimisation
2017-09-21 20:05:42 +01:00
4316b15ae2
Merge pull request #1700 from pi-hole/fix/start-ftl
...
Start and enable FTL prior to running Gravity
2017-09-21 20:00:08 +01:00
a643f40cce
Merge pull request #1663 from pi-hole/new/UninstallCleanup
...
Cleanup uninstall script
2017-09-21 19:56:12 +01:00
909bc92c01
Tweak wording to fit on 80 character screen
...
* Also move colour after $INFO
2017-09-21 00:22:47 +10:00
911596daf8
Start and enable FTL prior to running Gravity
2017-09-20 17:29:11 +10:00
d56beedd7a
Add idn2 dependency
2017-09-18 00:41:53 +10:00
5f4be0de35
adjust lighttpd config depending on whether or not custom.php exists
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-09-09 19:30:53 +01:00
6c605f55f9
always overwrite default blockpage, so that changes can be rolled out
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-09-09 19:07:48 +01:00
774c6e8ac0
Merge branch 'development' into new/UninstallCleanup
...
Signed-off-by: Adam Warner <adamw@rner.email>
# Conflicts:
# automated install/uninstall.sh
2017-09-09 18:56:17 +01:00
c65c26b463
Merge branch 'development' into new/UninstallCleanup
2017-08-31 15:36:47 +01:00
6b6d105c2f
Merge branch 'development' into sqlite-dependency
2017-08-28 10:17:33 +01:00
939c99cdbf
accidentally an entire group of letters.
2017-08-23 11:48:11 +01:00
2f36acae49
Remove errornous space
2017-08-23 11:51:16 +10:00
e938132c53
accidentally a space
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-08-17 21:02:10 +01:00
1b34286264
verbiage
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-08-17 20:33:53 +01:00
54f4f6d2d7
Add "${INSTALLER_DEPS[@]}" to package array
...
add `-f` to rm commands so that `set -e` is not kicked
Signed-off-by: Adam Warner <adamw@rner.email>
2017-08-17 20:23:07 +01:00
MichaIng
Adam Warner
DL6ER
Dan Schaper
pvogt09
Mohammed Swillam
DL6ER
Antoine Tenart
XhmikosR
msamendinger
Willem
bcambl
Adam Warner
Adam Hill
Dan Schaper
Mcat12
David Haguenauer
B. Olausson
Mark Drobnak
Jan Piskvor Martinec
Andrei Picus
Andreas Schneider
Sylvia van Os
Florian Freund
Clayton Dobbs
Stuart Skelton
Realtebo
Mirko Tebaldi
Mark McGuire
Borats Nolan
Peter Robinson
RamSet
Dan Schaper
Rob Gill
Alexander A. Klimov
Adam Warner
Fauxsys
Dan
Daniel (Fourdee)
Michele Bologna
Everett Southwick
justinamcafee
Florian Freund
Sebastian Pucilowski
Elias Ojala
Dan Schaper
Loganaden Velvindron
Terror
Jacob Salmela
mettacrawler
Mausy5043
WaLLy3K
Eric Wolf