diff options
| author | varac <varacanero@zeromail.org> | 2013-09-19 12:32:35 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-09-19 12:36:46 +0200 |
| commit | 12d22a47ad529f02e0c6d27b25f7ddaa17a32727 (patch) | |
| tree | aa96075d0a487e71070474c3c9ba5b811f903adb | |
| parent | c68399c019d09a4c8ba44f47936b4b3842802177 (diff) | |
soledad should use default key, cert and ca (Feature #3841)
| -rw-r--r-- | puppet/modules/soledad/manifests/server.pp | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/puppet/modules/soledad/manifests/server.pp b/puppet/modules/soledad/manifests/server.pp index c0af238c..0c073443 100644 --- a/puppet/modules/soledad/manifests/server.pp +++ b/puppet/modules/soledad/manifests/server.pp @@ -12,29 +12,9 @@ class soledad::server { include site_config::x509::cert_key include site_config::x509::ca - $x509 = hiera('x509') - $x509_key = $x509['key'] - $x509_cert = $x509['cert'] - $x509_ca = $x509['ca_cert'] - $soledad = hiera('soledad') $soledad_port = $soledad['port'] - x509::key { 'soledad': - content => $x509_key, - notify => Service['soledad-server']; - } - - x509::cert { 'soledad': - content => $x509_cert, - notify => Service['soledad-server']; - } - - x509::ca { 'soledad': - content => $x509_ca, - notify => Service['soledad-server']; - } - # # SOLEDAD CONFIG # @@ -50,8 +30,9 @@ class soledad::server { package { 'soledad-server': ensure => latest, - require => [ Class['site_apt::preferences::twisted'], - Class['site_apt::leap_repo'] ]; + require => [ + Class['site_apt::preferences::twisted'], + Class['site_apt::leap_repo'] ]; } file { '/etc/default/soledad': @@ -68,7 +49,11 @@ class soledad::server { enable => true, hasstatus => true, hasrestart => true, - require => [ Class['soledad'], Package['soledad-server'] ]; + require => [ + Class['soledad'], + Package['soledad-server'], + Class['Site_config::X509::Cert_key'], + Class['Site_config::X509::Ca'] ]; } include site_shorewall::soledad |