From fb9aa3255fde3ae3f32703ba81684aff2043ddd2 Mon Sep 17 00:00:00 2001 From: marceljd Date: Thu, 7 Feb 2019 14:31:17 +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 Untracked files: .config/000-default.conf 13.0/apache/config/000-default.conf 13.0/fpm-alpine/config/000-default.conf 13.0/fpm/config/000-default.conf 14.0/apache/config/000-default.conf 14.0/fpm-alpine/config/000-default.conf 14.0/fpm/config/000-default.conf 15.0/apache/config/000-default.conf 15.0/fpm-alpine/config/000-default.conf 15.0/fpm/config/000-default.conf 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 9f70d6ee..b51ef6e1 100755 --- a/13.0/apache/entrypoint.sh +++ b/13.0/apache/entrypoint.sh @@ -138,7 +138,7 @@ fi openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt mkdir -p /etc/apache2/ssl mv ca.crt ca.key ca.csr /etc/apache2/ssl/ - mv /var/www/html/config/000-default.conf /etc/apache2/sites-enabled/ + mv /usr/src/nextcloud/config/000-default.conf /etc/apache2/sites-enabled/ ## einde SSL toevoegingen exec "$@" diff --git a/13.0/fpm-alpine/entrypoint.sh b/13.0/fpm-alpine/entrypoint.sh index 9f70d6ee..b51ef6e1 100755 --- a/13.0/fpm-alpine/entrypoint.sh +++ b/13.0/fpm-alpine/entrypoint.sh @@ -138,7 +138,7 @@ fi openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt mkdir -p /etc/apache2/ssl mv ca.crt ca.key ca.csr /etc/apache2/ssl/ - mv /var/www/html/config/000-default.conf /etc/apache2/sites-enabled/ + mv /usr/src/nextcloud/config/000-default.conf /etc/apache2/sites-enabled/ ## einde SSL toevoegingen exec "$@" diff --git a/13.0/fpm/entrypoint.sh b/13.0/fpm/entrypoint.sh index 9f70d6ee..b51ef6e1 100755 --- a/13.0/fpm/entrypoint.sh +++ b/13.0/fpm/entrypoint.sh @@ -138,7 +138,7 @@ fi openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt mkdir -p /etc/apache2/ssl mv ca.crt ca.key ca.csr /etc/apache2/ssl/ - mv /var/www/html/config/000-default.conf /etc/apache2/sites-enabled/ + mv /usr/src/nextcloud/config/000-default.conf /etc/apache2/sites-enabled/ ## einde SSL toevoegingen exec "$@" diff --git a/14.0/apache/entrypoint.sh b/14.0/apache/entrypoint.sh index 9f70d6ee..b51ef6e1 100755 --- a/14.0/apache/entrypoint.sh +++ b/14.0/apache/entrypoint.sh @@ -138,7 +138,7 @@ fi openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt mkdir -p /etc/apache2/ssl mv ca.crt ca.key ca.csr /etc/apache2/ssl/ - mv /var/www/html/config/000-default.conf /etc/apache2/sites-enabled/ + mv /usr/src/nextcloud/config/000-default.conf /etc/apache2/sites-enabled/ ## einde SSL toevoegingen exec "$@" diff --git a/14.0/fpm-alpine/entrypoint.sh b/14.0/fpm-alpine/entrypoint.sh index 9f70d6ee..b51ef6e1 100755 --- a/14.0/fpm-alpine/entrypoint.sh +++ b/14.0/fpm-alpine/entrypoint.sh @@ -138,7 +138,7 @@ fi openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt mkdir -p /etc/apache2/ssl mv ca.crt ca.key ca.csr /etc/apache2/ssl/ - mv /var/www/html/config/000-default.conf /etc/apache2/sites-enabled/ + mv /usr/src/nextcloud/config/000-default.conf /etc/apache2/sites-enabled/ ## einde SSL toevoegingen exec "$@" diff --git a/14.0/fpm/entrypoint.sh b/14.0/fpm/entrypoint.sh index 9f70d6ee..b51ef6e1 100755 --- a/14.0/fpm/entrypoint.sh +++ b/14.0/fpm/entrypoint.sh @@ -138,7 +138,7 @@ fi openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt mkdir -p /etc/apache2/ssl mv ca.crt ca.key ca.csr /etc/apache2/ssl/ - mv /var/www/html/config/000-default.conf /etc/apache2/sites-enabled/ + mv /usr/src/nextcloud/config/000-default.conf /etc/apache2/sites-enabled/ ## einde SSL toevoegingen exec "$@" diff --git a/15.0/apache/entrypoint.sh b/15.0/apache/entrypoint.sh index 9f70d6ee..b51ef6e1 100755 --- a/15.0/apache/entrypoint.sh +++ b/15.0/apache/entrypoint.sh @@ -138,7 +138,7 @@ fi openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt mkdir -p /etc/apache2/ssl mv ca.crt ca.key ca.csr /etc/apache2/ssl/ - mv /var/www/html/config/000-default.conf /etc/apache2/sites-enabled/ + mv /usr/src/nextcloud/config/000-default.conf /etc/apache2/sites-enabled/ ## einde SSL toevoegingen exec "$@" diff --git a/15.0/fpm-alpine/entrypoint.sh b/15.0/fpm-alpine/entrypoint.sh index 9f70d6ee..b51ef6e1 100755 --- a/15.0/fpm-alpine/entrypoint.sh +++ b/15.0/fpm-alpine/entrypoint.sh @@ -138,7 +138,7 @@ fi openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt mkdir -p /etc/apache2/ssl mv ca.crt ca.key ca.csr /etc/apache2/ssl/ - mv /var/www/html/config/000-default.conf /etc/apache2/sites-enabled/ + mv /usr/src/nextcloud/config/000-default.conf /etc/apache2/sites-enabled/ ## einde SSL toevoegingen exec "$@" diff --git a/15.0/fpm/entrypoint.sh b/15.0/fpm/entrypoint.sh index 9f70d6ee..b51ef6e1 100755 --- a/15.0/fpm/entrypoint.sh +++ b/15.0/fpm/entrypoint.sh @@ -138,7 +138,7 @@ fi openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt mkdir -p /etc/apache2/ssl mv ca.crt ca.key ca.csr /etc/apache2/ssl/ - mv /var/www/html/config/000-default.conf /etc/apache2/sites-enabled/ + mv /usr/src/nextcloud/config/000-default.conf /etc/apache2/sites-enabled/ ## einde SSL toevoegingen exec "$@" diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 9f70d6ee..b51ef6e1 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -138,7 +138,7 @@ fi openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt mkdir -p /etc/apache2/ssl mv ca.crt ca.key ca.csr /etc/apache2/ssl/ - mv /var/www/html/config/000-default.conf /etc/apache2/sites-enabled/ + mv /usr/src/nextcloud/config/000-default.conf /etc/apache2/sites-enabled/ ## einde SSL toevoegingen exec "$@"