diff options
| author | mh <mh@immerda.ch> | 2011-07-07 01:42:30 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2011-07-07 01:42:30 +0200 |
| commit | dc73c5667a51f45962c570e7e36a0c6e84d91f18 (patch) | |
| tree | 2fc592d0dffcb793e68a84041d7c834f61e1fca6 | |
| parent | 4be11ed77eadf54dc98513c11ef9686be225c635 (diff) | |
| download | puppet-ekeyd-dc73c5667a51f45962c570e7e36a0c6e84d91f18.tar.gz puppet-ekeyd-dc73c5667a51f45962c570e7e36a0c6e84d91f18.tar.bz2 | |
unify variable names
| -rw-r--r-- | manifests/base.pp | 2 | ||||
| -rw-r--r-- | manifests/client/debian.pp | 3 | ||||
| -rw-r--r-- | manifests/tunnel.pp | 4 | ||||
| -rw-r--r-- | templates/ekeyd-egd-linux.default.erb | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index f10ef2f..42a670f 100644 --- 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 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 ccb3ecd..086d106 100644 --- 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 33f1a7b..c4d4732 100644 --- 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 |