swedenconnect/eid-ops
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move hsmproxy restart to hsm class

Browse source
This commit is contained in:
Leif Johansson 2018-07-25 16:17:30 +02:00
parent 8cf0bd29b2
commit a9551c10fa
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
global/overlay/etc/puppet/manifests/cosmos-site.pp
View file

@ -158,6 +158,13 @@ class eidas_hsm_client($luna_version="6.2") {
volumes => ['/dev/log:/dev/log','/etc/Chrystoki.conf.d:/etc/Chrystoki.conf.d','/etc/luna/cert:/usr/safenet/lunaclient/cert'], volumes => ['/dev/log:/dev/log','/etc/Chrystoki.conf.d:/etc/Chrystoki.conf.d','/etc/luna/cert:/usr/safenet/lunaclient/cert'],
env => ["PKCS11PIN=${pkcs11pin}"] env => ["PKCS11PIN=${pkcs11pin}"]
} }
sunet::scriptherder::cronjob { "${name}_restart_hsmproxy":
cmd => "/usr/sbin/service docker-${name}_hsmproxy restart'",
minute => '9',
hour => '0',
ok_criteria => ['exit_status=0','max_age=48h'],
warn_criteria => ['exit_status=1','max_age=50h'],
}
} }
class md_signer($dest_host=undef,$dest_dir="") { class md_signer($dest_host=undef,$dest_dir="") {
@ -168,13 +175,6 @@ class md_signer($dest_host=undef,$dest_dir="") {
pipeline => "${name}.fd", pipeline => "${name}.fd",
volumes => ["/etc/credentials:/etc/credentials"] volumes => ["/etc/credentials:/etc/credentials"]
} }
sunet::scriptherder::cronjob { "${name}_restart_hsmproxy":
cmd => "/usr/sbin/service docker-${name}-hsmproxy restart'",
minute => '9',
hour => '0',
ok_criteria => ['exit_status=0','max_age=48h'],
warn_criteria => ['exit_status=1','max_age=50h'],
}
if ($dest_host) { if ($dest_host) {
sunet::ssh_host_credential { "${name}-publish-credential": sunet::ssh_host_credential { "${name}-publish-credential":
hostname => $dest_host, hostname => $dest_host,