arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 23:08:07 +00:00
Code Issues Releases Wiki Activity
4,659 Commits 10 Branches 109 Tags 20 MiB
a2625df5e2
Commit Graph

1227 Commits

Author SHA1 Message Date
David Haguenauer
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
Mcat12
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
Mcat12
d5d1a607ad
Fix PKG_REMOVE array usage 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-08-21 04:39:07 -07:00
Mcat12
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
Mcat12
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
Mcat12
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
Mcat12
4e0ad52001
Fix ShellCheck issue by refactoring a bit 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-08-21 04:38:24 -07:00
Mcat12
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
B. Olausson
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
bcambl
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
Mcat12
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
DL6ER
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
B. Olausson
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
Mark Drobnak
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
Mcat12
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
Mcat12
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
Mcat12
c156af020c
Use suggested array creation to fix linter error 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-07-10 19:52:17 -07:00
Mark Drobnak
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
bcambl
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
Mcat12
37e7cd5211
Fix ShellCheck issue by refactoring a bit 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-06-28 21:19:07 -07:00
Mcat12
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
Mcat12
974bba4a45
Fix PKG_REMOVE array usage 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-06-17 16:30:26 -07:00
Mcat12
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
Mcat12
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
Mcat12
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
Dan Schaper
7de6bbca61
Merge branch 'development' into release/v4.3 2019-05-18 13:18:14 -07:00
David Haguenauer
be3a21ae07 Put quotes at ends of strings 
Signed-off-by: David Haguenauer <ml@kurokatta.org>
 2019-05-14 15:20:28 -04:00
David Haguenauer
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
David Haguenauer
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
Mcat12
8e1bf6e3d4
Merge branch 'development' into new/gravitydb 
# Conflicts:
#	advanced/Scripts/list.sh
#	gravity.sh
#	pihole
 2019-05-12 15:20:52 -07:00
pvogt09
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
pvogt09
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
pvogt09
2e6198077d chmod 644 adlists.list 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2019-05-09 12:23:44 +02:00
DL6ER
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
pvogt09
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
pvogt09
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
pvogt09
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
pvogt09
69c06ba6fe Sets permissions for dnsmaq.conf 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2019-05-05 00:32:10 +02:00
pvogt09
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
pvogt09
8a92fb24c4 Incorporates changes requested by @Mcat12 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
 2019-05-01 11:20:26 +02:00
pvogt09
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
Mcat12
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
DL6ER
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
DL6ER
ee4dabeca6
Merge branch 'development' into new/gravitydb 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-24 19:12:19 +02:00
DL6ER
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
Jan Piskvor Martinec
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
Mcat12
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
DL6ER
817b19888f
Merge branch 'development' into fix/FTL_arch_detect_rpm 2019-03-23 08:55:46 +01:00
Andrei Picus
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
DL6ER
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
Andreas Schneider
860ec1a7c4 basic_install: Use install for sudoers 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
 2019-02-10 08:45:03 +01:00
Andreas Schneider
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
Andreas Schneider
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
Andreas Schneider
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
Andreas Schneider
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
Andreas Schneider
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
Andreas Schneider
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
Mcat12
680d6e2d31
Merge branch 'release/v4.2' into development 
# Conflicts:
#	automated install/basic-install.sh
 2019-02-03 11:14:09 -08:00
Adam Warner
ae654730c4
Update automated install/basic-install.sh 
Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>
 2019-02-02 08:00:58 +01:00
DL6ER
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
DL6ER
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
DL6ER
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
DL6ER
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
Mark Drobnak
1e284f69ea
Merge pull request #2587 from pi-hole/new/network-table 
Download macvendor database
 2019-01-28 20:27:13 -05:00
DL6ER
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
DL6ER
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
DL6ER
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
DL6ER
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
DL6ER
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
DL6ER
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
Mark Drobnak
ebba32e1c4
Remove Norton DNS 
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
 2019-01-19 20:45:19 -05:00
Mark Drobnak
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
Sylvia van Os
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
DL6ER
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
bcambl
3035fbf468 remove unused dependency (bc) 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2019-01-04 17:17:42 -06:00
DL6ER
c5da1bb952
Add libcap as Fedora dependency 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-01-03 10:39:46 +01:00
DL6ER
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
Florian Freund
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
bcambl
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
bcambl
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
Mark Drobnak
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
bcambl
14ebb2fb93 remove 'System' from NetworkManager connection name 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-12-01 12:08:48 -06:00
Clayton Dobbs
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
bcambl
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
bcambl
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
DL6ER
e1c3c53058
Merge branch 'release/v4.1' into fix/adlists.list_not_created 2018-11-08 20:29:07 +01:00
Dan Schaper
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
DL6ER
33156071cd
Fix literal "choice" being passed to appendToListsFile() 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-11-08 19:43:35 +01:00
Dan Schaper
e8c2e26358
Override shellcheck with explanations. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-11-03 13:39:43 -07:00
Dan Schaper
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
Mark Drobnak
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
Mark Drobnak
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
Dan Schaper
c270b83341
Use printf instead of echo 
Co-Authored-By: Mcat12 <mark.drobnak@gmail.com>
 2018-11-01 15:14:26 -04:00
Dan Schaper
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
Dan Schaper
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
Dan Schaper
0c892e6b3a
Addressed Stickler ShellCheck lints 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-10-31 14:35:55 -07:00
Dan Schaper
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
bcambl
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
Adam Warner
cc2f375b13
fix for #2450 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-10-07 11:51:36 +01:00
Mark Drobnak
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
Stuart Skelton
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
Mark Drobnak
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
Mark Drobnak
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
bcambl
c58e3acc78 add unsupported RPM distro warnings 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-08-31 10:04:52 -06:00
bcambl
6f8e8e98bb update centos version check test 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-08-29 22:16:11 -06:00
bcambl
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
DL6ER
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
Mcat12
5d0d7336ff
Echo with newline when setting privacy level 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-08-20 20:21:03 -04:00
Mcat12
6a26a05dbf
Fix privacy level whiptail option format 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-08-20 19:40:43 -04:00
Mcat12
4aafa8cf47
Set the FTL privacy level during install 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-08-20 19:20:29 -04:00
DL6ER
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
Realtebo
0d1b3cee4f Enable FTL service before starting it 
Signed-off-by: Realtebo <mirkotebaldi@yahoo.it>
 2018-08-16 17:52:47 +02:00
Mirko Tebaldi
476fecbcf5 Fixed typos as suggestes 
Signed-off-by: Realtebo <mirkotebaldi@yahoo.it>
 2018-08-14 15:04:42 +02:00
Mirko Tebaldi
327b58fa03
Merge pull request #1 from pi-hole/development 
Merge with current main development branch
 2018-08-14 14:55:18 +02:00
DL6ER
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
Realtbo
d9195970b7 Create adlist file while running unattended setup 
Signed-off-by: Realtebo <mirkotebaldi@yahoo.it>
 2018-08-12 23:21:01 +02:00
Mark Drobnak
ef8aaba014
Merge pull request #2320 from TronPaul/fix/no-tty 
set noninteractive during unattended install
 2018-08-08 19:28:12 -04:00
DL6ER
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
Mcat12
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
Dan Schaper
5b628a4c77
Merge branch 'development' into release/v4.0 2018-08-05 21:16:19 -07:00
Mark McGuire
0081a7ca92 set noninteractive during unattended install 
Signed-off-by: Mark McGuire <mark.b.mcg@gmail.com>
 2018-08-05 10:12:43 -05:00
Dan Schaper
993beab3b7
Changed wording. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-31 11:14:26 -07:00
Dan Schaper
06875f2cc9
Merge branch 'release/v4.0' into fix/parse_pihole-FTL.conf 2018-07-30 14:32:29 -07:00
Dan Schaper
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
Dan Schaper
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
Dan Schaper
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
Dan Schaper
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
Mcat12
57af0ba0a4
Use install to make the regex file 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-29 18:26:00 -04:00
Dan Schaper
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
Dan Schaper
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
Mcat12
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
Dan Schaper
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
Mcat12
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
Mcat12
c73b5456eb
Fix "which" error leaking 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-28 21:12:05 -04:00
Mcat12
3d87398721
Fix check_service_active leaking error output 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-07-28 20:50:04 -04:00
Mark Drobnak
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
Dan Schaper
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
Dan Schaper
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
Dan Schaper
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
Borats Nolan
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
Dan Schaper
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
Adam Warner
9b1356ad01
Revert #2282 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-07-27 00:27:06 +01:00
Peter Robinson
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
Dan Schaper
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
Dan Schaper
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
Mark Drobnak
9cd674b528
Merge pull request #2282 from RamSet/tweak/Port53 
Updated port 53 check #2
 2018-07-18 22:56:33 -04:00
RamSet
5aea7eb860 corrected function indentation 
Signed-off-by: RamSet <RamSet@gmail.com>
 2018-07-17 20:46:18 -06:00
Mark Drobnak
ec30df2020
Merge pull request #2277 from bcambl/centos_fedora_fixes 
Installer fixes for Fedora & CentOS
 2018-07-17 22:06:25 -04:00
RamSet
bb33427c79 fixed parsing error 
Signed-off-by: RamSet <RamSet@gmail.com>
 2018-07-17 18:09:25 -06:00
RamSet
28a16cebda Addressed lint errors. 
Signed-off-by: RamSet <RamSet@gmail.com>
 2018-07-17 18:06:32 -06:00
RamSet
49c79405bc changed flag and variable name 
Signed-off-by: RamSet <RamSet@gmail.com>
 2018-07-17 18:04:50 -06:00
RamSet
3098f32a07 Fixed intentation and corrected comments. 
Signed-off-by: RamSet <RamSet@gmail.com>
 2018-07-17 17:56:13 -06:00
Dan Schaper
69e06d89ff
Added missing for sourced file. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-16 22:36:58 -07:00
RamSet
56b04017e7 Port 53 check updated with 4 spaces. 
Signed-off-by: RamSet <RamSet@gmail.com>
 2018-07-16 11:29:12 -06:00
bcambl
fa9ecbdb81 add php-json to Fedora web deps 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-07-15 15:41:04 -06:00
bcambl
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
Dan Schaper
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
Dan Schaper
a323b126e5
Finished space conversion 
Signed-off-by: Dan Schaper <dan.schaper@pihole.net>
 2018-07-05 23:47:55 -07:00
Mark Drobnak
0651f1bcd4
Merge pull request #2220 from rrobgill/installedphpcheck 
Bugfix - Check version of installed php
 2018-06-08 23:31:40 -04:00
Rob Gill
11f0ade921
comments 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-09 13:18:36 +10:00
Rob Gill
6381bdbf33
don't use major.minor for PHP 5 
Signed-off-by: <rrobgill@protonmail.com>
 2018-06-09 11:35:30 +10:00
Mcat12
4a75566a3b
Merge remote-tracking branch 'origin/development' into tweak/32bitOS_on_64bitCPU 2018-06-08 20:20:57 -04:00
Rob Gill
52aa52c3b1
remove duplicate declaration 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-07 08:19:26 +10:00
Mark Drobnak
6689e00e6a
Merge pull request #2212 from rrobgill/man-pages 
Man page for pilhole-FTL
 2018-06-05 21:33:54 -04:00
Rob Gill
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
Adam Warner
f2f6b6ede9
stickler complaints 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-06-05 09:29:03 +01:00
Adam Warner
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
Rob Gill
13b8e1a2ae
quotes. 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-05 15:09:07 +10:00
Rob Gill
36dbdf955d
Update basic-install.sh 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-05 14:48:24 +10:00
Rob Gill
714b6c98ef
codacy 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-05 14:45:01 +10:00
Rob Gill
7181d7ae6a
Left that fi 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-05 14:30:18 +10:00
Rob Gill
9422d57283
Check version of installed php 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-05 12:08:27 +10:00
Dan Schaper
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
Rob Gill
ed7ebfd58d man page for pihole-FTL 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-03 22:15:26 +10:00
Mark Drobnak
23fbb3cf22
Merge pull request #2205 from rrobgill/manual-page 
Manual page
 2018-06-02 21:11:21 -04:00
Rob Gill
9970f3786f
Requested change 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-02 14:14:55 +10:00
Rob Gill
ef65bac79b
change status from INFO to CROSS 
Signed-Off-By: Rob Gill <rrobgill@protonmail.com>
 2018-06-02 11:27:35 +10:00
Rob Gill
c0837c726f
blank space 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-02 11:18:13 +10:00
Rob Gill
ce5429aba7
stickler 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-02 11:02:06 +10:00
Rob Gill
aa191e9202
Update basic-install.sh 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-02 10:46:07 +10:00
Rob Gill
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
Rob Gill
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
Rob Gill
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
Mark Drobnak
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
Alexander A. Klimov
3be1904653 basic-install.sh: fix "install: invalid user ''" 
refs #1767
 2018-06-01 10:20:40 +02:00
Rob Gill
cadd0e4244
move code back to correct location 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-01 14:03:13 +10:00
Rob Gill
f35ea9a3ca
replace code i missed during merge 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-01 11:57:59 +10:00
Rob Gill
0971630e01
Merge branch 'development' into uninstall-formatting 2018-06-01 07:17:02 +10:00
Rob Gill
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
Mark Drobnak
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
Rob Gill
f0dfa4d53d
Stickler-bot... 
Signed-Off-By: Rob Gill <rrobgill@protonmail.com>
 2018-05-31 13:43:49 +10:00
Rob Gill
f2bedddce4
Changes from #2167 converted to spaces 
Signed-Off-By: Rob Gill <rrobgill@protonmail.com>
 2018-05-31 13:37:52 +10:00
Rob Gill
552138e851
Appease stickler-bot. 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-05-31 13:24:09 +10:00
Rob Gill
ff71379a8e
Convert from two to four space indetation 
Signed-Off-By: Rob Gill <rrobgill@protonmail.com>
 2018-05-31 13:14:18 +10:00
Mcat12
34f5db9ed4
Merge branch 'development' into uninstall_compat_check 
# Conflicts:
#	automated install/uninstall.sh
 2018-05-30 22:08:20 -04:00
Mark Drobnak
87506852d1
Merge pull request #1761 from pi-hole/tweak/Uninstall 
Tweak/uninstall
 2018-05-30 21:19:59 -04:00
Rob Gill
e6893bc419
Update uninstall.sh 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-05-29 19:03:00 +10:00
Rob Gill
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
Rob Gill
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
Rob Gill
20ccb7b558
move & clarify comments 2018-05-21 08:16:53 +10:00