summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaffael Schmid <raffael@yux.ch>2013-01-19 14:45:26 +0100
committerRaffael Schmid <raffael@yux.ch>2013-01-19 14:45:26 +0100
commit7c68d290a90f4f422e4279ec2218eb5620c585fe (patch)
tree49e8cfa773e367382c4fb8d3ac3a8bb74f7a0b86
parent47f3881a45567cc8747c9275a1b42f06cab35d0f (diff)
use tcp-server instead of tcp
-rw-r--r--manifests/server.pp2
-rw-r--r--spec/defines/openvpn_server_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/manifests/server.pp b/manifests/server.pp
index 3e2b3dc..cce6eb7 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -107,7 +107,7 @@ define openvpn::server(
$local = $::ipaddress_eth0,
$logfile = false,
$port = '1194',
- $proto = 'tcp',
+ $proto = 'tcp-server',
$status_log = "${name}/openvpn-status.log",
$user = 'nobody',
$server = '',
diff --git a/spec/defines/openvpn_server_spec.rb b/spec/defines/openvpn_server_spec.rb
index 6803745..ca72fc4 100644
--- a/spec/defines/openvpn_server_spec.rb
+++ b/spec/defines/openvpn_server_spec.rb
@@ -46,7 +46,7 @@ describe 'openvpn::server', :type => :define do
it { should contain_file('/etc/openvpn/test_server.conf').with_content(/^cert\s+\/etc\/openvpn\/test_server\/keys\/server.crt$/) }
it { should contain_file('/etc/openvpn/test_server.conf').with_content(/^key\s+\/etc\/openvpn\/test_server\/keys\/server.key$/) }
it { should contain_file('/etc/openvpn/test_server.conf').with_content(/^dh\s+\/etc\/openvpn\/test_server\/keys\/dh1024.pem$/) }
- it { should contain_file('/etc/openvpn/test_server.conf').with_content(/^proto\s+tcp$/) }
+ it { should contain_file('/etc/openvpn/test_server.conf').with_content(/^proto\s+tcp-server$/) }
it { should contain_file('/etc/openvpn/test_server.conf').with_content(/^port\s+1194$/) }
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$/) }