diff --git a/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp b/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp index 78d2774..01dac7d 100644 --- a/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp +++ b/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp @@ -104,7 +104,7 @@ class soc::intelmq( owner => 'intelmq', group => 'intelmq', mode => '0444', - content => 'soc/intelmq/api-config.json', + content => file('soc/intelmq/api-config.json)', } file { '/etc/intelmq/api-session.sqlite': @@ -117,13 +117,13 @@ class soc::intelmq( file { '/etc/systemd/system/intelmq-api.service': ensure => file, - content => 'soc/intelmq/intelmq-api.service', + content => file('soc/intelmq/intelmq-api.service'), notify => [Class['sunet::systemd_reload'], Service['intelmq-api.service'],], } file { '/etc/systemd/system/intelmq-api.socket': ensure => file, - content => 'soc/intelmq/intelmq-api.socket', + content => file('soc/intelmq/intelmq-api.socket'), notify => [Class['sunet::systemd_reload'], Service['intelmq-api.socket'],], } diff --git a/global/overlay/etc/puppet/modules/soc/templates/intelmq/intelmq-vhost.conf.erb b/global/overlay/etc/puppet/modules/soc/templates/intelmq/intelmq-vhost.conf.erb index efe8a1d..e2f787b 100644 --- a/global/overlay/etc/puppet/modules/soc/templates/intelmq/intelmq-vhost.conf.erb +++ b/global/overlay/etc/puppet/modules/soc/templates/intelmq/intelmq-vhost.conf.erb @@ -16,8 +16,8 @@ SSLEngine on <% if @use_snakeoil -%> - SSLCertificateFile /etc/letsencrypt/live/intelmq-test.cert.sunet.se/cert.pem - SSLCertificateKeyFile /etc/letsencrypt/live/intelmq-test.cert.sunet.se/privkey.pem + SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem + SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key <% else -%> SSLCertificateFile <%= @tls_cert %> SSLCertificateKeyFile <%= @tls_key %>