From c84311c392972b32c188b1d37f2db0d5b52563ae Mon Sep 17 00:00:00 2001 From: marceljd Date: Thu, 7 Feb 2019 18:47:56 +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 | 5 ++++- 13.0/fpm-alpine/entrypoint.sh | 5 ++++- 13.0/fpm/entrypoint.sh | 5 ++++- 14.0/apache/entrypoint.sh | 5 ++++- 14.0/fpm-alpine/entrypoint.sh | 5 ++++- 14.0/fpm/entrypoint.sh | 5 ++++- 15.0/apache/entrypoint.sh | 5 ++++- 15.0/fpm-alpine/entrypoint.sh | 5 ++++- 15.0/fpm/entrypoint.sh | 5 ++++- docker-entrypoint.sh | 5 ++++- 10 files changed, 40 insertions(+), 10 deletions(-) diff --git a/13.0/apache/entrypoint.sh b/13.0/apache/entrypoint.sh index c8744ca2..069ea096 100755 --- a/13.0/apache/entrypoint.sh +++ b/13.0/apache/entrypoint.sh @@ -131,7 +131,10 @@ fi ## APACHE SSL configuration (self signed certificates) ## ENV VAR set dan dit uitvoeren nog inbouwen -if [ expr "$1" = "apache" ]; then +echo "net voor de loop" +echo expr "$1" + +if expr "$1" : "apache" ; then echo "in de apache loop" # [ "${APACHE_SSL_SELFSIGNED}" "true" ]; then a2enmod ssl diff --git a/13.0/fpm-alpine/entrypoint.sh b/13.0/fpm-alpine/entrypoint.sh index c8744ca2..069ea096 100755 --- a/13.0/fpm-alpine/entrypoint.sh +++ b/13.0/fpm-alpine/entrypoint.sh @@ -131,7 +131,10 @@ fi ## APACHE SSL configuration (self signed certificates) ## ENV VAR set dan dit uitvoeren nog inbouwen -if [ expr "$1" = "apache" ]; then +echo "net voor de loop" +echo expr "$1" + +if expr "$1" : "apache" ; then echo "in de apache loop" # [ "${APACHE_SSL_SELFSIGNED}" "true" ]; then a2enmod ssl diff --git a/13.0/fpm/entrypoint.sh b/13.0/fpm/entrypoint.sh index c8744ca2..069ea096 100755 --- a/13.0/fpm/entrypoint.sh +++ b/13.0/fpm/entrypoint.sh @@ -131,7 +131,10 @@ fi ## APACHE SSL configuration (self signed certificates) ## ENV VAR set dan dit uitvoeren nog inbouwen -if [ expr "$1" = "apache" ]; then +echo "net voor de loop" +echo expr "$1" + +if expr "$1" : "apache" ; then echo "in de apache loop" # [ "${APACHE_SSL_SELFSIGNED}" "true" ]; then a2enmod ssl diff --git a/14.0/apache/entrypoint.sh b/14.0/apache/entrypoint.sh index c8744ca2..069ea096 100755 --- a/14.0/apache/entrypoint.sh +++ b/14.0/apache/entrypoint.sh @@ -131,7 +131,10 @@ fi ## APACHE SSL configuration (self signed certificates) ## ENV VAR set dan dit uitvoeren nog inbouwen -if [ expr "$1" = "apache" ]; then +echo "net voor de loop" +echo expr "$1" + +if expr "$1" : "apache" ; then echo "in de apache loop" # [ "${APACHE_SSL_SELFSIGNED}" "true" ]; then a2enmod ssl diff --git a/14.0/fpm-alpine/entrypoint.sh b/14.0/fpm-alpine/entrypoint.sh index c8744ca2..069ea096 100755 --- a/14.0/fpm-alpine/entrypoint.sh +++ b/14.0/fpm-alpine/entrypoint.sh @@ -131,7 +131,10 @@ fi ## APACHE SSL configuration (self signed certificates) ## ENV VAR set dan dit uitvoeren nog inbouwen -if [ expr "$1" = "apache" ]; then +echo "net voor de loop" +echo expr "$1" + +if expr "$1" : "apache" ; then echo "in de apache loop" # [ "${APACHE_SSL_SELFSIGNED}" "true" ]; then a2enmod ssl diff --git a/14.0/fpm/entrypoint.sh b/14.0/fpm/entrypoint.sh index c8744ca2..069ea096 100755 --- a/14.0/fpm/entrypoint.sh +++ b/14.0/fpm/entrypoint.sh @@ -131,7 +131,10 @@ fi ## APACHE SSL configuration (self signed certificates) ## ENV VAR set dan dit uitvoeren nog inbouwen -if [ expr "$1" = "apache" ]; then +echo "net voor de loop" +echo expr "$1" + +if expr "$1" : "apache" ; then echo "in de apache loop" # [ "${APACHE_SSL_SELFSIGNED}" "true" ]; then a2enmod ssl diff --git a/15.0/apache/entrypoint.sh b/15.0/apache/entrypoint.sh index c8744ca2..069ea096 100755 --- a/15.0/apache/entrypoint.sh +++ b/15.0/apache/entrypoint.sh @@ -131,7 +131,10 @@ fi ## APACHE SSL configuration (self signed certificates) ## ENV VAR set dan dit uitvoeren nog inbouwen -if [ expr "$1" = "apache" ]; then +echo "net voor de loop" +echo expr "$1" + +if expr "$1" : "apache" ; then echo "in de apache loop" # [ "${APACHE_SSL_SELFSIGNED}" "true" ]; then a2enmod ssl diff --git a/15.0/fpm-alpine/entrypoint.sh b/15.0/fpm-alpine/entrypoint.sh index c8744ca2..069ea096 100755 --- a/15.0/fpm-alpine/entrypoint.sh +++ b/15.0/fpm-alpine/entrypoint.sh @@ -131,7 +131,10 @@ fi ## APACHE SSL configuration (self signed certificates) ## ENV VAR set dan dit uitvoeren nog inbouwen -if [ expr "$1" = "apache" ]; then +echo "net voor de loop" +echo expr "$1" + +if expr "$1" : "apache" ; then echo "in de apache loop" # [ "${APACHE_SSL_SELFSIGNED}" "true" ]; then a2enmod ssl diff --git a/15.0/fpm/entrypoint.sh b/15.0/fpm/entrypoint.sh index c8744ca2..069ea096 100755 --- a/15.0/fpm/entrypoint.sh +++ b/15.0/fpm/entrypoint.sh @@ -131,7 +131,10 @@ fi ## APACHE SSL configuration (self signed certificates) ## ENV VAR set dan dit uitvoeren nog inbouwen -if [ expr "$1" = "apache" ]; then +echo "net voor de loop" +echo expr "$1" + +if expr "$1" : "apache" ; then echo "in de apache loop" # [ "${APACHE_SSL_SELFSIGNED}" "true" ]; then a2enmod ssl diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index c8744ca2..069ea096 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -131,7 +131,10 @@ fi ## APACHE SSL configuration (self signed certificates) ## ENV VAR set dan dit uitvoeren nog inbouwen -if [ expr "$1" = "apache" ]; then +echo "net voor de loop" +echo expr "$1" + +if expr "$1" : "apache" ; then echo "in de apache loop" # [ "${APACHE_SSL_SELFSIGNED}" "true" ]; then a2enmod ssl