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
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
