From eaaf4853cf165cc0f8c79432a81b79063e6359b9 Mon Sep 17 00:00:00 2001 From: marceljd Date: Thu, 7 Feb 2019 18:05:27 +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 | 4 +++- 13.0/fpm-alpine/entrypoint.sh | 4 +++- 13.0/fpm/entrypoint.sh | 4 +++- 14.0/apache/entrypoint.sh | 4 +++- 14.0/fpm-alpine/entrypoint.sh | 4 +++- 14.0/fpm/entrypoint.sh | 4 +++- 15.0/apache/entrypoint.sh | 4 +++- 15.0/fpm-alpine/entrypoint.sh | 4 +++- 15.0/fpm/entrypoint.sh | 4 +++- docker-entrypoint.sh | 4 +++- 10 files changed, 30 insertions(+), 10 deletions(-) diff --git a/13.0/apache/entrypoint.sh b/13.0/apache/entrypoint.sh index 0c0a1781..d7c16bdc 100755 --- a/13.0/apache/entrypoint.sh +++ b/13.0/apache/entrypoint.sh @@ -131,7 +131,9 @@ fi ## APACHE SSL configuration (self signed certificates) ## ENV VAR set dan dit uitvoeren nog inbouwen -if [ expr "$1" : "apache" 1] || [ "${APACHE_SSL_SELFSIGNED}" "true" ]; then +if [ expr "$1" : "apache" 1]; then + echo "in de apache loop" + # [ "${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 0c0a1781..d7c16bdc 100755 --- a/13.0/fpm-alpine/entrypoint.sh +++ b/13.0/fpm-alpine/entrypoint.sh @@ -131,7 +131,9 @@ fi ## APACHE SSL configuration (self signed certificates) ## ENV VAR set dan dit uitvoeren nog inbouwen -if [ expr "$1" : "apache" 1] || [ "${APACHE_SSL_SELFSIGNED}" "true" ]; then +if [ expr "$1" : "apache" 1]; then + echo "in de apache loop" + # [ "${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 0c0a1781..d7c16bdc 100755 --- a/13.0/fpm/entrypoint.sh +++ b/13.0/fpm/entrypoint.sh @@ -131,7 +131,9 @@ fi ## APACHE SSL configuration (self signed certificates) ## ENV VAR set dan dit uitvoeren nog inbouwen -if [ expr "$1" : "apache" 1] || [ "${APACHE_SSL_SELFSIGNED}" "true" ]; then +if [ expr "$1" : "apache" 1]; then + echo "in de apache loop" + # [ "${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 0c0a1781..d7c16bdc 100755 --- a/14.0/apache/entrypoint.sh +++ b/14.0/apache/entrypoint.sh @@ -131,7 +131,9 @@ fi ## APACHE SSL configuration (self signed certificates) ## ENV VAR set dan dit uitvoeren nog inbouwen -if [ expr "$1" : "apache" 1] || [ "${APACHE_SSL_SELFSIGNED}" "true" ]; then +if [ expr "$1" : "apache" 1]; then + echo "in de apache loop" + # [ "${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 0c0a1781..d7c16bdc 100755 --- a/14.0/fpm-alpine/entrypoint.sh +++ b/14.0/fpm-alpine/entrypoint.sh @@ -131,7 +131,9 @@ fi ## APACHE SSL configuration (self signed certificates) ## ENV VAR set dan dit uitvoeren nog inbouwen -if [ expr "$1" : "apache" 1] || [ "${APACHE_SSL_SELFSIGNED}" "true" ]; then +if [ expr "$1" : "apache" 1]; then + echo "in de apache loop" + # [ "${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 0c0a1781..d7c16bdc 100755 --- a/14.0/fpm/entrypoint.sh +++ b/14.0/fpm/entrypoint.sh @@ -131,7 +131,9 @@ fi ## APACHE SSL configuration (self signed certificates) ## ENV VAR set dan dit uitvoeren nog inbouwen -if [ expr "$1" : "apache" 1] || [ "${APACHE_SSL_SELFSIGNED}" "true" ]; then +if [ expr "$1" : "apache" 1]; then + echo "in de apache loop" + # [ "${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 0c0a1781..d7c16bdc 100755 --- a/15.0/apache/entrypoint.sh +++ b/15.0/apache/entrypoint.sh @@ -131,7 +131,9 @@ fi ## APACHE SSL configuration (self signed certificates) ## ENV VAR set dan dit uitvoeren nog inbouwen -if [ expr "$1" : "apache" 1] || [ "${APACHE_SSL_SELFSIGNED}" "true" ]; then +if [ expr "$1" : "apache" 1]; then + echo "in de apache loop" + # [ "${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 0c0a1781..d7c16bdc 100755 --- a/15.0/fpm-alpine/entrypoint.sh +++ b/15.0/fpm-alpine/entrypoint.sh @@ -131,7 +131,9 @@ fi ## APACHE SSL configuration (self signed certificates) ## ENV VAR set dan dit uitvoeren nog inbouwen -if [ expr "$1" : "apache" 1] || [ "${APACHE_SSL_SELFSIGNED}" "true" ]; then +if [ expr "$1" : "apache" 1]; then + echo "in de apache loop" + # [ "${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 0c0a1781..d7c16bdc 100755 --- a/15.0/fpm/entrypoint.sh +++ b/15.0/fpm/entrypoint.sh @@ -131,7 +131,9 @@ fi ## APACHE SSL configuration (self signed certificates) ## ENV VAR set dan dit uitvoeren nog inbouwen -if [ expr "$1" : "apache" 1] || [ "${APACHE_SSL_SELFSIGNED}" "true" ]; then +if [ expr "$1" : "apache" 1]; then + echo "in de apache loop" + # [ "${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 0c0a1781..d7c16bdc 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -131,7 +131,9 @@ fi ## APACHE SSL configuration (self signed certificates) ## ENV VAR set dan dit uitvoeren nog inbouwen -if [ expr "$1" : "apache" 1] || [ "${APACHE_SSL_SELFSIGNED}" "true" ]; then +if [ expr "$1" : "apache" 1]; then + echo "in de apache loop" + # [ "${APACHE_SSL_SELFSIGNED}" "true" ]; then a2enmod ssl a2enmod headers openssl genrsa -out ca.key 2048