diff options
| author | Jan Pazdziora <jpazdziora@redhat.com> | 2014-06-30 08:55:20 +0200 |
|---|---|---|
| committer | Jan Pazdziora <jpazdziora@redhat.com> | 2014-06-30 09:11:57 +0200 |
| commit | f8060de46822583d55b1755cb6f6938ffa5f6e7e (patch) | |
| tree | 2b220bd570ebbcfa1b0f55df44f89afd78b13f6f | |
| parent | c7957d8fde923d44b46181fe9a173e8a82398cdf (diff) | |
| download | mod_intercept_form_submit-f8060de46822583d55b1755cb6f6938ffa5f6e7e.tar.gz mod_intercept_form_submit-f8060de46822583d55b1755cb6f6938ffa5f6e7e.tar.xz mod_intercept_form_submit-f8060de46822583d55b1755cb6f6938ffa5f6e7e.zip | |
1109923 - For Apache 2.4, separate module loading from configuration.
| -rw-r--r-- | intercept_form_submit.conf | 3 | ||||
| -rw-r--r-- | intercept_form_submit.module | 3 | ||||
| -rw-r--r-- | mod_intercept_form_submit.spec | 17 |
3 files changed, 14 insertions, 9 deletions
diff --git a/intercept_form_submit.conf b/intercept_form_submit.conf index b4511d1..c63e3d2 100644 --- a/intercept_form_submit.conf +++ b/intercept_form_submit.conf @@ -1,7 +1,4 @@ -# LoadModule intercept_form_submit_module modules/mod_intercept_form_submit.so -# LoadModule authnz_pam_module modules/mod_authnz_pam.so -# # <Location /login> # InterceptFormPAMService http_application_sss # InterceptFormLogin user_login diff --git a/intercept_form_submit.module b/intercept_form_submit.module new file mode 100644 index 0000000..dcca05e --- /dev/null +++ b/intercept_form_submit.module @@ -0,0 +1,3 @@ + +# LoadModule intercept_form_submit_module modules/mod_intercept_form_submit.so + diff --git a/mod_intercept_form_submit.spec b/mod_intercept_form_submit.spec index 974790c..4e13fb8 100644 --- a/mod_intercept_form_submit.spec +++ b/mod_intercept_form_submit.spec @@ -35,6 +35,14 @@ the REMOTE_USER environment variable if the authentication passes. %build %{_httpd_apxs} -c -Wc,"%{optflags} -Wall -pedantic -std=c99" mod_intercept_form_submit.c +%if "%{_httpd_modconfdir}" != "%{_httpd_confdir}" +echo > intercept_form_submit.confx +echo "# Load the module in %{_httpd_modconfdir}/55-intercept_form_submit.conf" >> intercept_form_submit.confx +cat intercept_form_submit.conf >> intercept_form_submit.confx +%else +cat intercept_form_submit.module > intercept_form_submit.confx +cat intercept_form_submit.conf >> intercept_form_submit.confx +%endif %install rm -rf $RPM_BUILD_ROOT @@ -42,19 +50,16 @@ install -Dm 755 .libs/mod_intercept_form_submit.so $RPM_BUILD_ROOT%{_httpd_moddi %if "%{_httpd_modconfdir}" != "%{_httpd_confdir}" # httpd >= 2.4.x -install -Dp -m 0644 intercept_form_submit.conf $RPM_BUILD_ROOT%{_httpd_modconfdir}/55-intercept_form_submit.conf -%else -# httpd <= 2.2.x -install -Dp -m 0644 intercept_form_submit.conf $RPM_BUILD_ROOT%{_httpd_confdir}/intercept_form_submit.conf +install -Dp -m 0644 intercept_form_submit.module $RPM_BUILD_ROOT%{_httpd_modconfdir}/55-intercept_form_submit.conf %endif +install -Dp -m 0644 intercept_form_submit.confx $RPM_BUILD_ROOT%{_httpd_confdir}/intercept_form_submit.conf %files %doc README LICENSE docs/* %if "%{_httpd_modconfdir}" != "%{_httpd_confdir}" %config(noreplace) %{_httpd_modconfdir}/55-intercept_form_submit.conf -%else -%config(noreplace) %{_httpd_confdir}/intercept_form_submit.conf %endif +%config(noreplace) %{_httpd_confdir}/intercept_form_submit.conf %{_httpd_moddir}/*.so %changelog |