diff options
| author | Micah Anderson <micah@riseup.net> | 2009-10-02 18:02:20 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2009-10-02 18:02:20 -0400 |
| commit | ce6a688e30db5e1833a14cadb7d4709a15964b08 (patch) | |
| tree | a2a456fa466d1eddcb2598236810c511e497fc4b | |
| parent | 666500f0ff8ccd48378ba883c21d99dd9ab146be (diff) | |
fix the client variable configuration in the template
also fix the service depending on the unnecessary stunnel.conf
| -rw-r--r-- | manifests/init.pp | 6 | ||||
| -rw-r--r-- | templates/client.conf.erb | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 6693bc2..bdf6346 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -73,8 +73,7 @@ class stunnel::base { name => 'stunnel', enable => true, ensure => running, - hasstatus => false, - require => File["/etc/stunnel/stunnel.conf"]; + hasstatus => false; } if $use_nagios { @@ -91,9 +90,6 @@ class stunnel::linux inherits stunnel::base { package { 'stunnel': ensure => $stunnel_ensure_version } - File[stunnel_config]{ - require => Package[stunnel] - } } diff --git a/templates/client.conf.erb b/templates/client.conf.erb index 4f4ce61..579d537 100644 --- a/templates/client.conf.erb +++ b/templates/client.conf.erb @@ -43,5 +43,5 @@ end -%> <%- end end -%> -<%= 'client = ' + client ? 'yes' : 'no' %> +client = <%= client ? 'yes' : 'no' %> |