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-07 15:59:54 +00:00
parent 4b8423141f
commit 47fb5c336f
10 changed files with 40 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
13.0/apache/entrypoint.sh
View file

@ -129,8 +129,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi fi
fi fi
## APACHE SSL ## APACHE SSL configuration (self signed certificates)
## als APACHE en ENV VAR set dan dit uitvoeren nog inbouwen ## ENV VAR set dan dit uitvoeren nog inbouwen
if expr "$1" : "apache" 1 || [-n "${APACHE_SSL_SELFSIGNED+x}" "true" ]; then
a2enmod ssl a2enmod ssl
a2enmod headers a2enmod headers
openssl genrsa -out ca.key 2048 openssl genrsa -out ca.key 2048
@ -139,6 +140,6 @@ fi
mkdir -p /etc/apache2/ssl mkdir -p /etc/apache2/ssl
mv ca.crt ca.key ca.csr /etc/apache2/ssl/ mv ca.crt ca.key ca.csr /etc/apache2/ssl/
mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/ mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
## einde SSL toevoegingen fi
exec "$@" exec "$@"

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

@ -129,8 +129,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi fi
fi fi
## APACHE SSL ## APACHE SSL configuration (self signed certificates)
## als APACHE en ENV VAR set dan dit uitvoeren nog inbouwen ## ENV VAR set dan dit uitvoeren nog inbouwen
if expr "$1" : "apache" 1 || [-n "${APACHE_SSL_SELFSIGNED+x}" "true" ]; then
a2enmod ssl a2enmod ssl
a2enmod headers a2enmod headers
openssl genrsa -out ca.key 2048 openssl genrsa -out ca.key 2048
@ -139,6 +140,6 @@ fi
mkdir -p /etc/apache2/ssl mkdir -p /etc/apache2/ssl
mv ca.crt ca.key ca.csr /etc/apache2/ssl/ mv ca.crt ca.key ca.csr /etc/apache2/ssl/
mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/ mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
## einde SSL toevoegingen fi
exec "$@" exec "$@"

7
13.0/fpm/entrypoint.sh
View file

@ -129,8 +129,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi fi
fi fi
## APACHE SSL ## APACHE SSL configuration (self signed certificates)
## als APACHE en ENV VAR set dan dit uitvoeren nog inbouwen ## ENV VAR set dan dit uitvoeren nog inbouwen
if expr "$1" : "apache" 1 || [-n "${APACHE_SSL_SELFSIGNED+x}" "true" ]; then
a2enmod ssl a2enmod ssl
a2enmod headers a2enmod headers
openssl genrsa -out ca.key 2048 openssl genrsa -out ca.key 2048
@ -139,6 +140,6 @@ fi
mkdir -p /etc/apache2/ssl mkdir -p /etc/apache2/ssl
mv ca.crt ca.key ca.csr /etc/apache2/ssl/ mv ca.crt ca.key ca.csr /etc/apache2/ssl/
mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/ mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
## einde SSL toevoegingen fi
exec "$@" exec "$@"

7
14.0/apache/entrypoint.sh
View file

@ -129,8 +129,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi fi
fi fi
## APACHE SSL ## APACHE SSL configuration (self signed certificates)
## als APACHE en ENV VAR set dan dit uitvoeren nog inbouwen ## ENV VAR set dan dit uitvoeren nog inbouwen
if expr "$1" : "apache" 1 || [-n "${APACHE_SSL_SELFSIGNED+x}" "true" ]; then
a2enmod ssl a2enmod ssl
a2enmod headers a2enmod headers
openssl genrsa -out ca.key 2048 openssl genrsa -out ca.key 2048
@ -139,6 +140,6 @@ fi
mkdir -p /etc/apache2/ssl mkdir -p /etc/apache2/ssl
mv ca.crt ca.key ca.csr /etc/apache2/ssl/ mv ca.crt ca.key ca.csr /etc/apache2/ssl/
mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/ mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
## einde SSL toevoegingen fi
exec "$@" exec "$@"

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

@ -129,8 +129,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi fi
fi fi
## APACHE SSL ## APACHE SSL configuration (self signed certificates)
## als APACHE en ENV VAR set dan dit uitvoeren nog inbouwen ## ENV VAR set dan dit uitvoeren nog inbouwen
if expr "$1" : "apache" 1 || [-n "${APACHE_SSL_SELFSIGNED+x}" "true" ]; then
a2enmod ssl a2enmod ssl
a2enmod headers a2enmod headers
openssl genrsa -out ca.key 2048 openssl genrsa -out ca.key 2048
@ -139,6 +140,6 @@ fi
mkdir -p /etc/apache2/ssl mkdir -p /etc/apache2/ssl
mv ca.crt ca.key ca.csr /etc/apache2/ssl/ mv ca.crt ca.key ca.csr /etc/apache2/ssl/
mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/ mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
## einde SSL toevoegingen fi
exec "$@" exec "$@"

7
14.0/fpm/entrypoint.sh
View file

@ -129,8 +129,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi fi
fi fi
## APACHE SSL ## APACHE SSL configuration (self signed certificates)
## als APACHE en ENV VAR set dan dit uitvoeren nog inbouwen ## ENV VAR set dan dit uitvoeren nog inbouwen
if expr "$1" : "apache" 1 || [-n "${APACHE_SSL_SELFSIGNED+x}" "true" ]; then
a2enmod ssl a2enmod ssl
a2enmod headers a2enmod headers
openssl genrsa -out ca.key 2048 openssl genrsa -out ca.key 2048
@ -139,6 +140,6 @@ fi
mkdir -p /etc/apache2/ssl mkdir -p /etc/apache2/ssl
mv ca.crt ca.key ca.csr /etc/apache2/ssl/ mv ca.crt ca.key ca.csr /etc/apache2/ssl/
mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/ mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
## einde SSL toevoegingen fi
exec "$@" exec "$@"

7
15.0/apache/entrypoint.sh
View file

@ -129,8 +129,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi fi
fi fi
## APACHE SSL ## APACHE SSL configuration (self signed certificates)
## als APACHE en ENV VAR set dan dit uitvoeren nog inbouwen ## ENV VAR set dan dit uitvoeren nog inbouwen
if expr "$1" : "apache" 1 || [-n "${APACHE_SSL_SELFSIGNED+x}" "true" ]; then
a2enmod ssl a2enmod ssl
a2enmod headers a2enmod headers
openssl genrsa -out ca.key 2048 openssl genrsa -out ca.key 2048
@ -139,6 +140,6 @@ fi
mkdir -p /etc/apache2/ssl mkdir -p /etc/apache2/ssl
mv ca.crt ca.key ca.csr /etc/apache2/ssl/ mv ca.crt ca.key ca.csr /etc/apache2/ssl/
mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/ mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
## einde SSL toevoegingen fi
exec "$@" exec "$@"

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

@ -129,8 +129,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi fi
fi fi
## APACHE SSL ## APACHE SSL configuration (self signed certificates)
## als APACHE en ENV VAR set dan dit uitvoeren nog inbouwen ## ENV VAR set dan dit uitvoeren nog inbouwen
if expr "$1" : "apache" 1 || [-n "${APACHE_SSL_SELFSIGNED+x}" "true" ]; then
a2enmod ssl a2enmod ssl
a2enmod headers a2enmod headers
openssl genrsa -out ca.key 2048 openssl genrsa -out ca.key 2048
@ -139,6 +140,6 @@ fi
mkdir -p /etc/apache2/ssl mkdir -p /etc/apache2/ssl
mv ca.crt ca.key ca.csr /etc/apache2/ssl/ mv ca.crt ca.key ca.csr /etc/apache2/ssl/
mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/ mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
## einde SSL toevoegingen fi
exec "$@" exec "$@"

7
15.0/fpm/entrypoint.sh
View file

@ -129,8 +129,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi fi
fi fi
## APACHE SSL ## APACHE SSL configuration (self signed certificates)
## als APACHE en ENV VAR set dan dit uitvoeren nog inbouwen ## ENV VAR set dan dit uitvoeren nog inbouwen
if expr "$1" : "apache" 1 || [-n "${APACHE_SSL_SELFSIGNED+x}" "true" ]; then
a2enmod ssl a2enmod ssl
a2enmod headers a2enmod headers
openssl genrsa -out ca.key 2048 openssl genrsa -out ca.key 2048
@ -139,6 +140,6 @@ fi
mkdir -p /etc/apache2/ssl mkdir -p /etc/apache2/ssl
mv ca.crt ca.key ca.csr /etc/apache2/ssl/ mv ca.crt ca.key ca.csr /etc/apache2/ssl/
mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/ mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
## einde SSL toevoegingen fi
exec "$@" exec "$@"

7
docker-entrypoint.sh
View file

@ -129,8 +129,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi fi
fi fi
## APACHE SSL ## APACHE SSL configuration (self signed certificates)
## als APACHE en ENV VAR set dan dit uitvoeren nog inbouwen ## ENV VAR set dan dit uitvoeren nog inbouwen
if expr "$1" : "apache" 1 || [-n "${APACHE_SSL_SELFSIGNED+x}" "true" ]; then
a2enmod ssl a2enmod ssl
a2enmod headers a2enmod headers
openssl genrsa -out ca.key 2048 openssl genrsa -out ca.key 2048
@ -139,6 +140,6 @@ fi
mkdir -p /etc/apache2/ssl mkdir -p /etc/apache2/ssl
mv ca.crt ca.key ca.csr /etc/apache2/ssl/ mv ca.crt ca.key ca.csr /etc/apache2/ssl/
mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/ mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
## einde SSL toevoegingen fi
exec "$@" exec "$@"