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

On branch apache-ssl

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

View file

@ -130,15 +130,17 @@ 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
a2enmod ssl if [ "${APACHE_SSL_SELFSIGNED}" = "true" ]; then
a2enmod headers a2enmod ssl
openssl genrsa -out ca.key 2048 a2enmod headers
openssl req -batch -nodes -new -key ca.key -out ca.csr openssl genrsa -out ca.key 2048
openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt openssl req -batch -nodes -new -key ca.key -out ca.csr
mkdir -p /etc/apache2/ssl openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
mv ca.crt ca.key ca.csr /etc/apache2/ssl/ mkdir -p /etc/apache2/ssl
mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/ mv ca.crt ca.key ca.csr /etc/apache2/ssl/
mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
fi
fi fi
exec "$@" exec "$@"

View file

@ -130,15 +130,17 @@ 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
a2enmod ssl if [ "${APACHE_SSL_SELFSIGNED}" = "true" ]; then
a2enmod headers a2enmod ssl
openssl genrsa -out ca.key 2048 a2enmod headers
openssl req -batch -nodes -new -key ca.key -out ca.csr openssl genrsa -out ca.key 2048
openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt openssl req -batch -nodes -new -key ca.key -out ca.csr
mkdir -p /etc/apache2/ssl openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
mv ca.crt ca.key ca.csr /etc/apache2/ssl/ mkdir -p /etc/apache2/ssl
mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/ mv ca.crt ca.key ca.csr /etc/apache2/ssl/
mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
fi
fi fi
exec "$@" exec "$@"

View file

@ -130,15 +130,17 @@ 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
a2enmod ssl if [ "${APACHE_SSL_SELFSIGNED}" = "true" ]; then
a2enmod headers a2enmod ssl
openssl genrsa -out ca.key 2048 a2enmod headers
openssl req -batch -nodes -new -key ca.key -out ca.csr openssl genrsa -out ca.key 2048
openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt openssl req -batch -nodes -new -key ca.key -out ca.csr
mkdir -p /etc/apache2/ssl openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
mv ca.crt ca.key ca.csr /etc/apache2/ssl/ mkdir -p /etc/apache2/ssl
mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/ mv ca.crt ca.key ca.csr /etc/apache2/ssl/
mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
fi
fi fi
exec "$@" exec "$@"

View file

@ -130,15 +130,17 @@ 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
a2enmod ssl if [ "${APACHE_SSL_SELFSIGNED}" = "true" ]; then
a2enmod headers a2enmod ssl
openssl genrsa -out ca.key 2048 a2enmod headers
openssl req -batch -nodes -new -key ca.key -out ca.csr openssl genrsa -out ca.key 2048
openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt openssl req -batch -nodes -new -key ca.key -out ca.csr
mkdir -p /etc/apache2/ssl openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
mv ca.crt ca.key ca.csr /etc/apache2/ssl/ mkdir -p /etc/apache2/ssl
mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/ mv ca.crt ca.key ca.csr /etc/apache2/ssl/
mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
fi
fi fi
exec "$@" exec "$@"

View file

@ -130,15 +130,17 @@ 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
a2enmod ssl if [ "${APACHE_SSL_SELFSIGNED}" = "true" ]; then
a2enmod headers a2enmod ssl
openssl genrsa -out ca.key 2048 a2enmod headers
openssl req -batch -nodes -new -key ca.key -out ca.csr openssl genrsa -out ca.key 2048
openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt openssl req -batch -nodes -new -key ca.key -out ca.csr
mkdir -p /etc/apache2/ssl openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
mv ca.crt ca.key ca.csr /etc/apache2/ssl/ mkdir -p /etc/apache2/ssl
mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/ mv ca.crt ca.key ca.csr /etc/apache2/ssl/
mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
fi
fi fi
exec "$@" exec "$@"

View file

@ -130,15 +130,17 @@ 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
a2enmod ssl if [ "${APACHE_SSL_SELFSIGNED}" = "true" ]; then
a2enmod headers a2enmod ssl
openssl genrsa -out ca.key 2048 a2enmod headers
openssl req -batch -nodes -new -key ca.key -out ca.csr openssl genrsa -out ca.key 2048
openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt openssl req -batch -nodes -new -key ca.key -out ca.csr
mkdir -p /etc/apache2/ssl openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
mv ca.crt ca.key ca.csr /etc/apache2/ssl/ mkdir -p /etc/apache2/ssl
mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/ mv ca.crt ca.key ca.csr /etc/apache2/ssl/
mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
fi
fi fi
exec "$@" exec "$@"

View file

@ -130,15 +130,17 @@ 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
a2enmod ssl if [ "${APACHE_SSL_SELFSIGNED}" = "true" ]; then
a2enmod headers a2enmod ssl
openssl genrsa -out ca.key 2048 a2enmod headers
openssl req -batch -nodes -new -key ca.key -out ca.csr openssl genrsa -out ca.key 2048
openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt openssl req -batch -nodes -new -key ca.key -out ca.csr
mkdir -p /etc/apache2/ssl openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
mv ca.crt ca.key ca.csr /etc/apache2/ssl/ mkdir -p /etc/apache2/ssl
mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/ mv ca.crt ca.key ca.csr /etc/apache2/ssl/
mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
fi
fi fi
exec "$@" exec "$@"

View file

@ -130,15 +130,17 @@ 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
a2enmod ssl if [ "${APACHE_SSL_SELFSIGNED}" = "true" ]; then
a2enmod headers a2enmod ssl
openssl genrsa -out ca.key 2048 a2enmod headers
openssl req -batch -nodes -new -key ca.key -out ca.csr openssl genrsa -out ca.key 2048
openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt openssl req -batch -nodes -new -key ca.key -out ca.csr
mkdir -p /etc/apache2/ssl openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
mv ca.crt ca.key ca.csr /etc/apache2/ssl/ mkdir -p /etc/apache2/ssl
mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/ mv ca.crt ca.key ca.csr /etc/apache2/ssl/
mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
fi
fi fi
exec "$@" exec "$@"

View file

@ -130,15 +130,17 @@ 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
a2enmod ssl if [ "${APACHE_SSL_SELFSIGNED}" = "true" ]; then
a2enmod headers a2enmod ssl
openssl genrsa -out ca.key 2048 a2enmod headers
openssl req -batch -nodes -new -key ca.key -out ca.csr openssl genrsa -out ca.key 2048
openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt openssl req -batch -nodes -new -key ca.key -out ca.csr
mkdir -p /etc/apache2/ssl openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
mv ca.crt ca.key ca.csr /etc/apache2/ssl/ mkdir -p /etc/apache2/ssl
mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/ mv ca.crt ca.key ca.csr /etc/apache2/ssl/
mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
fi
fi fi
exec "$@" exec "$@"

View file

@ -130,15 +130,17 @@ 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
a2enmod ssl if [ "${APACHE_SSL_SELFSIGNED}" = "true" ]; then
a2enmod headers a2enmod ssl
openssl genrsa -out ca.key 2048 a2enmod headers
openssl req -batch -nodes -new -key ca.key -out ca.csr openssl genrsa -out ca.key 2048
openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt openssl req -batch -nodes -new -key ca.key -out ca.csr
mkdir -p /etc/apache2/ssl openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
mv ca.crt ca.key ca.csr /etc/apache2/ssl/ mkdir -p /etc/apache2/ssl
mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/ mv ca.crt ca.key ca.csr /etc/apache2/ssl/
mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
fi
fi fi
exec "$@" exec "$@"