aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-03-15 19:05:09 +01:00
Code Activity

On branch apache-ssl

Browse source 
Changes to be committed:
	modified:   13.0/apache/entrypoint.sh
	modified:   13.0/fpm-alpine/entrypoint.sh
	modified:   13.0/fpm/entrypoint.sh
	modified:   14.0/apache/entrypoint.sh
	modified:   14.0/fpm-alpine/entrypoint.sh
	modified:   14.0/fpm/entrypoint.sh
	modified:   15.0/apache/entrypoint.sh
	modified:   15.0/fpm-alpine/entrypoint.sh
	modified:   15.0/fpm/entrypoint.sh
	modified:   docker-entrypoint.sh

Signed-off-by: marceljd <support@dihosting.ch>
This commit is contained in:
marceljd 2019-02-08 05:16:24 +00:00
parent 0924211326
commit d74de273e8
10 changed files with 20 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
13.0/apache/entrypoint.sh
View file

@ -130,12 +130,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi fi
## APACHE SSL configuration (self signed certificates) ## APACHE SSL configuration (self signed certificates)
## ENV VAR set dan dit uitvoeren nog inbouwen
echo "net voor de loop" echo "net voor de loop"
if [ -n "${APACHE_SSL_SELFSIGNED+x}" "true" ] ; then
# if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then # if [ -d "/etc/apache2" ]; then
if [ -d "/etc/apache2" ]; then
echo "in de apache loop" echo "in de apache loop"
a2enmod ssl a2enmod ssl
a2enmod headers a2enmod headers

6
13.0/fpm-alpine/entrypoint.sh
View file

@ -130,12 +130,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi fi
## APACHE SSL configuration (self signed certificates) ## APACHE SSL configuration (self signed certificates)
## ENV VAR set dan dit uitvoeren nog inbouwen
echo "net voor de loop" echo "net voor de loop"
if [ -n "${APACHE_SSL_SELFSIGNED+x}" "true" ] ; then
# if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then # if [ -d "/etc/apache2" ]; then
if [ -d "/etc/apache2" ]; then
echo "in de apache loop" echo "in de apache loop"
a2enmod ssl a2enmod ssl
a2enmod headers a2enmod headers

6
13.0/fpm/entrypoint.sh
View file

@ -130,12 +130,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi fi
## APACHE SSL configuration (self signed certificates) ## APACHE SSL configuration (self signed certificates)
## ENV VAR set dan dit uitvoeren nog inbouwen
echo "net voor de loop" echo "net voor de loop"
if [ -n "${APACHE_SSL_SELFSIGNED+x}" "true" ] ; then
# if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then # if [ -d "/etc/apache2" ]; then
if [ -d "/etc/apache2" ]; then
echo "in de apache loop" echo "in de apache loop"
a2enmod ssl a2enmod ssl
a2enmod headers a2enmod headers

6
14.0/apache/entrypoint.sh
View file

@ -130,12 +130,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi fi
## APACHE SSL configuration (self signed certificates) ## APACHE SSL configuration (self signed certificates)
## ENV VAR set dan dit uitvoeren nog inbouwen
echo "net voor de loop" echo "net voor de loop"
if [ -n "${APACHE_SSL_SELFSIGNED+x}" "true" ] ; then
# if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then # if [ -d "/etc/apache2" ]; then
if [ -d "/etc/apache2" ]; then
echo "in de apache loop" echo "in de apache loop"
a2enmod ssl a2enmod ssl
a2enmod headers a2enmod headers

6
14.0/fpm-alpine/entrypoint.sh
View file

@ -130,12 +130,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi fi
## APACHE SSL configuration (self signed certificates) ## APACHE SSL configuration (self signed certificates)
## ENV VAR set dan dit uitvoeren nog inbouwen
echo "net voor de loop" echo "net voor de loop"
if [ -n "${APACHE_SSL_SELFSIGNED+x}" "true" ] ; then
# if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then # if [ -d "/etc/apache2" ]; then
if [ -d "/etc/apache2" ]; then
echo "in de apache loop" echo "in de apache loop"
a2enmod ssl a2enmod ssl
a2enmod headers a2enmod headers

6
14.0/fpm/entrypoint.sh
View file

@ -130,12 +130,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi fi
## APACHE SSL configuration (self signed certificates) ## APACHE SSL configuration (self signed certificates)
## ENV VAR set dan dit uitvoeren nog inbouwen
echo "net voor de loop" echo "net voor de loop"
if [ -n "${APACHE_SSL_SELFSIGNED+x}" "true" ] ; then
# if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then # if [ -d "/etc/apache2" ]; then
if [ -d "/etc/apache2" ]; then
echo "in de apache loop" echo "in de apache loop"
a2enmod ssl a2enmod ssl
a2enmod headers a2enmod headers

6
15.0/apache/entrypoint.sh
View file

@ -130,12 +130,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi fi
## APACHE SSL configuration (self signed certificates) ## APACHE SSL configuration (self signed certificates)
## ENV VAR set dan dit uitvoeren nog inbouwen
echo "net voor de loop" echo "net voor de loop"
if [ -n "${APACHE_SSL_SELFSIGNED+x}" "true" ] ; then
# if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then # if [ -d "/etc/apache2" ]; then
if [ -d "/etc/apache2" ]; then
echo "in de apache loop" echo "in de apache loop"
a2enmod ssl a2enmod ssl
a2enmod headers a2enmod headers

6
15.0/fpm-alpine/entrypoint.sh
View file

@ -130,12 +130,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi fi
## APACHE SSL configuration (self signed certificates) ## APACHE SSL configuration (self signed certificates)
## ENV VAR set dan dit uitvoeren nog inbouwen
echo "net voor de loop" echo "net voor de loop"
if [ -n "${APACHE_SSL_SELFSIGNED+x}" "true" ] ; then
# if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then # if [ -d "/etc/apache2" ]; then
if [ -d "/etc/apache2" ]; then
echo "in de apache loop" echo "in de apache loop"
a2enmod ssl a2enmod ssl
a2enmod headers a2enmod headers

6
15.0/fpm/entrypoint.sh
View file

@ -130,12 +130,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi fi
## APACHE SSL configuration (self signed certificates) ## APACHE SSL configuration (self signed certificates)
## ENV VAR set dan dit uitvoeren nog inbouwen
echo "net voor de loop" echo "net voor de loop"
if [ -n "${APACHE_SSL_SELFSIGNED+x}" "true" ] ; then
# if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then # if [ -d "/etc/apache2" ]; then
if [ -d "/etc/apache2" ]; then
echo "in de apache loop" echo "in de apache loop"
a2enmod ssl a2enmod ssl
a2enmod headers a2enmod headers

6
docker-entrypoint.sh
View file

@ -130,12 +130,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi fi
## APACHE SSL configuration (self signed certificates) ## APACHE SSL configuration (self signed certificates)
## ENV VAR set dan dit uitvoeren nog inbouwen
echo "net voor de loop" echo "net voor de loop"
if [ -n "${APACHE_SSL_SELFSIGNED+x}" "true" ] ; then
# if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then # if [ -d "/etc/apache2" ]; then
if [ -d "/etc/apache2" ]; then
echo "in de apache loop" echo "in de apache loop"
a2enmod ssl a2enmod ssl
a2enmod headers a2enmod headers