X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=spec%2Foctocatalog%2Finit-system;h=e3ad09d1a3864d6379c9f667ee92cb59589bcd00;hb=cf3412823aff674c856a7c281264cc53c1f089fb;hp=521432587a379bbeb5122978f1fdb7fc1d8056cf;hpb=8913a4afac41d2eecbaec185a5e4600505bc7b83;p=mirror%2Fdsa-puppet.git

diff --git a/spec/octocatalog/init-system b/spec/octocatalog/init-system
index 521432587..e3ad09d1a 100755
--- a/spec/octocatalog/init-system
+++ b/spec/octocatalog/init-system
@@ -1,25 +1,27 @@
 #!/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}
+
+file /srv/puppet.debian.org/sync/data/dsa-nagios/generated/nrpe_dsa.cfg
+
+file /srv/puppet.debian.org/from-letsencrypt/salsa.debian.org.{crt,crt-chain,crt-chained,key}
 
 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