From f3565b16f69123a1e649ce0bd6133247fb3f9194 Mon Sep 17 00:00:00 2001 From: marceljd Date: Fri, 8 Feb 2019 07:22:00 +0000 Subject: [PATCH] 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 --- 13.0/apache/entrypoint.sh | 2 +- 13.0/fpm-alpine/entrypoint.sh | 2 +- 13.0/fpm/entrypoint.sh | 2 +- 14.0/apache/entrypoint.sh | 2 +- 14.0/fpm-alpine/entrypoint.sh | 2 +- 14.0/fpm/entrypoint.sh | 2 +- 15.0/apache/entrypoint.sh | 2 +- 15.0/fpm-alpine/entrypoint.sh | 2 +- 15.0/fpm/entrypoint.sh | 2 +- docker-entrypoint.sh | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/13.0/apache/entrypoint.sh b/13.0/apache/entrypoint.sh index 253fa09c..85b63e4f 100755 --- a/13.0/apache/entrypoint.sh +++ b/13.0/apache/entrypoint.sh @@ -130,7 +130,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi ## APACHE SSL configuration (self signed certificates) -if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] || [ -f "/etc/apache2/sites-enabled/000-default.conf" ]; then +if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then a2enmod ssl a2enmod headers openssl genrsa -out ca.key 2048 diff --git a/13.0/fpm-alpine/entrypoint.sh b/13.0/fpm-alpine/entrypoint.sh index 253fa09c..85b63e4f 100755 --- a/13.0/fpm-alpine/entrypoint.sh +++ b/13.0/fpm-alpine/entrypoint.sh @@ -130,7 +130,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi ## APACHE SSL configuration (self signed certificates) -if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] || [ -f "/etc/apache2/sites-enabled/000-default.conf" ]; then +if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then a2enmod ssl a2enmod headers openssl genrsa -out ca.key 2048 diff --git a/13.0/fpm/entrypoint.sh b/13.0/fpm/entrypoint.sh index 253fa09c..85b63e4f 100755 --- a/13.0/fpm/entrypoint.sh +++ b/13.0/fpm/entrypoint.sh @@ -130,7 +130,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi ## APACHE SSL configuration (self signed certificates) -if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] || [ -f "/etc/apache2/sites-enabled/000-default.conf" ]; then +if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then a2enmod ssl a2enmod headers openssl genrsa -out ca.key 2048 diff --git a/14.0/apache/entrypoint.sh b/14.0/apache/entrypoint.sh index 253fa09c..85b63e4f 100755 --- a/14.0/apache/entrypoint.sh +++ b/14.0/apache/entrypoint.sh @@ -130,7 +130,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi ## APACHE SSL configuration (self signed certificates) -if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] || [ -f "/etc/apache2/sites-enabled/000-default.conf" ]; then +if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then a2enmod ssl a2enmod headers openssl genrsa -out ca.key 2048 diff --git a/14.0/fpm-alpine/entrypoint.sh b/14.0/fpm-alpine/entrypoint.sh index 253fa09c..85b63e4f 100755 --- a/14.0/fpm-alpine/entrypoint.sh +++ b/14.0/fpm-alpine/entrypoint.sh @@ -130,7 +130,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi ## APACHE SSL configuration (self signed certificates) -if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] || [ -f "/etc/apache2/sites-enabled/000-default.conf" ]; then +if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then a2enmod ssl a2enmod headers openssl genrsa -out ca.key 2048 diff --git a/14.0/fpm/entrypoint.sh b/14.0/fpm/entrypoint.sh index 253fa09c..85b63e4f 100755 --- a/14.0/fpm/entrypoint.sh +++ b/14.0/fpm/entrypoint.sh @@ -130,7 +130,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi ## APACHE SSL configuration (self signed certificates) -if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] || [ -f "/etc/apache2/sites-enabled/000-default.conf" ]; then +if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then a2enmod ssl a2enmod headers openssl genrsa -out ca.key 2048 diff --git a/15.0/apache/entrypoint.sh b/15.0/apache/entrypoint.sh index 253fa09c..85b63e4f 100755 --- a/15.0/apache/entrypoint.sh +++ b/15.0/apache/entrypoint.sh @@ -130,7 +130,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi ## APACHE SSL configuration (self signed certificates) -if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] || [ -f "/etc/apache2/sites-enabled/000-default.conf" ]; then +if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then a2enmod ssl a2enmod headers openssl genrsa -out ca.key 2048 diff --git a/15.0/fpm-alpine/entrypoint.sh b/15.0/fpm-alpine/entrypoint.sh index 253fa09c..85b63e4f 100755 --- a/15.0/fpm-alpine/entrypoint.sh +++ b/15.0/fpm-alpine/entrypoint.sh @@ -130,7 +130,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi ## APACHE SSL configuration (self signed certificates) -if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] || [ -f "/etc/apache2/sites-enabled/000-default.conf" ]; then +if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then a2enmod ssl a2enmod headers openssl genrsa -out ca.key 2048 diff --git a/15.0/fpm/entrypoint.sh b/15.0/fpm/entrypoint.sh index 253fa09c..85b63e4f 100755 --- a/15.0/fpm/entrypoint.sh +++ b/15.0/fpm/entrypoint.sh @@ -130,7 +130,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi ## APACHE SSL configuration (self signed certificates) -if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] || [ -f "/etc/apache2/sites-enabled/000-default.conf" ]; then +if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then a2enmod ssl a2enmod headers openssl genrsa -out ca.key 2048 diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 253fa09c..85b63e4f 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -130,7 +130,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi ## APACHE SSL configuration (self signed certificates) -if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] || [ -f "/etc/apache2/sites-enabled/000-default.conf" ]; then +if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then a2enmod ssl a2enmod headers openssl genrsa -out ca.key 2048