From: Luca Filipozzi Date: Sun, 12 Jan 2014 09:50:15 +0000 (+0000) Subject: try concatenation X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=55eb28d2776ddeabd4249bb286b420d3c33a6dbe try concatenation --- diff --git a/modules/roles/manifests/sip.pp b/modules/roles/manifests/sip.pp index b9514d3a..b2700307 100644 --- a/modules/roles/manifests/sip.pp +++ b/modules/roles/manifests/sip.pp @@ -1,22 +1,23 @@ class roles::sip { - #include concat::setup + include concat::setup ssl::service { 'www.debian.org': + # TODO notify concat } - #concat { '/etc/ssl/debian/certs/www.debian.org-chained.crt': - # ensure => present, - #} - #concat::fragment { '/etc/ssl/debian/certs/www.debian.org.crt': - # target => '/etc/ssl/debian/certs/www.debian.org-chained.crt', - # source => 'file:///etc/ssl/debian/certs/www.debian.org.crt', - # order => 00, - #} - #concat::fragment { '/etc/ssl/debian/certs/www.debian.org.crt-chain': - # target => '/etc/ssl/debian/certs/www.debian.org-chained.crt', - # source => 'file:///etc/ssl/debian/certs/www.debian.org.crt-chain', - # order => 99, - #} + # TODO concatate in the ssl module? + concat { '/etc/ssl/debian/certs/www.debian.org-chained.crt': + } + concat::fragment { '/etc/ssl/debian/certs/www.debian.org.crt': + target => '/etc/ssl/debian/certs/www.debian.org-chained.crt', + source => 'file:///etc/ssl/debian/certs/www.debian.org.crt', + order => 00, + } + concat::fragment { '/etc/ssl/debian/certs/www.debian.org.crt-chain': + target => '/etc/ssl/debian/certs/www.debian.org-chained.crt', + source => 'file:///etc/ssl/debian/certs/www.debian.org.crt-chain', + order => 99, + } @ferm::rule { 'dsa-sip-ws-ip4': domain => 'ip',