diff --git a/customers/base/nextcloud-configmap.yml b/customers/base/nextcloud-configmap.yml index 48dec32..29bbf8f 100644 --- a/customers/base/nextcloud-configmap.yml +++ b/customers/base/nextcloud-configmap.yml @@ -179,5 +179,20 @@ data: ), ); + envars: | + unset HOME + if [ "${APACHE_CONFDIR##/etc/apache2-}" != "${APACHE_CONFDIR}" ] ; then + SUFFIX="-${APACHE_CONFDIR##/etc/apache2-}" + else + SUFFIX= + fi + export APACHE_RUN_USER=www-data + export APACHE_RUN_GROUP=www-data + export APACHE_PID_FILE=/var/run/apache2$SUFFIX/apache2.pid + export APACHE_RUN_DIR=/var/run/apache2$SUFFIX + export APACHE_LOCK_DIR=/var/lock/apache2$SUFFIX + export APACHE_LOG_DIR=/tmp$SUFFIX + export LANG=C + export LANG ports.conf: | Listen 8080 diff --git a/customers/base/nextcloud-deployment.yml b/customers/base/nextcloud-deployment.yml index ae02959..cde79c0 100644 --- a/customers/base/nextcloud-deployment.yml +++ b/customers/base/nextcloud-deployment.yml @@ -47,6 +47,9 @@ spec: - name: apache2-config mountPath: /etc/apache2/apache2.conf subPath: apache2.conf + - name: envars + mountPath: /etc/apache2/envars + subPath: envars - name: ports-config mountPath: /etc/apache2/ports.conf subPath: ports.conf @@ -195,6 +198,12 @@ spec: items: - key: "000-default.conf" path: "000-default.conf" + - name: envars + configMap: + name: nextcloud-configmap + items: + - key: "envars" + path: "envars" - name: ports-config configMap: name: nextcloud-configmap