diff --git a/spec/defines/openvpn_server_spec.rb b/spec/defines/openvpn_server_spec.rb index ee63fcbf..8367faf1 100644 --- a/spec/defines/openvpn_server_spec.rb +++ b/spec/defines/openvpn_server_spec.rb @@ -645,6 +645,21 @@ it { is_expected.to contain_file('/etc/openvpn/test_server.conf').with_content(%r{^client\-disconnect\s+"/etc/openvpn/test_server/scripts/disconnect\.sh"$}) } end + context 'when not using status log' do + let(:params) do + { + 'country' => 'CO', + 'province' => 'ST', + 'city' => 'Some City', + 'organization' => 'example.org', + 'email' => 'testemail@example.org', + 'status_log' => '' + } + end + + it { is_expected.not_to contain_file("#{server_directory}/test_server.conf").with_content(%r{^status}) } + end + context 'when not using scripts' do let(:params) do { diff --git a/templates/server.erb b/templates/server.erb index 12c81e58..a4f9755d 100644 --- a/templates/server.erb +++ b/templates/server.erb @@ -77,7 +77,9 @@ user <%= @user %> <% if @logfile -%> log-append <%= @logfile %> <% end -%> +<% if @status_log != '' -%> status <%= @status_log %> +<% end -%> <% if @status_version != '' -%> status-version <%= @status_version %> <% end -%>