From 47fb5c336f7e535995c9fcfb70aca728decc387b Mon Sep 17 00:00:00 2001
From: marceljd <support@dihosting.ch>
Date: Thu, 7 Feb 2019 15:59:54 +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     | 7 ++++---
 13.0/fpm-alpine/entrypoint.sh | 7 ++++---
 13.0/fpm/entrypoint.sh        | 7 ++++---
 14.0/apache/entrypoint.sh     | 7 ++++---
 14.0/fpm-alpine/entrypoint.sh | 7 ++++---
 14.0/fpm/entrypoint.sh        | 7 ++++---
 15.0/apache/entrypoint.sh     | 7 ++++---
 15.0/fpm-alpine/entrypoint.sh | 7 ++++---
 15.0/fpm/entrypoint.sh        | 7 ++++---
 docker-entrypoint.sh          | 7 ++++---
 10 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/13.0/apache/entrypoint.sh b/13.0/apache/entrypoint.sh
index 49ede3cf..8e70509c 100755
--- a/13.0/apache/entrypoint.sh
+++ b/13.0/apache/entrypoint.sh
@@ -129,8 +129,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
     fi
 fi
 
-## APACHE SSL
-## als APACHE en ENV VAR set dan dit uitvoeren nog inbouwen
+## APACHE SSL configuration (self signed certificates)
+## ENV VAR set dan dit uitvoeren nog inbouwen
+if expr "$1" : "apache" 1 || [-n "${APACHE_SSL_SELFSIGNED+x}" "true" ]; then
   a2enmod ssl
   a2enmod headers
   openssl genrsa -out ca.key 2048
@@ -139,6 +140,6 @@ fi
   mkdir -p /etc/apache2/ssl
   mv ca.crt ca.key ca.csr /etc/apache2/ssl/
   mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
-## einde SSL toevoegingen
+fi
 
 exec "$@"
diff --git a/13.0/fpm-alpine/entrypoint.sh b/13.0/fpm-alpine/entrypoint.sh
index 49ede3cf..8e70509c 100755
--- a/13.0/fpm-alpine/entrypoint.sh
+++ b/13.0/fpm-alpine/entrypoint.sh
@@ -129,8 +129,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
     fi
 fi
 
-## APACHE SSL
-## als APACHE en ENV VAR set dan dit uitvoeren nog inbouwen
+## APACHE SSL configuration (self signed certificates)
+## ENV VAR set dan dit uitvoeren nog inbouwen
+if expr "$1" : "apache" 1 || [-n "${APACHE_SSL_SELFSIGNED+x}" "true" ]; then
   a2enmod ssl
   a2enmod headers
   openssl genrsa -out ca.key 2048
@@ -139,6 +140,6 @@ fi
   mkdir -p /etc/apache2/ssl
   mv ca.crt ca.key ca.csr /etc/apache2/ssl/
   mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
-## einde SSL toevoegingen
+fi
 
 exec "$@"
diff --git a/13.0/fpm/entrypoint.sh b/13.0/fpm/entrypoint.sh
index 49ede3cf..8e70509c 100755
--- a/13.0/fpm/entrypoint.sh
+++ b/13.0/fpm/entrypoint.sh
@@ -129,8 +129,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
     fi
 fi
 
-## APACHE SSL
-## als APACHE en ENV VAR set dan dit uitvoeren nog inbouwen
+## APACHE SSL configuration (self signed certificates)
+## ENV VAR set dan dit uitvoeren nog inbouwen
+if expr "$1" : "apache" 1 || [-n "${APACHE_SSL_SELFSIGNED+x}" "true" ]; then
   a2enmod ssl
   a2enmod headers
   openssl genrsa -out ca.key 2048
@@ -139,6 +140,6 @@ fi
   mkdir -p /etc/apache2/ssl
   mv ca.crt ca.key ca.csr /etc/apache2/ssl/
   mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
-## einde SSL toevoegingen
+fi
 
 exec "$@"
diff --git a/14.0/apache/entrypoint.sh b/14.0/apache/entrypoint.sh
index 49ede3cf..8e70509c 100755
--- a/14.0/apache/entrypoint.sh
+++ b/14.0/apache/entrypoint.sh
@@ -129,8 +129,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
     fi
 fi
 
-## APACHE SSL
-## als APACHE en ENV VAR set dan dit uitvoeren nog inbouwen
+## APACHE SSL configuration (self signed certificates)
+## ENV VAR set dan dit uitvoeren nog inbouwen
+if expr "$1" : "apache" 1 || [-n "${APACHE_SSL_SELFSIGNED+x}" "true" ]; then
   a2enmod ssl
   a2enmod headers
   openssl genrsa -out ca.key 2048
@@ -139,6 +140,6 @@ fi
   mkdir -p /etc/apache2/ssl
   mv ca.crt ca.key ca.csr /etc/apache2/ssl/
   mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
-## einde SSL toevoegingen
+fi
 
 exec "$@"
diff --git a/14.0/fpm-alpine/entrypoint.sh b/14.0/fpm-alpine/entrypoint.sh
index 49ede3cf..8e70509c 100755
--- a/14.0/fpm-alpine/entrypoint.sh
+++ b/14.0/fpm-alpine/entrypoint.sh
@@ -129,8 +129,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
     fi
 fi
 
-## APACHE SSL
-## als APACHE en ENV VAR set dan dit uitvoeren nog inbouwen
+## APACHE SSL configuration (self signed certificates)
+## ENV VAR set dan dit uitvoeren nog inbouwen
+if expr "$1" : "apache" 1 || [-n "${APACHE_SSL_SELFSIGNED+x}" "true" ]; then
   a2enmod ssl
   a2enmod headers
   openssl genrsa -out ca.key 2048
@@ -139,6 +140,6 @@ fi
   mkdir -p /etc/apache2/ssl
   mv ca.crt ca.key ca.csr /etc/apache2/ssl/
   mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
-## einde SSL toevoegingen
+fi
 
 exec "$@"
diff --git a/14.0/fpm/entrypoint.sh b/14.0/fpm/entrypoint.sh
index 49ede3cf..8e70509c 100755
--- a/14.0/fpm/entrypoint.sh
+++ b/14.0/fpm/entrypoint.sh
@@ -129,8 +129,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
     fi
 fi
 
-## APACHE SSL
-## als APACHE en ENV VAR set dan dit uitvoeren nog inbouwen
+## APACHE SSL configuration (self signed certificates)
+## ENV VAR set dan dit uitvoeren nog inbouwen
+if expr "$1" : "apache" 1 || [-n "${APACHE_SSL_SELFSIGNED+x}" "true" ]; then
   a2enmod ssl
   a2enmod headers
   openssl genrsa -out ca.key 2048
@@ -139,6 +140,6 @@ fi
   mkdir -p /etc/apache2/ssl
   mv ca.crt ca.key ca.csr /etc/apache2/ssl/
   mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
-## einde SSL toevoegingen
+fi
 
 exec "$@"
diff --git a/15.0/apache/entrypoint.sh b/15.0/apache/entrypoint.sh
index 49ede3cf..8e70509c 100755
--- a/15.0/apache/entrypoint.sh
+++ b/15.0/apache/entrypoint.sh
@@ -129,8 +129,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
     fi
 fi
 
-## APACHE SSL
-## als APACHE en ENV VAR set dan dit uitvoeren nog inbouwen
+## APACHE SSL configuration (self signed certificates)
+## ENV VAR set dan dit uitvoeren nog inbouwen
+if expr "$1" : "apache" 1 || [-n "${APACHE_SSL_SELFSIGNED+x}" "true" ]; then
   a2enmod ssl
   a2enmod headers
   openssl genrsa -out ca.key 2048
@@ -139,6 +140,6 @@ fi
   mkdir -p /etc/apache2/ssl
   mv ca.crt ca.key ca.csr /etc/apache2/ssl/
   mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
-## einde SSL toevoegingen
+fi
 
 exec "$@"
diff --git a/15.0/fpm-alpine/entrypoint.sh b/15.0/fpm-alpine/entrypoint.sh
index 49ede3cf..8e70509c 100755
--- a/15.0/fpm-alpine/entrypoint.sh
+++ b/15.0/fpm-alpine/entrypoint.sh
@@ -129,8 +129,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
     fi
 fi
 
-## APACHE SSL
-## als APACHE en ENV VAR set dan dit uitvoeren nog inbouwen
+## APACHE SSL configuration (self signed certificates)
+## ENV VAR set dan dit uitvoeren nog inbouwen
+if expr "$1" : "apache" 1 || [-n "${APACHE_SSL_SELFSIGNED+x}" "true" ]; then
   a2enmod ssl
   a2enmod headers
   openssl genrsa -out ca.key 2048
@@ -139,6 +140,6 @@ fi
   mkdir -p /etc/apache2/ssl
   mv ca.crt ca.key ca.csr /etc/apache2/ssl/
   mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
-## einde SSL toevoegingen
+fi
 
 exec "$@"
diff --git a/15.0/fpm/entrypoint.sh b/15.0/fpm/entrypoint.sh
index 49ede3cf..8e70509c 100755
--- a/15.0/fpm/entrypoint.sh
+++ b/15.0/fpm/entrypoint.sh
@@ -129,8 +129,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
     fi
 fi
 
-## APACHE SSL
-## als APACHE en ENV VAR set dan dit uitvoeren nog inbouwen
+## APACHE SSL configuration (self signed certificates)
+## ENV VAR set dan dit uitvoeren nog inbouwen
+if expr "$1" : "apache" 1 || [-n "${APACHE_SSL_SELFSIGNED+x}" "true" ]; then
   a2enmod ssl
   a2enmod headers
   openssl genrsa -out ca.key 2048
@@ -139,6 +140,6 @@ fi
   mkdir -p /etc/apache2/ssl
   mv ca.crt ca.key ca.csr /etc/apache2/ssl/
   mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
-## einde SSL toevoegingen
+fi
 
 exec "$@"
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 49ede3cf..8e70509c 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -129,8 +129,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
     fi
 fi
 
-## APACHE SSL
-## als APACHE en ENV VAR set dan dit uitvoeren nog inbouwen
+## APACHE SSL configuration (self signed certificates)
+## ENV VAR set dan dit uitvoeren nog inbouwen
+if expr "$1" : "apache" 1 || [-n "${APACHE_SSL_SELFSIGNED+x}" "true" ]; then
   a2enmod ssl
   a2enmod headers
   openssl genrsa -out ca.key 2048
@@ -139,6 +140,6 @@ fi
   mkdir -p /etc/apache2/ssl
   mv ca.crt ca.key ca.csr /etc/apache2/ssl/
   mv /usr/src/apache/000-default.conf /etc/apache2/sites-enabled/
-## einde SSL toevoegingen
+fi
 
 exec "$@"