diff options
| -rw-r--r-- | global/overlay/etc/puppet/manifests/cosmos-site.pp | 10 | ||||
| -rw-r--r-- | global/overlay/etc/puppet/modules/sunet/manifests/ici_ca.pp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 299ed1c..b56fe08 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -815,16 +815,16 @@ node 'web-a1.sunet.se' { } node 'ca.sunet.se' { - class { 'sunet::dockerhost': } + class { 'sunet::dockerhost': } -> sunet::docker_run { "ca.sunet.se_apache": image => 'apache', imagetag => '2.4', ports => ["80:80"] } - file { "/var/lib/ca/infra/requests/client": ensure => directory } - sunet::ici_ca(pkcs11_pin => hiera('ca_infra_pkcs11_pin'), - autosign_dir => "/var/lib/ca/infra/requests/client", - autosign_type => "client", + file { "/var/lib/ca/infra/requests/client": ensure => directory } -> + sunet::ici_ca(pkcs11_pin => hiera('ca_infra_pkcs11_pin'), + autosign_dir => "/var/lib/ca/infra/requests/client", + autosign_type => "client", public_repo_url => "http://ca.sunet.se/infra", public_repo_dir => "/var/www/html/infra") } diff --git a/global/overlay/etc/puppet/modules/sunet/manifests/ici_ca.pp b/global/overlay/etc/puppet/modules/sunet/manifests/ici_ca.pp index b4175a9..97839e8 100644 --- a/global/overlay/etc/puppet/modules/sunet/manifests/ici_ca.pp +++ b/global/overlay/etc/puppet/modules/sunet/manifests/ici_ca.pp @@ -19,7 +19,7 @@ define sunet::ici_ca($pkcs11_module="/usr/lib/softhsm/libsofthsm.so", } -> if ($autosign_dir) { cron {'ici_autosign': - command => "test -f /var/lib/ici/${name}/ca.crt && /usr/bin/ici ${name} -t ${autosign_type} issue ${autosign_dir}" + command => "test -f /var/lib/ici/${name}/ca.crt && /usr/bin/ici ${name} issue -t ${autosign_type} ${autosign_dir}" user => "root", minut => "*/5" } |