verglasz/soc-ops
0
0
Fork 0
forked from SUNET/soc-ops
Code Pull requests Activity

Bugfix.

Browse source
This commit is contained in:
Johan Björklund 2024-11-14 14:30:19 +01:00
parent b3856a7039
commit 8e1bd9b783
Signed by untrusted user: bjorklund
GPG key ID: 5E8401339C7F5037
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp
View file

@ -104,7 +104,7 @@ class soc::intelmq(
owner => 'intelmq', owner => 'intelmq',
group => 'intelmq', group => 'intelmq',
mode => '0444', mode => '0444',
content => 'soc/intelmq/api-config.json', content => file('soc/intelmq/api-config.json)',
} }
file { '/etc/intelmq/api-session.sqlite': file { '/etc/intelmq/api-session.sqlite':
@ -117,13 +117,13 @@ class soc::intelmq(
file { '/etc/systemd/system/intelmq-api.service': file { '/etc/systemd/system/intelmq-api.service':
ensure => file, ensure => file,
content => 'soc/intelmq/intelmq-api.service', content => file('soc/intelmq/intelmq-api.service'),
notify => [Class['sunet::systemd_reload'], Service['intelmq-api.service'],], notify => [Class['sunet::systemd_reload'], Service['intelmq-api.service'],],
} }
file { '/etc/systemd/system/intelmq-api.socket': file { '/etc/systemd/system/intelmq-api.socket':
ensure => file, ensure => file,
content => 'soc/intelmq/intelmq-api.socket', content => file('soc/intelmq/intelmq-api.socket'),
notify => [Class['sunet::systemd_reload'], Service['intelmq-api.socket'],], notify => [Class['sunet::systemd_reload'], Service['intelmq-api.socket'],],
} }

4
global/overlay/etc/puppet/modules/soc/templates/intelmq/intelmq-vhost.conf.erb
View file

@ -16,8 +16,8 @@
SSLEngine on SSLEngine on
<% if @use_snakeoil -%> <% if @use_snakeoil -%>
SSLCertificateFile /etc/letsencrypt/live/intelmq-test.cert.sunet.se/cert.pem SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
SSLCertificateKeyFile /etc/letsencrypt/live/intelmq-test.cert.sunet.se/privkey.pem SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
<% else -%> <% else -%>
SSLCertificateFile <%= @tls_cert %> SSLCertificateFile <%= @tls_cert %>
SSLCertificateKeyFile <%= @tls_key %> SSLCertificateKeyFile <%= @tls_key %>