# TODO
# - /etc/sysconfig/nginx file
# - missing perl build/install requires
+# - add njs: https://nginx.org/en/docs/njs/
#
# Conditional build for nginx:
# Features
%bcond_with http_browser # http browser module (header "User-agent" parser)
%bcond_with modsecurity # modsecurity module
%bcond_with rtmp # rtmp support
+%bcond_without vts # virtual host traffic status module
%ifarch x32
%undefine with_rtsig
%endif
%define ssl_version 1.0.2
-%define rtmp_version 1.1.7
-%define modsecurity_version 2.9.1
+%define rtmp_version 1.2.1
+%define vts_version 0.1.18
+%define modsecurity_version 2.9.3
Summary: High perfomance HTTP and reverse proxy server
Summary(pl.UTF-8): Serwer HTTP i odwrotne proxy o wysokiej wydajności
# nginx lines:
# - stable: production quality with stable API
# - mainline: production quality but API can change
Name: nginx
-Version: 1.11.5
-Release: 0.6
+Version: 1.16.1
+Release: 3
License: BSD-like
Group: Networking/Daemons/HTTP
Source0: http://nginx.org/download/%{name}-%{version}.tar.gz
-# Source0-md5: db43f2b19746f6f47401c3afc3924dc6
+# Source0-md5: 45a80f75336c980d240987badc3dcf60
Source1: http://nginx.net/favicon.ico
# Source1-md5: 2aaf2115c752cbdbfb8a2f0b3c3189ab
Source2: proxy.conf
Source17: %{name}-mime.types.sh
Source18: %{name}.service
Source22: http://www.modsecurity.org/tarball/%{modsecurity_version}/modsecurity-%{modsecurity_version}.tar.gz
-# Source22-md5: 0fa92b852abc857a20b9e24f83f814cf
+# Source22-md5: 215a96d679a5b0fadcf13b5d09b35422
Source101: https://github.com/arut/nginx-rtmp-module/archive/v%{rtmp_version}/%{name}-rtmp-module-%{rtmp_version}.tar.gz
-# Source101-md5: 8006de2560db3e55bb15d110220076ac
+# Source101-md5: 639ac2b78103adaccbcfe484a92acf44
+Source102: https://github.com/vozlt/nginx-module-vts/archive/v%{vts_version}.tar.gz
+# Source102-md5: 409a10dbd85e0b807cc77eecec29a3b5
Patch0: %{name}-no-Werror.patch
Patch1: %{name}-modsecurity-xheaders.patch
-URL: http://nginx.net/
+URL: http://nginx.org/
BuildRequires: mailcap
BuildRequires: pcre-devel
BuildRequires: rpmbuild(macros) >= 1.644
Requires: rc-scripts >= 0.2.0
Requires: systemd-units >= 38
Suggests: vim-syntax-nginx
+Obsoletes: nginx-common < 1.13.3
+Obsoletes: nginx-light < 1.13.3
+Obsoletes: nginx-standard < 1.13.3
Conflicts: rpm < 4.4.2-0.2
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description mod_mail
Nginx mail module.
+%package mod_vts
+Summary: Nginx virtual host traffic status module
+Group: Networking/Daemons/HTTP
+Requires: %{name} = %{version}-%{release}
+
+%description mod_vts
+Nginx virtual host traffic status module.
+
%package mod_stream
Summary: Nginx stream modules
Group: Daemons
Plik monitrc do monitorowania serwera WWW nginx.
%prep
-%setup -q %{?with_rtmp:-a101} %{?with_modsecurity:-a22}
+%setup -q %{?with_rtmp:-a101} %{?with_modsecurity:-a22} %{?with_vts:-a102}
%patch0 -p0
%{?with_modsecurity:%patch1 -p0}
mv nginx-rtmp-module-%{rtmp_version} nginx-rtmp-module
%endif
+%if %{with vts}
+mv nginx-module-vts-%{vts_version} nginx-vts-module
+%endif
+
# build mime.types.conf
#sh %{SOURCE17} /etc/mime.types
--http-client-body-temp-path=%{_localstatedir}/cache/%{name}/client_body_temp \
--http-fastcgi-temp-path=%{_localstatedir}/cache/%{name}/fastcgi_temp \
--http-proxy-temp-path=%{_localstatedir}/cache/%{name}/proxy_temp \
+ --http-uwsgi-temp-path=%{_localstatedir}/cache/%{name}/uwsgi_temp \
+ --http-scgi-temp-path=%{_localstatedir}/cache/%{name}/scgi_temp \
--user=nginx \
--group=nginx \
%{?with_select:--with-select_module} \
%{?with_ssl:--with-http_ssl_module} \
%{!?with_http_browser:--without-http_browser_module} \
%{?with_rtmp:--add-module=./nginx-rtmp-module} \
+ %{?with_vts:--add-dynamic-module=./nginx-vts-module} \
%{?with_auth_request:--with-http_auth_request_module} \
%{?with_threads:--with-threads} \
%{?with_http2:--with-http_v2_module} \
$RPM_BUILD_ROOT%{_localstatedir}/cache/%{name} \
$RPM_BUILD_ROOT%{_localstatedir}/lock/subsys/%{name} \
$RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/{conf,modules,vhosts,webapps}.d} \
+ $RPM_BUILD_ROOT%{_sysconfdir}/snippets \
$RPM_BUILD_ROOT/etc/{logrotate.d,monit} \
$RPM_BUILD_ROOT{%{systemdunitdir},/etc/systemd/system}
%if %{with mail}
load_module mail
%endif
+%{?with_vts:load_module http_vhost_traffic_status}
%if %{with stream}
load_module stream
%endif
%module_scripts mod_http_perl
%module_scripts mod_http_xslt_filter
%module_scripts mod_mail
+%module_scripts mod_vts
%module_scripts mod_stream
%module_scripts mod_stream_geoip
%dir %attr(750,root,nginx) %{_sysconfdir}
%dir %{_sysconfdir}/conf.d
%dir %{_sysconfdir}/modules.d
+%dir %{_sysconfdir}/snippets
%dir %{_sysconfdir}/vhosts.d
%dir %{_sysconfdir}/webapps.d
%attr(640,root,root) %{_sysconfdir}/mime.types
%attr(640,root,root) %{_sysconfdir}/koi-utf
%attr(640,root,root) %{_sysconfdir}/koi-win
%attr(640,root,root) %{_sysconfdir}/win-utf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fastcgi.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nginx.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/proxy.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fastcgi_params
%attr(755,root,root) %{_libdir}/%{name}/modules/ngx_mail_module.so
%endif
+%if %{with vts}
+%files mod_vts
+%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/modules.d/mod_http_vhost_traffic_status.conf
+%attr(755,root,root) %{_libdir}/%{name}/modules/ngx_http_vhost_traffic_status_module.so
+%endif
+
%if %{with stream}
%files mod_stream
%defattr(644,root,root,755)