diff options
| author | Micah Anderson <micah@riseup.net> | 2009-10-02 19:06:13 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2009-10-02 19:06:13 -0400 |
| commit | 889128009577f3c588d954054edd4acb1cab3a44 (patch) | |
| tree | c858c5c185774d006f8652317124f14a663e5188 | |
| parent | ce6a688e30db5e1833a14cadb7d4709a15964b08 (diff) | |
switch parameters to lowercase, seems to be a puppet restriction
| -rw-r--r-- | manifests/init.pp | 28 | ||||
| -rw-r--r-- | templates/client.conf.erb | 10 |
2 files changed, 19 insertions, 19 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index bdf6346..ac060ba 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -24,26 +24,26 @@ class stunnel { default: { include stunnel::default } } - define client ( $ensure = present, $accept = false, $CApath = false, - $CAfile = false, $cert = false, $chroot = false, + define client ( $ensure = present, $accept = false, $capath = false, + $cafile = false, $cert = false, $chroot = false, $ciphers = false, $client = false, $compress = - false, $connect = false, $CRLpath = false, $CRLfile - = false, $debuglevel = false, $delay = false, $EGD = + false, $connect = false, $crlpath = false, $crlfile + = false, $debuglevel = false, $delay = false, $egd = false, $engine = false, $engineCtrl = false, - $engineNum = false, $exec = false, $execargs = + $enginenum = false, $exec = false, $execargs = false, $failover = false, $ident = false, $key = - false, $local = false, $OSCP = false, $OCSPflag = + false, $local = false, $oscp = false, $ocspflag = false, $options = false, $output = false, $pid = - false, $protocol = false, $protocolAuthentication = - false, $protocolHost = false, $protocolPassword = - false, $protocolUsername = false, $pty = false, - $retry = false, $RNDbytes = false, $RNDfile = false, - $RNDoverwrite = false, $service = false, $session = + false, $protocol = false, $protocolauthentication = + false, $protocolhost = false, $protocolpassword = + false, $protocolusername = false, $pty = false, + $retry = false, $rndbytes = false, $rndfile = false, + $rndoverwrite = false, $service = false, $session = false, $setuid = "stunnel4", $setgid = "stunnel4", $socket = [ "l:TCP_NODELAY=1", "r:TCP_NODELAY=1"], - $sslVersion = "SSLv3", $stack = false, $syslog = - false, $TIMEOUTbusy = false, $TIMEOUTclose = false, - $TIMEOUTconnect = false, $TIMEOUTidle = false, + $sslversion = "SSLv3", $stack = false, $syslog = + false, $timeoutbusy = false, $timeoutclose = false, + $timeoutconnect = false, $timeoutidle = false, $transparent = false, $verify = false ) { $real_client = $client ? { default => "yes" } diff --git a/templates/client.conf.erb b/templates/client.conf.erb index 579d537..13bfef7 100644 --- a/templates/client.conf.erb +++ b/templates/client.conf.erb @@ -25,7 +25,7 @@ end -%> end end -%> -<%- %w{EGD engine engineCtrl RNDbytes RNDfile RNDoverwrite}.each do |v| +<%- %w{egd engine enginectrl rndbytes rndfile rndoverwrite}.each do |v| if has_variable?(v) and instance_variable_get("@#{v}").to_s != "false" -%> <%= v + " = " + instance_variable_get("@#{v}").to_s %> <%- @@ -34,10 +34,10 @@ end -%> ; Service-level configuration <%= '[' + name + ']' %> -<%- %w{accept CApath CAfile cert ciphers connect CRLpath CRLfile delay engineNum exec - execargs failover ident key local OSCP OCSPflag options protocol protocolAuthentication - protocolHost protocolPassword protocolUsername pty retry session sslVersion stack - TIMEOUTbusy TIMEOUTclose TIMEOUTconnect TIMEOUTidle transparent verify}.each do |v| +<%- %w{accept capath cafile cert ciphers connect crlpath crlfile delay enginenum exec + execargs failover ident key local oscp ocspflag options protocol protocolauthentication + protocolhost protocolpassword protocolusername pty retry session sslversion stack + timeoutbusy timeoutclose timeoutconnect timeoutidle transparent verify}.each do |v| if has_variable?(v) and instance_variable_get("@#{v}").to_s != "false" -%> <%= v + ' = ' + instance_variable_get("@#{v}").to_s %> <%- |