also do the client with a parametrized class and cleanup/finish the host part

diff --git a/manifests/base.pp b/manifests/base.pp
index 94907bac3c5b30ec44aaada43e13d6f7d0beec03..34c1cb81cc213a6a5053412cfcebda8550bb1c02 100644 (file)
--- 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 89fd25383a34982c834c6e5f515fc7aacafe032b..e7df4c41c8479c6faa50c760f424899d50a1c13d 100644 (file)
--- 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 b9328bbcd353eaa191f54ca322da87e58e152622..2a9315ac0f3eac8c2fcd789ba4bc3d2a6fe322fe 100644 (file)
--- 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 83ee94941e6a1caad427e60862ef29eaf7643061..036ff82efb3fe4ea3b2f3267e44612c7560d5732 100644 (file)
--- 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 }