unify variable names

diff --git a/manifests/base.pp b/manifests/base.pp
index f10ef2f185870ef8ffd4ece0ae0327f5fd3029e1..42a670fa52101c756f9a48b630e34edfa3984d49 100644 (file)
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -9,7 +9,7 @@ class ekeyd::base {
   # SetOutputToKernel and one for EGDTCPSocket. But for now we're just going
   # to have puppet deliver the ekeyd.conf file.
   # * ekeyd will be setup to feed output to whatever is configured in the
-  #   variables: $ekeyd_address and $ekeyd_port with the defaults being
+  #   variables: $ekeyd_host and $ekeyd_port with the defaults being
   #   127.0.0.1 and 8888
   file{'/etc/entropykey/ekeyd.conf':
     content => $operatingsystem ? {

diff --git a/manifests/client/debian.pp b/manifests/client/debian.pp
deleted file mode 100644 (file)
index 005dfbd..0000000
--- a/manifests/client/debian.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class ekeyd::client::debian inherits ekeyd::client::base {
-  include ekeyd::egd::debian
-}

diff --git a/manifests/tunnel.pp b/manifests/tunnel.pp
index ccb3ecd79b6b4f89c0d12081fc6affa100ad87d4..086d106f9ab64e3c89520bc876ae2e603e504573 100644 (file)
--- a/manifests/tunnel.pp
+++ b/manifests/tunnel.pp
@@ -4,7 +4,7 @@ class ekeyd-tunnel {
 
   # set the ekeyd bind address/port that the actual ekeyd will use and this
   # tunnel will connect to
-  $ekeyd_address = '127.0.0.1'
+  $ekeyd_host = '127.0.0.1'
   $ekeyd_port = '8889'
 
   # the ekeyd class ensures that we're not on a vserver or xen domU
@@ -37,7 +37,7 @@ class egd-tunnel {
 
   # set the ekeyd bind address that egd will connect to, which is stunnel on
   # localhost, then the tunnel will connect to the tunnel on the ekeyd server
-  $ekeyd_address = '127.0.0.1'
+  $ekeyd_host = '127.0.0.1'
 
   # the egd class ensures that we're not on a vserver, so we're either
   # on a vhost, a xen dom0, a xen domU, or a plain old machine, all of

diff --git a/templates/ekeyd-egd-linux.default.erb b/templates/ekeyd-egd-linux.default.erb
index 33f1a7b83118165882df2bfd8eac2375e7ab505a..c4d4732d818026b5ffacb33941ed65962e2b8d2f 100644 (file)
--- a/templates/ekeyd-egd-linux.default.erb
+++ b/templates/ekeyd-egd-linux.default.erb
@@ -5,7 +5,7 @@
 START_EKEYD_EGD_LINUX=YES
 
 # Change this if you want it to be something other than the default
-HOST=<%= has_variable?("ekeyd_address") ? ekeyd_address : '127.0.0.1' %>
+HOST=<%= has_variable?("ekeyd_host") ? ekeyd_host : '127.0.0.1' %>
 <%= has_variable?("ekeyd_port") ? 'PORT=' + ekeyd_port : '#PORT=8888' %>
 
 # Number of bits minimum in the pool, below which the daemon will kick in