From e97df421f1cd9661728e973443e434160eb2282f Mon Sep 17 00:00:00 2001
From: marceljd <support@dihosting.ch>
Date: Thu, 7 Feb 2019 19:19:50 +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 <support@dihosting.ch>
---
 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 a28b5153..20e0b787 100755
--- a/13.0/apache/entrypoint.sh
+++ b/13.0/apache/entrypoint.sh
@@ -133,7 +133,8 @@ fi
 ## ENV VAR set dan dit uitvoeren nog inbouwen
 echo "net voor de loop"
 
-if expr "$1" : "apache" || [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
+
+if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; 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 a28b5153..20e0b787 100755
--- a/13.0/fpm-alpine/entrypoint.sh
+++ b/13.0/fpm-alpine/entrypoint.sh
@@ -133,7 +133,8 @@ fi
 ## ENV VAR set dan dit uitvoeren nog inbouwen
 echo "net voor de loop"
 
-if expr "$1" : "apache" || [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
+
+if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; 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 a28b5153..20e0b787 100755
--- a/13.0/fpm/entrypoint.sh
+++ b/13.0/fpm/entrypoint.sh
@@ -133,7 +133,8 @@ fi
 ## ENV VAR set dan dit uitvoeren nog inbouwen
 echo "net voor de loop"
 
-if expr "$1" : "apache" || [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
+
+if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; 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 a28b5153..20e0b787 100755
--- a/14.0/apache/entrypoint.sh
+++ b/14.0/apache/entrypoint.sh
@@ -133,7 +133,8 @@ fi
 ## ENV VAR set dan dit uitvoeren nog inbouwen
 echo "net voor de loop"
 
-if expr "$1" : "apache" || [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
+
+if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; 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 a28b5153..20e0b787 100755
--- a/14.0/fpm-alpine/entrypoint.sh
+++ b/14.0/fpm-alpine/entrypoint.sh
@@ -133,7 +133,8 @@ fi
 ## ENV VAR set dan dit uitvoeren nog inbouwen
 echo "net voor de loop"
 
-if expr "$1" : "apache" || [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
+
+if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; 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 a28b5153..20e0b787 100755
--- a/14.0/fpm/entrypoint.sh
+++ b/14.0/fpm/entrypoint.sh
@@ -133,7 +133,8 @@ fi
 ## ENV VAR set dan dit uitvoeren nog inbouwen
 echo "net voor de loop"
 
-if expr "$1" : "apache" || [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
+
+if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; 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 a28b5153..20e0b787 100755
--- a/15.0/apache/entrypoint.sh
+++ b/15.0/apache/entrypoint.sh
@@ -133,7 +133,8 @@ fi
 ## ENV VAR set dan dit uitvoeren nog inbouwen
 echo "net voor de loop"
 
-if expr "$1" : "apache" || [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
+
+if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; 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 a28b5153..20e0b787 100755
--- a/15.0/fpm-alpine/entrypoint.sh
+++ b/15.0/fpm-alpine/entrypoint.sh
@@ -133,7 +133,8 @@ fi
 ## ENV VAR set dan dit uitvoeren nog inbouwen
 echo "net voor de loop"
 
-if expr "$1" : "apache" || [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
+
+if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; 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 a28b5153..20e0b787 100755
--- a/15.0/fpm/entrypoint.sh
+++ b/15.0/fpm/entrypoint.sh
@@ -133,7 +133,8 @@ fi
 ## ENV VAR set dan dit uitvoeren nog inbouwen
 echo "net voor de loop"
 
-if expr "$1" : "apache" || [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
+
+if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then
   echo "in de apache loop"	
   a2enmod ssl
   a2enmod headers
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index a28b5153..20e0b787 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -133,7 +133,8 @@ fi
 ## ENV VAR set dan dit uitvoeren nog inbouwen
 echo "net voor de loop"
 
-if expr "$1" : "apache" || [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
+
+if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then
   echo "in de apache loop"	
   a2enmod ssl
   a2enmod headers