diff options
| author | J0WI <J0WI@users.noreply.github.com> | 2020-07-28 14:40:22 +0200 |
|---|---|---|
| committer | J0WI <J0WI@users.noreply.github.com> | 2020-07-28 14:40:22 +0200 |
| commit | 1e6d0620af955df9430046570ed23817f381dba5 (patch) | |
| tree | c4a53076481a457c832c27cc684d700fee87f8ab /19.0 | |
| parent | 9bfe454bd4d64ee81df92e1d375a7a73a8e2175c (diff) | |
Revert "Fix triggering install and update script (#1181)"
This reverts commit de90bed706d03973c8181b695e0207fa45847c28.
Diffstat (limited to '19.0')
| -rwxr-xr-x | 19.0/apache/entrypoint.sh | 4 | ||||
| -rwxr-xr-x | 19.0/fpm-alpine/entrypoint.sh | 4 | ||||
| -rwxr-xr-x | 19.0/fpm/entrypoint.sh | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/19.0/apache/entrypoint.sh b/19.0/apache/entrypoint.sh index f1dd332c..b9ec5fc5 100755 --- a/19.0/apache/entrypoint.sh +++ b/19.0/apache/entrypoint.sh @@ -43,13 +43,13 @@ file_env() { unset "$fileVar" } -if expr "$1" : "apache2-foreground" 1>/dev/null; then +if expr "$1" : "apache" 1>/dev/null; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then a2disconf remoteip fi fi -if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then +if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then if [ -n "${REDIS_HOST+x}" ]; then echo "Configuring Redis as session handler" diff --git a/19.0/fpm-alpine/entrypoint.sh b/19.0/fpm-alpine/entrypoint.sh index f1dd332c..b9ec5fc5 100755 --- a/19.0/fpm-alpine/entrypoint.sh +++ b/19.0/fpm-alpine/entrypoint.sh @@ -43,13 +43,13 @@ file_env() { unset "$fileVar" } -if expr "$1" : "apache2-foreground" 1>/dev/null; then +if expr "$1" : "apache" 1>/dev/null; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then a2disconf remoteip fi fi -if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then +if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then if [ -n "${REDIS_HOST+x}" ]; then echo "Configuring Redis as session handler" diff --git a/19.0/fpm/entrypoint.sh b/19.0/fpm/entrypoint.sh index f1dd332c..b9ec5fc5 100755 --- a/19.0/fpm/entrypoint.sh +++ b/19.0/fpm/entrypoint.sh @@ -43,13 +43,13 @@ file_env() { unset "$fileVar" } -if expr "$1" : "apache2-foreground" 1>/dev/null; then +if expr "$1" : "apache" 1>/dev/null; then if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then a2disconf remoteip fi fi -if expr "$1" : "apache2-foreground" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then +if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then if [ -n "${REDIS_HOST+x}" ]; then echo "Configuring Redis as session handler" |