diff options
| author | yubiuser <ckoenig@posteo.de> | 2022-08-17 22:29:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-17 22:29:58 +0300 |
| commit | 37102e5a013c0ae3af7c849bc48ef9d3a4aa4ca6 (patch) | |
| tree | b5c7afdb8ca5380728a3f8fe88e7078e6d53c427 /automated install | |
| parent | 114f5627588da6a128ac752dc96ea790f64adbe2 (diff) | |
| parent | 5a98fa1f76a8a8d3053702e443f5a8510dcc4442 (diff) | |
Merge branch 'development' into removeblockpagefunctionality
Diffstat (limited to 'automated install')
| -rwxr-xr-x | automated install/basic-install.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 254e9c06..4d860d33 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -1127,8 +1127,8 @@ setAdminFlag() { ;; esac - # If the user wants to install the Web admin interface (i.e. it has not been deselected above) - if [[ "${INSTALL_WEB_INTERFACE}" == true ]]; then + # If the user wants to install the Web admin interface (i.e. it has not been deselected above) and did not deselect the web server via command-line argument + if [[ "${INSTALL_WEB_INTERFACE}" == true && "${INSTALL_WEB_SERVER}" == true ]]; then # Get list of required PHP modules, excluding base package (common) and handler (cgi) local i php_modules for i in "${PIHOLE_WEB_DEPS[@]}"; do [[ $i == 'php'* && $i != *'-common' && $i != *'-cgi' ]] && php_modules+=" ${i#*-}"; done |