5c4ee23795
Fix missed start_service -> restart_service call
...
start_service was changed to restart_service.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-02-02 10:19:44 -08:00
fb3d871553
Merge pull request #2602 from pi-hole/fix/download_FTL_earlier
...
Download FTL earlier in the installer
2019-02-02 06:43:16 -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
7479485d45
Add test for the case the binary variable is unset (defaults to "tbd" in this case)
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-01-31 20:00:26 +01:00
26361883b4
Merge pull request #2601 from pi-hole/fix/double_disable_kills_gravity
...
Prevent double disabling/enabling
2019-01-27 13:54:33 -05:00
d26f2dcb2c
Use global binary variable in tests for automated install
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-01-24 09:47:28 +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
a4ba8d4b8f
Prevent double disabling/enabling by checking BLOCKING_ENABLED value in setupVars.conf
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-01-24 09:16:24 +01:00
465589c0fd
Merge pull request #2575 from LudovicRousseau/fix2
...
Do not ask admin password just for help documentation
2019-01-07 00:07:53 -05:00
9fcf7a2610
Merge pull request #2581 from bcambl/remove_bc_dep
...
remove unused dependency (bc)
2019-01-04 19:01:31 -05:00
3035fbf468
remove unused dependency (bc)
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2019-01-04 17:17:42 -06:00
c4c354bc4b
Merge pull request #2578 from pi-hole/new/libcap-dev
...
Add libcap as dependency
2019-01-03 16:08:45 +01: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
87800a3659
Merge pull request #2570 from pi-hole/tweak/wpad
...
Add wpad vulnerability fix as suggested by dnsmasq.conf.example
2019-01-03 00:10:31 +01:00
d5fbe1b629
Do not ask admin password just for help documentation
...
It is not a good idea to ask for an admin password just to get the
command documentation.
"pihole -h" should return the arguments documentation with no need to
enter a password.
Without the patch I get:
$ ./pihole -h
Password:
It is easy to reproduce by invalidating the sudo password using
"sudo -k" before running pihole again.
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
2019-01-02 23:54:30 +01:00
a3cee67a61
Merge pull request #2571 from pi-hole/tweak/debug/shm
...
List content of /var/run/shm in debugger
2019-01-02 15:12:54 -05:00
5ffc8c7443
List content of /var/run/shm in debugger
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-01-01 17:56:02 +01:00
04fd296ffe
Add wpad vulnerability fix as suggested by dnsmasq.conf.example
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-01-01 17:13:43 +01:00
262d5eea22
Merge pull request #2547 from pi-hole/fix/version-command-no-web
...
Don't show web version in pihole -v output if not installed
2018-12-27 23:20:16 -05:00
ed5869646f
Use source instead of dot for setupVars
...
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
2018-12-27 16:37:10 -05:00
b984fc4e0e
Merge pull request #2564 from floek/development
...
Add a blank after printf to avoid 'Command not found' error
2018-12-25 00:12:50 -08: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
8d85d46c1a
Merge pull request #2556 from pi-hole/release/v4.1.1
...
Release v.4.1.1
2018-12-21 09:06:19 -08: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
3bb94d469d
Merge pull request #2554 from bcambl/add_sqlite_dep
...
add sqlite3 dependency for fedora (#2552 )
2018-12-18 12:03:26 -05: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
be2d494fcf
Don't show web version in pihole -v output if not installed
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-12-12 14:55:09 -05:00
a36734db66
Merge pull request #2543 from pi-hole/fix/privacy-level-4
...
Add privacy level 4 to all privacy level code
2018-12-10 11:48:25 -05:00
1cad069050
Add privacy level 4 to all privacy level code
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-12-10 10:18:25 -05: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
f65f793a0d
Merge pull request #2496 from pi-hole/release/v4.1
...
Release v4.1
2018-12-09 14:33:58 -06:00
f7ad489805
Merge pull request #2504 from bcambl/ifcfg_con_name
...
configure ifcfg network files by connection name when required
2018-12-08 10:44:45 -08:00
62459c4f00
Merge pull request #2532 from pi-hole/update/agent-string-12-2018
...
Update user agent string
2018-12-06 10:17:49 -08:00
05bd88b4d8
Update agent string: the selected string is the most abundant one on 06 Dec 2018 with a percentage of almost 10%
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-12-06 18:04:17 +01:00
0546fff1ce
Merge pull request #2531 from pi-hole/fix/duplicate_dont_destroy
...
Don't `mv` `preEventHorizon`, copy it.
2018-12-06 08:40:02 -08:00
83f7bd66e6
Don't `mv` `preEventHorizon`, copy it.
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-12-05 22:29:01 +00:00
14ebb2fb93
remove 'System' from NetworkManager connection name
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-12-01 12:08:48 -06:00
916b2920be
Merge pull request #2525 from pi-hole/release/v4.1
...
Release/v4.1 to Development
2018-11-29 08:46:05 -08:00
a20963889c
Merge pull request #2512 from kefnab/development
...
Added check for universe repo on ubuntu bionic.
2018-11-27 03:35:28 -08:00
4b77475807
Merge pull request #2520 from pi-hole/new/rfc4039
...
Backend changes for DHCPv4 rapid commit support
2018-11-27 03:34:54 -08:00
9f672593bc
Update advanced/Scripts/webpage.sh
...
Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>
2018-11-26 20:01:41 +01:00
Mcat12
Dan Schaper
Adam Warner
DL6ER
Mark Drobnak
bcambl
DL6ER
Ludovic Rousseau
Florian Freund
Jacob Salmela