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