From 9d7ccf9058163f4b762f2623bfc240da9016bb02 Mon Sep 17 00:00:00 2001
From: pierreozoux <pierre@ozoux.net>
Date: Wed, 4 Mar 2015 11:53:36 +0000
Subject: [PATCH] Moves certs to dir
---
{scripts => certs}/ca-sha2.pem | 0
{scripts => certs}/sub.class1.server.sha2.ca.pem | 0
{scripts => certs}/sub.class2.server.sha2.ca.pem | 0
scripts/provision.sh | 2 +-
4 files changed, 1 insertion(+), 1 deletion(-)
rename {scripts => certs}/ca-sha2.pem (100%)
rename {scripts => certs}/sub.class1.server.sha2.ca.pem (100%)
rename {scripts => certs}/sub.class2.server.sha2.ca.pem (100%)
diff --git a/scripts/ca-sha2.pem b/certs/ca-sha2.pem
similarity index 100%
rename from scripts/ca-sha2.pem
rename to certs/ca-sha2.pem
diff --git a/scripts/sub.class1.server.sha2.ca.pem b/certs/sub.class1.server.sha2.ca.pem
similarity index 100%
rename from scripts/sub.class1.server.sha2.ca.pem
rename to certs/sub.class1.server.sha2.ca.pem
diff --git a/scripts/sub.class2.server.sha2.ca.pem b/certs/sub.class2.server.sha2.ca.pem
similarity index 100%
rename from scripts/sub.class2.server.sha2.ca.pem
rename to certs/sub.class2.server.sha2.ca.pem
diff --git a/scripts/provision.sh b/scripts/provision.sh
index 0bc94fb..70e5599 100755
--- a/scripts/provision.sh
+++ b/scripts/provision.sh
@@ -231,7 +231,7 @@ function generate_certificate () {
cat > ${TLS_FOLDER}/CSR/${arg_u}.crt
info "Concat certificate, CA and key into pem file."
- cat ${TLS_FOLDER}/CSR/${arg_u}.crt /data/indiehosters/scripts/sub.class2.server.sha2.ca.pem /data/indiehosters/scripts/ca-sha2.pem ${TLS_FOLDER}/CSR/${arg_u}.key > ${TLS_FOLDER}/${arg_u}.pem
+ cat ${TLS_FOLDER}/CSR/${arg_u}.crt /data/indiehosters/certs/sub.class2.server.sha2.ca.pem /data/indiehosters/certs/ca-sha2.pem ${TLS_FOLDER}/CSR/${arg_u}.key > ${TLS_FOLDER}/${arg_u}.pem
}
function configure_dns () {
--
GitLab