Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 10:43:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
4008 commits 8 branches 109 tags 27 MiB
Commit graph

1067 commits

Author SHA1 Message Date
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