diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2011-06-30 01:48:11 -0300 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2011-06-30 01:48:11 -0300 |
commit | 2b377786f8bf2133019c43df9376e0363093e50d (patch) | |
tree | 1e8e0709f78adff0d9b87fa0de79ca50ddd3e97b /manifests/base.pp | |
parent | 87418479b280ccbbaca808711516dce989cdf36d (diff) | |
parent | 1f2a5d682485ea0cbdc9e13d865485face539012 (diff) | |
download | puppet-ekeyd-2b377786f8bf2133019c43df9376e0363093e50d.tar.gz puppet-ekeyd-2b377786f8bf2133019c43df9376e0363093e50d.tar.bz2 |
Merge branch 'master' of git://git.puppet.immerda.ch/module-ekeyd
Diffstat (limited to 'manifests/base.pp')
-rw-r--r-- | manifests/base.pp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index e4d572d..34c1cb8 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -4,15 +4,20 @@ class ekeyd::base { ensure => installed, } + file{'/etc/entropykey/ekeyd.conf': + source => 'puppet:///modules/ekeyd/ekeyd.conf', + require => Package['ekeyd'], + notify => Service['ekeyd'], + owner => root, group => 0, mode => 0644; + } service{'ekeyd': ensure => running, enable => true, - require => Package['ekeyd'], } - exec{'configure_ekey_key': - command => "ekey-rekey `ekeydctl list | grep \"/dev/entropykey\" | awk -F, '{ print \$5}'` ${ekey_masterkey}", - unless => "ekeydctl list | grep -q 'Running OK'", - require => Service['ekeyd'], + exec{'configure_ekeyd_key': + command => "ekey-rekey `ekeydctl list | grep \"/dev/entropykey\" | awk -F, '{ print \$5}'` ${ekeyd::ekeyd_masterkey}", + unless => "ekeydctl list | grep -q 'Running OK'", + require => Service['ekeyd'], } } |