From: Bastian Blank <bastian.blank@credativ.de>
Date: Fri, 9 Feb 2018 12:49:13 +0000 (+0100)
Subject: Move nagios stuff
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=56603b2b4568d519ddda887ceff1ff2cfe7c0427

Move nagios stuff
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4b3e9adb0..642c68d79 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,6 @@
     - git branch -f $ENV_TEST $CI_BUILD_REF
     - bundle exec r10k deploy environment --puppetfile --verbose debug $ENV_BASE $ENV_TEST
     - spec/octocatalog/init-system
-    - spec/octocatalog/init-env
     - spec/octocatalog/run-octocatalog
 
 test-octocatalog/master:
diff --git a/spec/octocatalog/init-env b/spec/octocatalog/init-env
deleted file mode 100755
index 7ebb0af5b..000000000
--- a/spec/octocatalog/init-env
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-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
-done
diff --git a/spec/octocatalog/init-system b/spec/octocatalog/init-system
index b706ecada..93d8480e1 100755
--- a/spec/octocatalog/init-system
+++ b/spec/octocatalog/init-system
@@ -13,6 +13,8 @@ file /etc/puppet/secret
 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
+
 for fact in spec/octocatalog/facts/*; do
   hostname=$(basename $fact .json)