aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-03-16 03:15:08 +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-09 15:36:56 +00:00
parent 7ba7ccde61
commit 442656ce1d
10 changed files with 110 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
13.0/apache/entrypoint.sh
View file

@ -130,7 +130,8 @@ 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)
if [ -n "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then if [ -n "${APACHE_SSL_SELFSIGNED+x}" ]; then
if [ "${APACHE_SSL_SELFSIGNED}" = "true" ]; then
a2enmod ssl a2enmod ssl
a2enmod headers a2enmod headers
openssl genrsa -out ca.key 2048 openssl genrsa -out ca.key 2048
@ -140,5 +141,6 @@ if [ -n "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
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/
fi fi
fi
exec "$@" exec "$@"

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

@ -130,7 +130,8 @@ 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)
if [ -n "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then if [ -n "${APACHE_SSL_SELFSIGNED+x}" ]; then
if [ "${APACHE_SSL_SELFSIGNED}" = "true" ]; then
a2enmod ssl a2enmod ssl
a2enmod headers a2enmod headers
openssl genrsa -out ca.key 2048 openssl genrsa -out ca.key 2048
@ -140,5 +141,6 @@ if [ -n "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
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/
fi fi
fi
exec "$@" exec "$@"

4
13.0/fpm/entrypoint.sh
View file

@ -130,7 +130,8 @@ 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)
if [ -n "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then if [ -n "${APACHE_SSL_SELFSIGNED+x}" ]; then
if [ "${APACHE_SSL_SELFSIGNED}" = "true" ]; then
a2enmod ssl a2enmod ssl
a2enmod headers a2enmod headers
openssl genrsa -out ca.key 2048 openssl genrsa -out ca.key 2048
@ -140,5 +141,6 @@ if [ -n "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
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/
fi fi
fi
exec "$@" exec "$@"

4
14.0/apache/entrypoint.sh
View file

@ -130,7 +130,8 @@ 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)
if [ -n "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then if [ -n "${APACHE_SSL_SELFSIGNED+x}" ]; then
if [ "${APACHE_SSL_SELFSIGNED}" = "true" ]; then
a2enmod ssl a2enmod ssl
a2enmod headers a2enmod headers
openssl genrsa -out ca.key 2048 openssl genrsa -out ca.key 2048
@ -140,5 +141,6 @@ if [ -n "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
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/
fi fi
fi
exec "$@" exec "$@"

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

@ -130,7 +130,8 @@ 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)
if [ -n "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then if [ -n "${APACHE_SSL_SELFSIGNED+x}" ]; then
if [ "${APACHE_SSL_SELFSIGNED}" = "true" ]; then
a2enmod ssl a2enmod ssl
a2enmod headers a2enmod headers
openssl genrsa -out ca.key 2048 openssl genrsa -out ca.key 2048
@ -140,5 +141,6 @@ if [ -n "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
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/
fi fi
fi
exec "$@" exec "$@"

4
14.0/fpm/entrypoint.sh
View file

@ -130,7 +130,8 @@ 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)
if [ -n "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then if [ -n "${APACHE_SSL_SELFSIGNED+x}" ]; then
if [ "${APACHE_SSL_SELFSIGNED}" = "true" ]; then
a2enmod ssl a2enmod ssl
a2enmod headers a2enmod headers
openssl genrsa -out ca.key 2048 openssl genrsa -out ca.key 2048
@ -140,5 +141,6 @@ if [ -n "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
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/
fi fi
fi
exec "$@" exec "$@"

4
15.0/apache/entrypoint.sh
View file

@ -130,7 +130,8 @@ 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)
if [ -n "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then if [ -n "${APACHE_SSL_SELFSIGNED+x}" ]; then
if [ "${APACHE_SSL_SELFSIGNED}" = "true" ]; then
a2enmod ssl a2enmod ssl
a2enmod headers a2enmod headers
openssl genrsa -out ca.key 2048 openssl genrsa -out ca.key 2048
@ -140,5 +141,6 @@ if [ -n "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
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/
fi fi
fi
exec "$@" exec "$@"

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

@ -130,7 +130,8 @@ 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)
if [ -n "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then if [ -n "${APACHE_SSL_SELFSIGNED+x}" ]; then
if [ "${APACHE_SSL_SELFSIGNED}" = "true" ]; then
a2enmod ssl a2enmod ssl
a2enmod headers a2enmod headers
openssl genrsa -out ca.key 2048 openssl genrsa -out ca.key 2048
@ -140,5 +141,6 @@ if [ -n "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
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/
fi fi
fi
exec "$@" exec "$@"

4
15.0/fpm/entrypoint.sh
View file

@ -130,7 +130,8 @@ 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)
if [ -n "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then if [ -n "${APACHE_SSL_SELFSIGNED+x}" ]; then
if [ "${APACHE_SSL_SELFSIGNED}" = "true" ]; then
a2enmod ssl a2enmod ssl
a2enmod headers a2enmod headers
openssl genrsa -out ca.key 2048 openssl genrsa -out ca.key 2048
@ -140,5 +141,6 @@ if [ -n "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
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/
fi fi
fi
exec "$@" exec "$@"

4
docker-entrypoint.sh
View file

@ -130,7 +130,8 @@ 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)
if [ -n "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then if [ -n "${APACHE_SSL_SELFSIGNED+x}" ]; then
if [ "${APACHE_SSL_SELFSIGNED}" = "true" ]; then
a2enmod ssl a2enmod ssl
a2enmod headers a2enmod headers
openssl genrsa -out ca.key 2048 openssl genrsa -out ca.key 2048
@ -140,5 +141,6 @@ if [ -n "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
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/
fi fi
fi
exec "$@" exec "$@"