From 462ba36daac2ef4f1ffd2d3e8690debccc5e38db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20K=C3=B6nig?= <Alexander.Koenig@eurac.edu>
Date: Tue, 10 Oct 2017 11:58:39 +0200
Subject: [PATCH] modified files to use the new clarin/clarin-dev host
certificates
---
Dockerfile.nginx | 8 ++++----
clarin-dev2clarin.sh | 2 --
commul-customization/default-ssl | 4 ++--
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/Dockerfile.nginx b/Dockerfile.nginx
index 5cb9399..2692658 100644
--- a/Dockerfile.nginx
+++ b/Dockerfile.nginx
@@ -89,14 +89,14 @@ RUN touch /opt/repository/sources/lindat-aai-discovery/aai.js
RUN make aai.min.js
# copy certificate for clarin-dev
-COPY commul-customization/certs/lindat-dev.key /etc/ssl/private/
-COPY commul-customization/certs/lindat-dev_eurac_edu.pem /etc/ssl/certs/
+COPY commul-customization/certs/clarin-dev.key /etc/ssl/private/
+COPY commul-customization/certs/clarin-dev_eurac_edu.crt /etc/ssl/certs/
# if deployed on clarin instead of clarin-dev comment the two lines above and uncomment the following lines
## copy certificate for clarin
-# COPY commul-customization/certs/lindat_eurac_edu.key /etc/ssl/private/
-# COPY commul-customization/certs/lindat_eurac_edu.crt /etc/ssl/certs/
+# COPY commul-customization/certs/clarin.key /etc/ssl/private/
+# COPY commul-customization/certs/clarin_eurac_edu.crt /etc/ssl/certs/
ENTRYPOINT ["/usr/local/bin/supervisord", "-c", "/etc/supervisord.conf"]
diff --git a/clarin-dev2clarin.sh b/clarin-dev2clarin.sh
index 303c580..dad4da7 100755
--- a/clarin-dev2clarin.sh
+++ b/clarin-dev2clarin.sh
@@ -3,8 +3,6 @@
# outside the docker
perl -pi -e 's/clarin-dev/clarin/g' commul-customization/shibboleth2.xml
perl -pi -e 's/clarin-dev/clarin/g' commul-customization/local.properties
-perl -pi -e 's/lindat-dev_eurac_edu.pem/lindat_eurac_edu.crt/;' commul-customization/default-ssl
-perl -pi -e 's/lindat-dev.key/lindat_eurac_edu.key/;' commul-customization/default-ssl
perl -pi -e 's/clarin-dev/clarin/g' commul-customization/default-ssl
perl -pi -e 's/clarin-dev/clarin/g' commul-customization/aai.js
diff --git a/commul-customization/default-ssl b/commul-customization/default-ssl
index 2164a1f..c9cb0ff 100644
--- a/commul-customization/default-ssl
+++ b/commul-customization/default-ssl
@@ -18,8 +18,8 @@ server {
index index.html index.htm;
ssl on;
- ssl_certificate /etc/ssl/certs/lindat-dev_eurac_edu.pem;
- ssl_certificate_key /etc/ssl/private/lindat-dev.key;
+ ssl_certificate /etc/ssl/certs/clarin-dev_eurac_edu.crt;
+ ssl_certificate_key /etc/ssl/private/clarin-dev.key;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
ssl_ciphers RC4:HIGH:!aNULL:!MD5;
--
GitLab