Skip to content

Commit f12349c

Browse files
ekohlekohl
committed
Add mod_intercept_form_submit
1 parent da6e2e9 commit f12349c

File tree

4 files changed

+97
-46
lines changed

4 files changed

+97
-46
lines changed

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1408,6 +1408,7 @@ The following Apache modules have supported classes, many of which allow for par
14081408
* `headers`
14091409
* `include`
14101410
* `info`\*
1411+
* `intercept_form_submit`
14111412
* `itk`
14121413
* `ldap` (see [`apache::mod::ldap`][])
14131414
* `mime`

‎manifests/mod/intercept_form_submit.pp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
class apache::mod::intercept_form_submit {
2+
include ::apache
3+
::apache::mod { 'intercept_form_submit': }
4+
}

‎manifests/params.pp

Lines changed: 48 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -97,47 +97,48 @@
9797
$php_version = '5'
9898
$mod_packages = {
9999
# NOTE: The auth_cas module isn't available on RH/CentOS without providing dependency packages provided by EPEL.
100-
'auth_cas' => 'mod_auth_cas',
101-
'auth_kerb' => 'mod_auth_kerb',
102-
'auth_mellon' => 'mod_auth_mellon',
103-
'authnz_ldap' => $::apache::version::distrelease ? {
100+
'auth_cas' => 'mod_auth_cas',
101+
'auth_kerb' => 'mod_auth_kerb',
102+
'auth_mellon' => 'mod_auth_mellon',
103+
'authnz_ldap' => $::apache::version::distrelease ? {
104104
'7' => 'mod_ldap',
105105
default => 'mod_authz_ldap',
106106
},
107-
'authnz_pam' => 'mod_authnz_pam',
108-
'fastcgi' => 'mod_fastcgi',
109-
'fcgid' => 'mod_fcgid',
110-
'geoip' => 'mod_geoip',
111-
'ldap' => $::apache::version::distrelease ? {
107+
'authnz_pam' => 'mod_authnz_pam',
108+
'fastcgi' => 'mod_fastcgi',
109+
'fcgid' => 'mod_fcgid',
110+
'geoip' => 'mod_geoip',
111+
'intercept_form_submit' => 'mod_intercept_form_submit',
112+
'ldap' => $::apache::version::distrelease ? {
112113
'7' => 'mod_ldap',
113114
default => undef,
114115
},
115-
'pagespeed' => 'mod-pagespeed-stable',
116+
'pagespeed' => 'mod-pagespeed-stable',
116117
# NOTE: The passenger module isn't available on RH/CentOS without
117118
# providing dependency packages provided by EPEL and passenger
118119
# repositories. See
119120
# https://www.phusionpassenger.com/library/install/apache/install/oss/el7/
120-
'passenger' => 'mod_passenger',
121-
'perl' => 'mod_perl',
122-
'php5' => $::apache::version::distrelease ? {
121+
'passenger' => 'mod_passenger',
122+
'perl' => 'mod_perl',
123+
'php5' => $::apache::version::distrelease ? {
123124
'5' => 'php53',
124125
default => 'php',
125126
},
126-
'phpXXX' => 'php',
127-
'proxy_html' => 'mod_proxy_html',
128-
'python' => 'mod_python',
129-
'security' => 'mod_security',
127+
'phpXXX' => 'php',
128+
'proxy_html' => 'mod_proxy_html',
129+
'python' => 'mod_python',
130+
'security' => 'mod_security',
130131
# NOTE: The module for Shibboleth is not available on RH/CentOS without
131132
# providing dependency packages provided by Shibboleth's repositories.
132133
# See http://wiki.aaf.edu.au/tech-info/sp-install-guide
133-
'shibboleth' => 'shibboleth',
134-
'ssl' => 'mod_ssl',
135-
'wsgi' => 'mod_wsgi',
136-
'dav_svn' => 'mod_dav_svn',
137-
'suphp' => 'mod_suphp',
138-
'xsendfile' => 'mod_xsendfile',
139-
'nss' => 'mod_nss',
140-
'shib2' => 'shibboleth',
134+
'shibboleth' => 'shibboleth',
135+
'ssl' => 'mod_ssl',
136+
'wsgi' => 'mod_wsgi',
137+
'dav_svn' => 'mod_dav_svn',
138+
'suphp' => 'mod_suphp',
139+
'xsendfile' => 'mod_xsendfile',
140+
'nss' => 'mod_nss',
141+
'shib2' => 'shibboleth',
141142
}
142143
$mod_libs = {
143144
'nss' => 'libmodnss.so',
@@ -235,27 +236,28 @@
235236
$php_version = '7.0'
236237
}
237238
$mod_packages = {
238-
'auth_cas' => 'libapache2-mod-auth-cas',
239-
'auth_kerb' => 'libapache2-mod-auth-kerb',
240-
'auth_mellon' => 'libapache2-mod-auth-mellon',
241-
'authnz_pam' => 'libapache2-mod-authnz-pam',
242-
'dav_svn' => 'libapache2-svn',
243-
'fastcgi' => 'libapache2-mod-fastcgi',
244-
'fcgid' => 'libapache2-mod-fcgid',
245-
'geoip' => 'libapache2-mod-geoip',
246-
'nss' => 'libapache2-mod-nss',
247-
'pagespeed' => 'mod-pagespeed-stable',
248-
'passenger' => 'libapache2-mod-passenger',
249-
'perl' => 'libapache2-mod-perl2',
250-
'phpXXX' => 'libapache2-mod-phpXXX',
251-
'proxy_html' => 'libapache2-mod-proxy-html',
252-
'python' => 'libapache2-mod-python',
253-
'rpaf' => 'libapache2-mod-rpaf',
254-
'security' => 'libapache2-modsecurity',
255-
'shib2' => 'libapache2-mod-shib2',
256-
'suphp' => 'libapache2-mod-suphp',
257-
'wsgi' => 'libapache2-mod-wsgi',
258-
'xsendfile' => 'libapache2-mod-xsendfile',
239+
'auth_cas' => 'libapache2-mod-auth-cas',
240+
'auth_kerb' => 'libapache2-mod-auth-kerb',
241+
'auth_mellon' => 'libapache2-mod-auth-mellon',
242+
'authnz_pam' => 'libapache2-mod-authnz-pam',
243+
'dav_svn' => 'libapache2-svn',
244+
'fastcgi' => 'libapache2-mod-fastcgi',
245+
'fcgid' => 'libapache2-mod-fcgid',
246+
'geoip' => 'libapache2-mod-geoip',
247+
'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
248+
'nss' => 'libapache2-mod-nss',
249+
'pagespeed' => 'mod-pagespeed-stable',
250+
'passenger' => 'libapache2-mod-passenger',
251+
'perl' => 'libapache2-mod-perl2',
252+
'phpXXX' => 'libapache2-mod-phpXXX',
253+
'proxy_html' => 'libapache2-mod-proxy-html',
254+
'python' => 'libapache2-mod-python',
255+
'rpaf' => 'libapache2-mod-rpaf',
256+
'security' => 'libapache2-modsecurity',
257+
'shib2' => 'libapache2-mod-shib2',
258+
'suphp' => 'libapache2-mod-suphp',
259+
'wsgi' => 'libapache2-mod-wsgi',
260+
'xsendfile' => 'libapache2-mod-xsendfile',
259261
}
260262
$error_log = 'error.log'
261263
$scriptalias = '/usr/lib/cgi-bin'

‎spec/classes/mod/intercept_form_submit_spec.rb

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
require 'spec_helper'
2+
3+
describe 'apache::mod::intercept_form_submit', :type => :class do
4+
it_behaves_like "a mod class, without including apache"
5+
6+
context "default configuration with parameters" do
7+
context "on a Debian OS" do
8+
let :facts do
9+
{
10+
:lsbdistcodename => 'squeeze',
11+
:osfamily => 'Debian',
12+
:operatingsystemrelease => '6',
13+
:concat_basedir => '/dne',
14+
:id => 'root',
15+
:kernel => 'Linux',
16+
:operatingsystem => 'Debian',
17+
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
18+
:is_pe => false,
19+
}
20+
end
21+
it { is_expected.to contain_class("apache") }
22+
it { is_expected.to contain_package("libapache2-mod-intercept-form-submit") }
23+
it { is_expected.to contain_apache__mod('intercept_form_submit') }
24+
end #Debian
25+
26+
context "on a RedHat OS" do
27+
let :facts do
28+
{
29+
:osfamily => 'RedHat',
30+
:operatingsystemrelease => '6',
31+
:concat_basedir => '/dne',
32+
:id => 'root',
33+
:kernel => 'Linux',
34+
:operatingsystem => 'RedHat',
35+
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
36+
:is_pe => false,
37+
}
38+
end
39+
it { is_expected.to contain_class("apache") }
40+
it { is_expected.to contain_package("mod_intercept_form_submit") }
41+
it { is_expected.to contain_apache__mod('intercept_form_submit') }
42+
end # Redhat
43+
end
44+
end

0 commit comments

Comments
 (0)