diff options
| -rw-r--r-- | manifests/server.pp | 6 | ||||
| -rw-r--r-- | spec/defines/openvpn_server_spec.rb | 2 | ||||
| -rw-r--r-- | templates/server.erb | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/manifests/server.pp b/manifests/server.pp index 5caa4be..3e2b3dc 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -46,8 +46,8 @@ # # [*logfile*] # String. Logfile for this openvpn server -# Default: '' -# Options: '' (syslog) or log file name +# Default: false +# Options: false (syslog) or log file name # # [*port*] # Integer. The port the openvpn server service is running on @@ -105,7 +105,7 @@ define openvpn::server( $group = 'nobody', $ipp = true, $local = $::ipaddress_eth0, - $logfile = "${name}/openvpn.log", + $logfile = false, $port = '1194', $proto = 'tcp', $status_log = "${name}/openvpn-status.log", diff --git a/spec/defines/openvpn_server_spec.rb b/spec/defines/openvpn_server_spec.rb index f9c4780..6803745 100644 --- a/spec/defines/openvpn_server_spec.rb +++ b/spec/defines/openvpn_server_spec.rb @@ -51,7 +51,7 @@ describe 'openvpn::server', :type => :define do it { should contain_file('/etc/openvpn/test_server.conf').with_content(/^comp-lzo$/) } it { should contain_file('/etc/openvpn/test_server.conf').with_content(/^group\s+nobody$/) } it { should contain_file('/etc/openvpn/test_server.conf').with_content(/^user\s+nobody$/) } - it { should contain_file('/etc/openvpn/test_server.conf').with_content(/^log\-append\s+test_server\/openvpn\.log$/) } + it { should_not contain_file('/etc/openvpn/test_server.conf').with_content(/^log\-append\s+test_server\/openvpn\.log$/) } it { should contain_file('/etc/openvpn/test_server.conf').with_content(/^status\s+test_server\/openvpn\-status\.log$/) } it { should contain_file('/etc/openvpn/test_server.conf').with_content(/^dev\s+tun0$/) } it { should contain_file('/etc/openvpn/test_server.conf').with_content(/^local\s+1\.2\.3\.4$/) } diff --git a/templates/server.erb b/templates/server.erb index 1ff9ba1..0421e24 100644 --- a/templates/server.erb +++ b/templates/server.erb @@ -11,7 +11,7 @@ port <%= scope.lookupvar('port') %> <% end -%> group <%= scope.lookupvar('group') %> user <%= scope.lookupvar('user') %> -<% if logfile != '' -%> +<% if logfile -%> log-append <%= scope.lookupvar('logfile') %> <% end -%> status <%= scope.lookupvar('status_log') %> |