623ce1fe18
Tabs and debug.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2020-08-14 14:37:58 -07:00
57e65dd5c0
Use fewer subshells and descriptive variables.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2020-08-14 11:42:54 -07:00
bb1a6243d6
Merge pull request #3669 from pi-hole/release/v5.1.2
...
Release/v5.1.2 to development
2020-08-14 16:28:53 +01:00
5c72ff75d9
Revert "fix #3336 by creating adlist file even if no list was selected by user"
...
This reverts commit 3c6ea2612dckoenig@posteo.de >
2020-08-10 23:52:53 +02:00
b5983a3fc1
Do not require first element to be a hex value at any costs. It may also be a : in the valid address ::1
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-08-04 22:11:32 +02:00
319b8eef75
Merge pull request #3527 from MichaIng/patch-1
...
Add default locations to PATH to assure that all basic commands are available
2020-07-31 18:14:45 +02:00
48820d181c
Merge pull request #3620 from yubiuser/tweak/dig_supportedOS
...
Report and exit if dig supportedOS returns nothing
2020-07-30 17:00:01 +01:00
51daeaa6ab
basic-install: document how to continue after SELinux check
...
Signed-off-by: Christian Göttsche <cgzones@googlemail.com >
2020-07-30 14:50:42 +02:00
6fc7dc28a2
Count elements of array instead
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2020-07-28 10:25:57 +02:00
b207ceeab2
Report and exit if dig supportedOS returns nothing
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2020-07-28 09:51:31 +02:00
8380112129
Resolve conflicts
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2020-07-28 09:40:45 +02:00
0ff32c3629
Use ns1.pi-hole.net to resolve versions.pi-hole.net so that we do not see DNS cookie issues
...
Co-Authored-by: Dan Schaper <dan.schaper@pi-hole.net >
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-07-27 17:44:22 +01:00
0a81d687e8
Update automated install/basic-install.sh
2020-07-26 12:31:11 -07:00
dfcdfd4b0a
Remove empty line
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2020-07-26 12:27:55 +02:00
ec9f490fcc
Remove separate install function, move to installConfigs(), use pihole syntax
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2020-07-24 20:32:32 +02:00
331502e14c
Add variable that got lost
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2020-07-23 20:52:21 +02:00
18c24d985f
Create custom.list during install/update if it doesn't exist
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2020-07-23 20:43:12 +02:00
ddb36c013d
it helps if the echo goes variable set goes in the right place
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-07-22 22:39:03 +01:00
98dc51869e
accidentally missed \\n
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-07-22 22:30:51 +01:00
510b646736
change up the verbiage with something that works (tested)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-07-22 22:29:38 +01:00
ea22774d16
Wrap entire function in the check for the ENVVAR
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-07-21 18:47:13 +01:00
25b873cf7b
Add default locations to PATH to assure that all basic commands are available
...
Signed-off-by: MichaIng <micha@dietpi.com >
2020-07-18 17:30:27 +02:00
643d2c0f3e
add missing port number validation section to valid_ip6
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-07-16 21:31:45 +01:00
533e5dddd0
clarify examples in case of unsupported OS
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-07-16 18:33:53 +01:00
acfb092e4b
fix minor bug in 5.1
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-07-15 23:38:08 +01:00
3205606fc3
Also validate IPV6 in the setdns function
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-06-23 20:38:18 +01:00
2c3aa9ab00
Merge pull request #3491 from pi-hole/fix_ip_address_section
...
Fix fresh install on dev branch not working
2020-06-21 21:58:36 +02:00
bf392d7a60
Merge pull request #3489 from pi-hole/ip_validation
...
Improve IP validation function
2020-06-21 21:56:30 +02:00
bbfbf67fcf
further simplify the function, per @dl6er's suggestion
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-06-15 22:52:24 +01:00
fe30ce10d3
simpler regex suggested by @MichaIng
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-06-15 21:21:40 +01:00
7ea6d7b92b
remove ; so IFS changes don't stick
...
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net >
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-06-14 00:17:51 +01:00
1ebf0785b6
move dnsutils/bind-utils to installed deps and only check OS is supported after installing installer deps
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-06-13 21:33:03 +01:00
95f4c632f7
expand valid_ip to allow for custom ports
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-06-13 20:30:03 +01:00
4b59287683
Merge pull request #3441 from pi-hole/new/os_check
...
Display warning if unsupported OS is detected
2020-06-05 13:39:39 -07:00
9844a3288f
Same change as 03a8cff
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-06-05 21:06:25 +01:00
7248d1a504
Ensure that adlistFile is created before chmodding
...
If an user installs Pi-hole without selecting any adlists, the installer emits a warning and exits. By touching the file this is prevented.
Signed-off-by: jesterchen <github@jesterweb.de >
2020-06-01 12:06:02 +02:00
7579ab178a
Update links
...
* use https when possible
* replace coverage with a link to the docs page in README.md
* remove obsolete affiliate link in README.md
Signed-off-by: XhmikosR <xhmikosr@gmail.com >
2020-05-30 21:50:16 +03:00
4f7bb7b811
Remove deprecated Disconnect lists from "defaults"
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-05-26 21:23:44 +01:00
b60ec8a48f
Merge pull request #3248 from MichaIng/patch-8
...
Start pihole-FTL after network
2020-05-25 21:27:27 +02:00
acf2879057
Address sticklr complaints
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-05-25 17:49:19 +01:00
af1129fc28
Add a check at the top of the script to determine if the script is being run on a supported OS
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-05-25 17:40:20 +01:00
414ab53d9a
Use toggle instead of select to remove any hint of a doubt that the option already selected by default can be deselected
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-05-18 22:29:36 +01:00
5c17e41cf1
Start pihole-FTL after network
...
"$network" on a systemd-driven OS leads to "After=network-online.target" in the generated systemd unit.
This target is no guarantee that all network interfaces have been fully configured, as it depends on the related network services types, but at least it reduces the risk that those have not fully finished their job when pihole-FTL starts. If this is the case, certain issues can occur:
- https://github.com/pi-hole/pi-hole/issues/2924
- https://discourse.pi-hole.net/t/have-to-pihole-restartdns-after-reboot/28772
Runtime files are now consistently created in "/run" instead of "/var/run". The second is a symlink to the first for backwards compatibility but on none-ancient distro versions one should use "/run", systemd even prints a warnings if service files use "/var/run". The service file used "/run" and "/var/run" both, in cases for the same files/directories before, which does not directly cause issues currently, due to the symlink, but is inconsistent at best.
Signed-off-by: MichaIng <micha@dietpi.com >
2020-05-16 13:38:18 +02:00
3c6ea2612d
fix #3336 by creating adlist file even if no list was selected by user
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
2020-05-15 17:52:57 +02:00
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
