Skip to content

Commit 04a914a

Browse files
david22swandavid22swan
authored
Merge pull request #2294 from traylenator/timeout
Allow integers for timeouts
2 parents b9547ef + 5243360 commit 04a914a

File tree

4 files changed

+60
-29
lines changed

4 files changed

+60
-29
lines changed

‎manifests/mod/auth_cas.pp

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -87,28 +87,28 @@
8787
class apache::mod::auth_cas (
8888
String $cas_login_url,
8989
String $cas_validate_url,
90-
String $cas_cookie_path = $apache::params::cas_cookie_path,
91-
Stdlib::Filemode $cas_cookie_path_mode = '0750',
92-
Integer $cas_version = 2,
93-
String $cas_debug = 'Off',
94-
Optional[String] $cas_validate_server = undef,
95-
Optional[String] $cas_validate_depth = undef,
96-
Optional[String] $cas_certificate_path = undef,
97-
Optional[String] $cas_proxy_validate_url = undef,
98-
Optional[String] $cas_root_proxied_as = undef,
99-
Optional[String] $cas_cookie_entropy = undef,
100-
Optional[String] $cas_timeout = undef,
101-
Optional[String] $cas_idle_timeout = undef,
102-
Optional[String] $cas_cache_clean_interval = undef,
103-
Optional[String] $cas_cookie_domain = undef,
104-
Optional[String] $cas_cookie_http_only = undef,
105-
Optional[String] $cas_authoritative = undef,
106-
Optional[String] $cas_validate_saml = undef,
107-
Optional[String] $cas_sso_enabled = undef,
108-
Optional[String] $cas_attribute_prefix = undef,
109-
Optional[String] $cas_attribute_delimiter = undef,
110-
Optional[String] $cas_scrub_request_headers = undef,
111-
Boolean $suppress_warning = false,
90+
String $cas_cookie_path = $apache::params::cas_cookie_path,
91+
Stdlib::Filemode $cas_cookie_path_mode = '0750',
92+
Integer $cas_version = 2,
93+
String $cas_debug = 'Off',
94+
Optional[String] $cas_validate_server = undef,
95+
Optional[String] $cas_validate_depth = undef,
96+
Optional[String] $cas_certificate_path = undef,
97+
Optional[String] $cas_proxy_validate_url = undef,
98+
Optional[String] $cas_root_proxied_as = undef,
99+
Optional[String] $cas_cookie_entropy = undef,
100+
Optional[Variant[Integer[0],String]] $cas_timeout = undef,
101+
Optional[Variant[Integer[0],String]] $cas_idle_timeout = undef,
102+
Optional[String] $cas_cache_clean_interval = undef,
103+
Optional[String] $cas_cookie_domain = undef,
104+
Optional[String] $cas_cookie_http_only = undef,
105+
Optional[String] $cas_authoritative = undef,
106+
Optional[String] $cas_validate_saml = undef,
107+
Optional[String] $cas_sso_enabled = undef,
108+
Optional[String] $cas_attribute_prefix = undef,
109+
Optional[String] $cas_attribute_delimiter = undef,
110+
Optional[String] $cas_scrub_request_headers = undef,
111+
Boolean $suppress_warning = false,
112112
) inherits apache::params {
113113
if $facts['os']['family'] == 'RedHat' and ! $suppress_warning {
114114
warning('RedHat distributions do not have Apache mod_auth_cas in their default package repositories.')

‎manifests/mod/proxy.pp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
# @see https://httpd.apache.org/docs/current/mod/mod_proxy.html for additional documentation.
2626
#
2727
class apache::mod::proxy (
28-
String $proxy_requests = 'Off',
29-
Optional[String] $allow_from = undef,
30-
Optional[String] $apache_version = undef,
31-
Optional[String] $package_name = undef,
32-
String $proxy_via = 'On',
33-
Optional[String] $proxy_timeout = undef,
34-
Optional[String] $proxy_iobuffersize = undef,
28+
String $proxy_requests = 'Off',
29+
Optional[String] $allow_from = undef,
30+
Optional[String] $apache_version = undef,
31+
Optional[String] $package_name = undef,
32+
String $proxy_via = 'On',
33+
Optional[Variant[Integer[0],String]] $proxy_timeout = undef,
34+
Optional[String] $proxy_iobuffersize = undef,
3535
) {
3636
include apache
3737
$_proxy_timeout = $apache::timeout

‎spec/classes/mod/auth_cas_spec.rb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
{
2121
cas_login_url: 'https://cas.example.com/login',
2222
cas_validate_url: 'https://cas.example.com/validate',
23+
cas_timeout: 1234,
24+
cas_idle_timeout: 4321,
2325
}
2426
end
2527

@@ -32,6 +34,8 @@
3234
it { is_expected.to contain_package('libapache2-mod-auth-cas') }
3335
it { is_expected.to contain_file('auth_cas.conf').with_path('/etc/apache2/mods-available/auth_cas.conf') }
3436
it { is_expected.to contain_file('/var/cache/apache2/mod_auth_cas/').with_owner('www-data') }
37+
it { is_expected.to contain_file('auth_cas.conf').with_content(%r{CASTimeout 1234}) }
38+
it { is_expected.to contain_file('auth_cas.conf').with_content(%r{CASIdleTimeout 4321}) }
3539
end
3640
context 'on a RedHat OS', :compile do
3741
include_examples 'RedHat 6'
@@ -42,6 +46,8 @@
4246
it { is_expected.to contain_package('mod_auth_cas') }
4347
it { is_expected.to contain_file('auth_cas.conf').with_path('/etc/httpd/conf.d/auth_cas.conf') }
4448
it { is_expected.to contain_file('/var/cache/mod_auth_cas/').with_owner('apache') }
49+
it { is_expected.to contain_file('auth_cas.conf').with_content(%r{CASTimeout 1234}) }
50+
it { is_expected.to contain_file('auth_cas.conf').with_content(%r{CASIdleTimeout 4321}) }
4551
end
4652

4753
context 'vhost setup', :compile do

‎spec/classes/mod/proxy_spec.rb

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# frozen_string_literal: true
2+
3+
require 'spec_helper'
4+
5+
describe 'apache::mod::proxy', type: :class do
6+
it_behaves_like 'a mod class, without including apache'
7+
8+
on_supported_os.each do |os, os_facts|
9+
context "On #{os}" do
10+
let :facts do
11+
os_facts
12+
end
13+
14+
it { is_expected.to contain_file('proxy.conf').with_content(%r{ProxyRequests Off}) }
15+
it { is_expected.to contain_file('proxy.conf').without_content(%r{ProxyTimeout}) }
16+
context 'with parameters set' do
17+
let(:params) do
18+
{ proxy_timeout: 12_345 }
19+
end
20+
21+
it { is_expected.to contain_file('proxy.conf').with_content(%r{ProxyTimeout 12345}) }
22+
end
23+
end
24+
end
25+
end

0 commit comments

Comments
 (0)