From: Bastian Blank <bastian.blank@credativ.de>
Date: Fri, 9 Feb 2018 12:45:03 +0000 (+0100)
Subject: Move generated cert files to new location
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=46239f2eec3b006fe8b98987d0e03475c650cb58;p=mirror%2Fdsa-puppet.git

Move generated cert files to new location
---

diff --git a/spec/octocatalog/init-env b/spec/octocatalog/init-env
index da0e36962..7ebb0af5b 100755
--- a/spec/octocatalog/init-env
+++ b/spec/octocatalog/init-env
@@ -4,7 +4,4 @@ set -euE
 for env in $ENV_BASE $ENV_TEST; do
   mkdir -p environments/$env/modules/nagios/files/dsa-nagios/generated/
   touch environments/$env/modules/nagios/files/dsa-nagios/generated/nrpe_dsa.cfg
-
-  ln -fs /etc/puppet/modules/exim/files/certs environments/$env/modules/exim/files/
-  ln -fs /etc/puppet/modules/ssl/files/clientcerts environments/$env/modules/ssl/files/
 done
diff --git a/spec/octocatalog/init-system b/spec/octocatalog/init-system
index 521432587..b706ecada 100755
--- a/spec/octocatalog/init-system
+++ b/spec/octocatalog/init-system
@@ -1,25 +1,23 @@
 #!/bin/bash
 set -euE
 
-function puppetfile() {
+function file() {
   for i in "$@"; do
-    f="/etc/puppet/$i"
-    mkdir -p $(dirname $f)
-    echo "file $i" > $f
+    mkdir -p $(dirname $i)
+    echo "file $i" > $i
   done
 }
 
-mkdir -p /etc/puppet /var/lib/puppet/yaml/node/
-touch /etc/puppet/secret
+file /etc/puppet/secret
 
-puppetfile modules/exim/files/certs/ca.{crl,crt}
-puppetfile modules/ssl/files/clientcerts/ca.{crl,crt}
+file /srv/puppet.debian.org/ca/RESULT/certs/ca.{crl,crt}
+file /srv/puppet.debian.org/ca/RESULT/clientcerts/ca.{crl,crt}
 
 for fact in spec/octocatalog/facts/*; do
   hostname=$(basename $fact .json)
 
-  puppetfile modules/exim/files/certs/$hostname.{crt,key}
-  puppetfile modules/ssl/files/clientcerts/$hostname.{client.crt,key}
+  file /srv/puppet.debian.org/ca/RESULT/certs/$hostname.{crt,key}
+  file /srv/puppet.debian.org/ca/RESULT/clientcerts/$hostname.{client.crt,key}
 
-  touch /var/lib/puppet/yaml/node/$hostname.yaml
+  file /var/lib/puppet/yaml/node/$hostname.yaml
 done