From 00b8fd74b2d9c79c6581683ee82b240076515c56 Mon Sep 17 00:00:00 2001 From: marceljd Date: Thu, 7 Feb 2019 17:04:23 +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 d58faff7..0c0a1781 100755 --- a/13.0/apache/entrypoint.sh +++ b/13.0/apache/entrypoint.sh @@ -131,7 +131,7 @@ fi ## APACHE SSL configuration (self signed certificates) ## ENV VAR set dan dit uitvoeren nog inbouwen -if [ expr "$1" : "apache" 1] || [ "${APACHE_SSL_SELFSIGNED+x}" "true" ]; then +if [ expr "$1" : "apache" 1] || [ "${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 d58faff7..0c0a1781 100755 --- a/13.0/fpm-alpine/entrypoint.sh +++ b/13.0/fpm-alpine/entrypoint.sh @@ -131,7 +131,7 @@ fi ## APACHE SSL configuration (self signed certificates) ## ENV VAR set dan dit uitvoeren nog inbouwen -if [ expr "$1" : "apache" 1] || [ "${APACHE_SSL_SELFSIGNED+x}" "true" ]; then +if [ expr "$1" : "apache" 1] || [ "${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 d58faff7..0c0a1781 100755 --- a/13.0/fpm/entrypoint.sh +++ b/13.0/fpm/entrypoint.sh @@ -131,7 +131,7 @@ fi ## APACHE SSL configuration (self signed certificates) ## ENV VAR set dan dit uitvoeren nog inbouwen -if [ expr "$1" : "apache" 1] || [ "${APACHE_SSL_SELFSIGNED+x}" "true" ]; then +if [ expr "$1" : "apache" 1] || [ "${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 d58faff7..0c0a1781 100755 --- a/14.0/apache/entrypoint.sh +++ b/14.0/apache/entrypoint.sh @@ -131,7 +131,7 @@ fi ## APACHE SSL configuration (self signed certificates) ## ENV VAR set dan dit uitvoeren nog inbouwen -if [ expr "$1" : "apache" 1] || [ "${APACHE_SSL_SELFSIGNED+x}" "true" ]; then +if [ expr "$1" : "apache" 1] || [ "${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 d58faff7..0c0a1781 100755 --- a/14.0/fpm-alpine/entrypoint.sh +++ b/14.0/fpm-alpine/entrypoint.sh @@ -131,7 +131,7 @@ fi ## APACHE SSL configuration (self signed certificates) ## ENV VAR set dan dit uitvoeren nog inbouwen -if [ expr "$1" : "apache" 1] || [ "${APACHE_SSL_SELFSIGNED+x}" "true" ]; then +if [ expr "$1" : "apache" 1] || [ "${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 d58faff7..0c0a1781 100755 --- a/14.0/fpm/entrypoint.sh +++ b/14.0/fpm/entrypoint.sh @@ -131,7 +131,7 @@ fi ## APACHE SSL configuration (self signed certificates) ## ENV VAR set dan dit uitvoeren nog inbouwen -if [ expr "$1" : "apache" 1] || [ "${APACHE_SSL_SELFSIGNED+x}" "true" ]; then +if [ expr "$1" : "apache" 1] || [ "${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 d58faff7..0c0a1781 100755 --- a/15.0/apache/entrypoint.sh +++ b/15.0/apache/entrypoint.sh @@ -131,7 +131,7 @@ fi ## APACHE SSL configuration (self signed certificates) ## ENV VAR set dan dit uitvoeren nog inbouwen -if [ expr "$1" : "apache" 1] || [ "${APACHE_SSL_SELFSIGNED+x}" "true" ]; then +if [ expr "$1" : "apache" 1] || [ "${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 d58faff7..0c0a1781 100755 --- a/15.0/fpm-alpine/entrypoint.sh +++ b/15.0/fpm-alpine/entrypoint.sh @@ -131,7 +131,7 @@ fi ## APACHE SSL configuration (self signed certificates) ## ENV VAR set dan dit uitvoeren nog inbouwen -if [ expr "$1" : "apache" 1] || [ "${APACHE_SSL_SELFSIGNED+x}" "true" ]; then +if [ expr "$1" : "apache" 1] || [ "${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 d58faff7..0c0a1781 100755 --- a/15.0/fpm/entrypoint.sh +++ b/15.0/fpm/entrypoint.sh @@ -131,7 +131,7 @@ fi ## APACHE SSL configuration (self signed certificates) ## ENV VAR set dan dit uitvoeren nog inbouwen -if [ expr "$1" : "apache" 1] || [ "${APACHE_SSL_SELFSIGNED+x}" "true" ]; then +if [ expr "$1" : "apache" 1] || [ "${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 d58faff7..0c0a1781 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -131,7 +131,7 @@ fi ## APACHE SSL configuration (self signed certificates) ## ENV VAR set dan dit uitvoeren nog inbouwen -if [ expr "$1" : "apache" 1] || [ "${APACHE_SSL_SELFSIGNED+x}" "true" ]; then +if [ expr "$1" : "apache" 1] || [ "${APACHE_SSL_SELFSIGNED}" "true" ]; then a2enmod ssl a2enmod headers openssl genrsa -out ca.key 2048