From b97cfc0f86802af2eed36d8af3e43d577d6e3103 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Mon, 12 Feb 2018 00:41:18 +0100 Subject: [PATCH] make sure all files exist before making server.pem --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index f26ffd0e..2ac00cf6 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -164,7 +164,7 @@ class md_publisher(Array $allow_clients = ['any'], String $keyname = undef, Stri } -> exec {'server.pem': cmd => "cat /etc/ssl/private/${_keyname}.key /etc/ssl/certs/${_keyname}.crt > /etc/lighttpd/server.pem", - onlyif => "test ! -f /etc/lighttpd/server.pem" + onlyif => "test ! -f /etc/lighttpd/server.pem -a -f /etc/ssl/private/${_keyname}.key -a -f /etc/ssl/certs/${_keyname}.crt" } -> apparmor::profile { 'usr.sbin.lighttpd': source => '/etc/apparmor-cosmos/usr.sbin.lighttpd' } -> sunet::misc::ufw_allow {'allow-lighttpd':