summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/base.pp4
-rw-r--r--manifests/client.pp5
-rw-r--r--manifests/client/centos.pp2
-rw-r--r--manifests/init.pp6
4 files changed, 9 insertions, 8 deletions
diff --git a/manifests/base.pp b/manifests/base.pp
index 94907ba..34c1cb8 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -15,8 +15,8 @@ class ekeyd::base {
enable => true,
}
- exec{'configure_ekey_key':
- command => "ekey-rekey `ekeydctl list | grep \"/dev/entropykey\" | awk -F, '{ print \$5}'` ${ekeyd::ekey_masterkey}",
+ 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'],
}
diff --git a/manifests/client.pp b/manifests/client.pp
index 89fd253..e7df4c4 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -1,5 +1,6 @@
-class ekeyd::client {
- if !$ekeyd_host { fail("\$ekeyd_host is not set for $fqdn") }
+class ekeyd::client(
+ $ekeyd_host
+) {
case $operatingsystem {
centos: { include ekeyd::client::centos }
default: { include ekeyd::client::base }
diff --git a/manifests/client/centos.pp b/manifests/client/centos.pp
index b9328bb..2a9315a 100644
--- a/manifests/client/centos.pp
+++ b/manifests/client/centos.pp
@@ -1,6 +1,6 @@
class ekeyd::client::centos inherits ekeyd::client::base {
file{'/etc/sysconfig/egd-linux':
- content => "DAEMON_HOST=${ekeyd_host}\n",
+ content => "DAEMON_HOST=${ekeyd::ekeyd_host}\n",
notify => Service['egd-linux'],
owner => root, group => 0, mode => 0644;
}
diff --git a/manifests/init.pp b/manifests/init.pp
index 83ee949..036ff82 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,13 +1,13 @@
class ekeyd(
- $ekey_host = false,
- $ekey_masterkey
+ $ekeyd_host = false,
+ $ekeyd_masterkey
){
if $ekeyd_key_present != 'true' { fail("Can't find an ekey key plugged into usb on ${fqdn}") }
include ekeyd::base
- if $ekey_host {
+ if $ekeyd_host {
case $operatingsystem {
centos: { include ekeyd::host::centos }
default: { include ekeyd::host::base }