Problems fixed with modules

This commit is contained in:
2018-05-31 16:37:35 +02:00
parent cb66c69e4f
commit cb16115478
2 changed files with 22 additions and 3 deletions

View File

@@ -18,6 +18,7 @@ BuildRequires: ssdeep-devel
BuildRequires: yajl-devel BuildRequires: yajl-devel
BuildRequires: libcurl-devel BuildRequires: libcurl-devel
BuildRequires: lmdb-devel BuildRequires: lmdb-devel
BuildRequires: libmaxminddb-devel
BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(yajl) BuildRequires: pkgconfig(yajl)
BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libcurl)
@@ -59,7 +60,7 @@ applications that use %{name}.
%autosetup -n modsecurity-v%{version} %autosetup -n modsecurity-v%{version}
%build %build
%configure --libdir=%{_libdir} %configure --libdir=%{_libdir} --with-lua --with-ssdeep --with-lmdb --with-maxmind --with-geoip --with-yajl --with-pic
%make_build %make_build
%install %install

View File

@@ -32,6 +32,7 @@ Source1: ngx_http_auth_ldap_module.tar.gz
Source2: modsecurity-nginx-%{modsecver}.tar.gz Source2: modsecurity-nginx-%{modsecver}.tar.gz
Source3: modsecurity.conf Source3: modsecurity.conf
Source4: main.conf Source4: main.conf
Source5: rules.conf
Source10: nginx.service Source10: nginx.service
Source11: nginx.logrotate Source11: nginx.logrotate
Source12: nginx.conf Source12: nginx.conf
@@ -92,6 +93,8 @@ Requires: nginx-mod-http-perl = %{epoch}:%{version}-%{release}
Requires: nginx-mod-http-xslt-filter = %{epoch}:%{version}-%{release} Requires: nginx-mod-http-xslt-filter = %{epoch}:%{version}-%{release}
Requires: nginx-mod-mail = %{epoch}:%{version}-%{release} Requires: nginx-mod-mail = %{epoch}:%{version}-%{release}
Requires: nginx-mod-stream = %{epoch}:%{version}-%{release} Requires: nginx-mod-stream = %{epoch}:%{version}-%{release}
Requires: nginx-mod-auth-ldap = %{epoch}:%{version}-%{release}
Requires: nginx-mod-modsecurity = %{epoch}:%{version}-%{release}
%description all-modules %description all-modules
%{summary}. %{summary}.
@@ -279,7 +282,6 @@ export DESTDIR=%{buildroot}
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
make install DESTDIR=%{buildroot} INSTALLDIRS=vendor make install DESTDIR=%{buildroot} INSTALLDIRS=vendor
@@ -312,7 +314,8 @@ install -p -D -m 0644 %{_builddir}/ngx_http_auth_ldap_module/example.conf %{buil
%if 0%{?with_modsecurity_module} %if 0%{?with_modsecurity_module}
install -m 0755 ./objs/ngx_http_modsecurity_module.so %{buildroot}%{_libdir}/nginx/modules/ngx_http_modsecurity_module.so install -m 0755 ./objs/ngx_http_modsecurity_module.so %{buildroot}%{_libdir}/nginx/modules/ngx_http_modsecurity_module.so
install -p -D -m 0644 %{S:3} %{buildroot}%{_sysconfdir}/nginx/modsec/modsecurity.conf install -p -D -m 0644 %{S:3} %{buildroot}%{_sysconfdir}/nginx/modsec/modsecurity.conf
install -p -D -m 0644 %{S:3} %{buildroot}%{_sysconfdir}/nginx/modsec/main.conf install -p -D -m 0644 %{S:4} %{buildroot}%{_sysconfdir}/nginx/modsec/main.conf
install -p -D -m 0644 %{S:5} %{buildroot}%{_sysconfdir}/nginx/modsec/rules.conf
for f in CHANGES AUTHORS README.md LICENSE; do for f in CHANGES AUTHORS README.md LICENSE; do
install -p -D -m 0644 %{_builddir}/modsecurity-nginx-%{modsecver}/$f %{buildroot}%{_defaultdocdir}/%{name}-mod-security/$f install -p -D -m 0644 %{_builddir}/modsecurity-nginx-%{modsecver}/$f %{buildroot}%{_defaultdocdir}/%{name}-mod-security/$f
done done
@@ -403,6 +406,20 @@ if [ $1 -eq 1 ]; then
/usr/bin/systemctl reload nginx.service >/dev/null 2>&1 || : /usr/bin/systemctl reload nginx.service >/dev/null 2>&1 || :
fi fi
%if 0%{?with_ldap_module}
%post mod-auth-ldap
if [ $1 -eq 1 ]; then
/usr/bin/systemctl reload nginx.service >/dev/null 2>&1 || :
fi
%endif
%if 0%{?with_modsecurity_module}
%post mod-security
if [ $1 -eq 1 ]; then
/usr/bin/systemctl reload nginx.service >/dev/null 2>&1 || :
fi
%endif
%preun %preun
%systemd_preun nginx.service %systemd_preun nginx.service
@@ -499,6 +516,7 @@ fi
%{_defaultdocdir}/%{name}-mod-security/* %{_defaultdocdir}/%{name}-mod-security/*
%config(noreplace) %{_sysconfdir}/nginx/modsec/modsecurity.conf %config(noreplace) %{_sysconfdir}/nginx/modsec/modsecurity.conf
%config(noreplace) %{_sysconfdir}/nginx/modsec/main.conf %config(noreplace) %{_sysconfdir}/nginx/modsec/main.conf
%config(noreplace) %{_sysconfdir}/nginx/modsec/rules.conf
%{_datadir}/nginx/modules/mod-http_modsecurity.conf %{_datadir}/nginx/modules/mod-http_modsecurity.conf
%{_libdir}/nginx/modules/ngx_http_modsecurity_module.so %{_libdir}/nginx/modules/ngx_http_modsecurity_module.so
%endif %endif