From a59b9de736eecead7a448700e43e420c68d64c79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrej=20Rama=C5=A1euski?= <andrej@sedlistka.cz>
Date: Wed, 11 Dec 2019 00:24:19 +0100
Subject: [PATCH] Presun konfigurace mod_auth_mellon
---
Dockerfile | 2 +-
entrypoint.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index accafe3..9719043 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -68,7 +68,7 @@ RUN set -ex; \
chown -R www-data:www-data /var/www/html
COPY entrypoint.sh entrypoint.sh
-ADD mod_auth_mellon.conf /etc/apache2/conf.d/mod_auth_mellon.conf
+ADD mod_auth_mellon.conf /etc/apache2/conf-enabled/mod_auth_mellon.conf
ENTRYPOINT ["/var/www/html/entrypoint.sh"]
CMD ["apache2-foreground"]
diff --git a/entrypoint.sh b/entrypoint.sh
index 8699021..3b2e712 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -38,7 +38,7 @@ if [ ! -f /etc/apache2/saml2/${SP_ID}.xml ]; then
popd
fi
-sed -i "s/{{SP_ID}}/${SP_ID}/g" /etc/apache2/conf.d/mod_auth_mellon.conf
+sed -i "s/{{SP_ID}}/${SP_ID}/g" /etc/apache2/conf-enabled/mod_auth_mellon.conf
# Check if database is available
if [ -z "$DB_SOCK" ]; then
--
GitLab