From 77d44c58bcd4812ddb23f43883f4d4f846bbb1e5 Mon Sep 17 00:00:00 2001 From: marceljd Date: Fri, 8 Feb 2019 04:45:08 +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 | 3 ++- 13.0/fpm-alpine/entrypoint.sh | 3 ++- 13.0/fpm/entrypoint.sh | 3 ++- 14.0/apache/entrypoint.sh | 3 ++- 14.0/fpm-alpine/entrypoint.sh | 3 ++- 14.0/fpm/entrypoint.sh | 3 ++- 15.0/apache/entrypoint.sh | 3 ++- 15.0/fpm-alpine/entrypoint.sh | 3 ++- 15.0/fpm/entrypoint.sh | 3 ++- docker-entrypoint.sh | 3 ++- 10 files changed, 20 insertions(+), 10 deletions(-) diff --git a/13.0/apache/entrypoint.sh b/13.0/apache/entrypoint.sh index 20e0b787..30139ec9 100755 --- a/13.0/apache/entrypoint.sh +++ b/13.0/apache/entrypoint.sh @@ -134,7 +134,8 @@ fi echo "net voor de loop" -if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then +# if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then +if [ ! "/etc/apache2"]; then echo "in de apache loop" a2enmod ssl a2enmod headers diff --git a/13.0/fpm-alpine/entrypoint.sh b/13.0/fpm-alpine/entrypoint.sh index 20e0b787..30139ec9 100755 --- a/13.0/fpm-alpine/entrypoint.sh +++ b/13.0/fpm-alpine/entrypoint.sh @@ -134,7 +134,8 @@ fi echo "net voor de loop" -if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then +# if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then +if [ ! "/etc/apache2"]; then echo "in de apache loop" a2enmod ssl a2enmod headers diff --git a/13.0/fpm/entrypoint.sh b/13.0/fpm/entrypoint.sh index 20e0b787..30139ec9 100755 --- a/13.0/fpm/entrypoint.sh +++ b/13.0/fpm/entrypoint.sh @@ -134,7 +134,8 @@ fi echo "net voor de loop" -if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then +# if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then +if [ ! "/etc/apache2"]; then echo "in de apache loop" a2enmod ssl a2enmod headers diff --git a/14.0/apache/entrypoint.sh b/14.0/apache/entrypoint.sh index 20e0b787..30139ec9 100755 --- a/14.0/apache/entrypoint.sh +++ b/14.0/apache/entrypoint.sh @@ -134,7 +134,8 @@ fi echo "net voor de loop" -if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then +# if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then +if [ ! "/etc/apache2"]; then echo "in de apache loop" a2enmod ssl a2enmod headers diff --git a/14.0/fpm-alpine/entrypoint.sh b/14.0/fpm-alpine/entrypoint.sh index 20e0b787..30139ec9 100755 --- a/14.0/fpm-alpine/entrypoint.sh +++ b/14.0/fpm-alpine/entrypoint.sh @@ -134,7 +134,8 @@ fi echo "net voor de loop" -if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then +# if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then +if [ ! "/etc/apache2"]; then echo "in de apache loop" a2enmod ssl a2enmod headers diff --git a/14.0/fpm/entrypoint.sh b/14.0/fpm/entrypoint.sh index 20e0b787..30139ec9 100755 --- a/14.0/fpm/entrypoint.sh +++ b/14.0/fpm/entrypoint.sh @@ -134,7 +134,8 @@ fi echo "net voor de loop" -if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then +# if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then +if [ ! "/etc/apache2"]; then echo "in de apache loop" a2enmod ssl a2enmod headers diff --git a/15.0/apache/entrypoint.sh b/15.0/apache/entrypoint.sh index 20e0b787..30139ec9 100755 --- a/15.0/apache/entrypoint.sh +++ b/15.0/apache/entrypoint.sh @@ -134,7 +134,8 @@ fi echo "net voor de loop" -if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then +# if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then +if [ ! "/etc/apache2"]; then echo "in de apache loop" a2enmod ssl a2enmod headers diff --git a/15.0/fpm-alpine/entrypoint.sh b/15.0/fpm-alpine/entrypoint.sh index 20e0b787..30139ec9 100755 --- a/15.0/fpm-alpine/entrypoint.sh +++ b/15.0/fpm-alpine/entrypoint.sh @@ -134,7 +134,8 @@ fi echo "net voor de loop" -if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then +# if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then +if [ ! "/etc/apache2"]; then echo "in de apache loop" a2enmod ssl a2enmod headers diff --git a/15.0/fpm/entrypoint.sh b/15.0/fpm/entrypoint.sh index 20e0b787..30139ec9 100755 --- a/15.0/fpm/entrypoint.sh +++ b/15.0/fpm/entrypoint.sh @@ -134,7 +134,8 @@ fi echo "net voor de loop" -if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then +# if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then +if [ ! "/etc/apache2"]; then echo "in de apache loop" a2enmod ssl a2enmod headers diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 20e0b787..30139ec9 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -134,7 +134,8 @@ fi echo "net voor de loop" -if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then +# if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then +if [ ! "/etc/apache2"]; then echo "in de apache loop" a2enmod ssl a2enmod headers