X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=nginx.spec;h=a8fa11eee4107218feb1069979f6dedf7edffd15;hb=1a97cd6dd59968a3d3e778ee91e6a7a93f0a57e8;hp=b2fbf4d00bf66f18c29ecd83cfccaad66c0068cc;hpb=4f5e8e28ccdaa6a276541176d171eea617c55536;p=packages%2Fnginx.git diff --git a/nginx.spec b/nginx.spec index b2fbf4d..a8fa11e 100644 --- a/nginx.spec +++ b/nginx.spec @@ -3,133 +3,124 @@ # - missing perl build/install requires # # Conditional build for nginx: -%bcond_without light # don't build light version %bcond_without mail # don't build imap/mail proxy %bcond_without perl # don't build with perl module %bcond_without addition # adds module %bcond_without dav # WebDAV %bcond_without flv # FLV stream -%bcond_without ipv6 # build without ipv6 support %bcond_without sub # ngx_http_sub_module %bcond_without poll # poll %bcond_without realip # real ip (behind proxy) -%bcond_without rtsig # rtsig %bcond_without select # select -%bcond_without status # stats module +%bcond_without http2 # HTTP/2 module +%bcond_without status # status module %bcond_without ssl # ssl support +%bcond_without threads # thread pool support +%bcond_without gd # without http image filter module +%bcond_without geoip # without http geoip module +%bcond_without xslt # without http xslt module +%bcond_without stream # without stream module %bcond_with http_browser # header "User-agent" parser -%bcond_without rtmp # rtmp support +%bcond_with rtmp # rtmp support +%bcond_with debug # enable debug logging: http://nginx.org/en/docs/debugging_log.html +%bcond_without auth_request # auth_request module +%bcond_with modsecurity # modsecurity module -%define rtmp_version 1.0.2 +%ifarch x32 +%undefine with_rtsig +%endif + +%define ssl_version 1.0.2 +%define rtmp_version 1.1.7 +%define modsecurity_version 2.9.1 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.4.1 -Release: 5 +Version: 1.11.5 +Release: 0.1 License: BSD-like Group: Networking/Daemons/HTTP Source0: http://nginx.org/download/%{name}-%{version}.tar.gz -# Source0-md5: fea7dfab995545ce27fe4c49dc21a972 +# Source0-md5: db43f2b19746f6f47401c3afc3924dc6 Source1: http://nginx.net/favicon.ico -# Source1-md5: 14054e0d276e25545c9f801c91164f69 +# Source1-md5: 2aaf2115c752cbdbfb8a2f0b3c3189ab Source2: proxy.conf Source3: %{name}.logrotate Source4: %{name}.mime -Source5: %{name}-light.conf -Source6: %{name}-light.monitrc -Source7: %{name}-light.init -Source8: %{name}-mail.conf -Source9: %{name}-mail.monitrc -Source10: %{name}-mail.init -Source11: %{name}-perl.conf -Source12: %{name}-perl.monitrc -Source13: %{name}-perl.init -Source14: %{name}-standard.conf -Source15: %{name}-standard.monitrc -Source16: %{name}-standard.init +Source6: %{name}.monitrc +Source7: %{name}.init +Source14: %{name}.conf Source17: %{name}-mime.types.sh -Source18: %{name}-standard.service -Source19: %{name}-light.service -Source20: %{name}-perl.service -Source21: %{name}-mail.service -Source101: https://github.com/arut/nginx-rtmp-module/archive/v%{rtmp_version}.tar.gz -# Source101-md5: 989659b13382e4ee3649fcaa6573c08e -Patch0: nginx-no-Werror.patch +Source18: %{name}.service +Source22: http://www.modsecurity.org/tarball/%{modsecurity_version}/modsecurity-%{modsecurity_version}.tar.gz +# Source22-md5: 0fa92b852abc857a20b9e24f83f814cf +Source101: https://github.com/arut/nginx-rtmp-module/archive/v%{rtmp_version}/%{name}-rtmp-module-%{rtmp_version}.tar.gz +# Source101-md5: 8006de2560db3e55bb15d110220076ac +Patch0: %{name}-no-Werror.patch +Patch1: %{name}-modsecurity-xheaders.patch URL: http://nginx.net/ BuildRequires: mailcap -BuildRequires: openssl-devel BuildRequires: pcre-devel -%{?with_perl:BuildRequires: perl-CGI} -%{?with_perl:BuildRequires: perl-devel} -%{?with_perl:BuildRequires: python} -%{?with_perl:BuildRequires: rpm-perlprov} BuildRequires: rpmbuild(macros) >= 1.644 BuildRequires: zlib-devel -BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) - -%define _sysconfdir /etc/%{name} -%define _nginxdir /home/services/%{name} - -%description -nginx ("engine x") is a high-performance HTTP server and reverse -proxy, as well as an IMAP/POP3 proxy server. nginx was written by Igor -Sysoev for Rambler.ru, Russia's second-most visited website, where it -has been running in production for over two and a half years. Igor has -released the source code under a BSD-like license. Although still in -beta, nginx is known for its stability, rich feature set, simple -configuration, and low resource consumption. - -%description -l pl.UTF-8 -nginx ("engine x") jest wysokowydajnym serwerem HTTP, odwrotnym proxy -a także IMAP/POP3 proxy. nginx został napisany przez Igora Sysoeva -na potrzeby serwisu Rambler.ru. Jest to drugi pod względem ilości -odwiedzin serwis w Rosji i działa od ponad dwóch i pół roku. Igor -opublikował źródła na licencji BSD. Mimo, że projekt jest ciągle -w fazie beta, już zasłynął dzięki stabilności, bogactwu dodatków, -prostej konfiguracji oraz małej "zasobożerności". - -%package common -Summary: nginx - common files -Summary(pl.UTF-8): nginx - pliki wspólne -Group: Networking/Daemons/HTTP +%if %{with geoip} +BuildRequires: GeoIP-devel +%endif +%if %{with gd} +BuildRequires: gd-devel +%endif +%if %{with modsecurity} +BuildRequires: lua-devel +%endif +%if %{with perl} +BuildRequires: perl-CGI +BuildRequires: perl-devel +BuildRequires: python +BuildRequires: rpm-perlprov +%endif +%if %{with ssl} +BuildRequires: openssl-devel >= %{ssl_version} +Requires: openssl >= %{ssl_version} +%endif +%if %{with xslt} +BuildRequires: libxslt-devel +%endif +Provides: group(http) +Provides: group(nginx) +Provides: user(nginx) +Provides: webserver +Provides: webserver(access) +Provides: webserver(alias) +Provides: webserver(auth) +Provides: webserver(expires) +Provides: webserver(headers) +Provides: webserver(indexfile) +Provides: webserver(log) +Provides: webserver(mime) +Provides: webserver(reqtimeout) +Provides: webserver(rewrite) +Provides: webserver(setenv) +Conflicts: logrotate < 3.8.0 +Requires(post,preun): /sbin/chkconfig +Requires(post,preun,postun): systemd-units >= 38 Requires(postun): /usr/sbin/groupdel Requires(postun): /usr/sbin/userdel Requires(pre): /bin/id Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd -Requires: openssl -Requires: pcre Requires: rc-scripts >= 0.2.0 Requires: systemd-units >= 38 -Requires: zlib -Provides: group(http) -Provides: group(nginx) -Provides: user(nginx) -Provides: webserver -Conflicts: logrotate < 3.8.0 -Obsoletes: %{name} < 1.4.1-4.1 - -%description common -Common files for the nginx daemon. - -%description common -l pl.UTF-8 -Niezbędne pliki dla nginx. +Suggests: vim-syntax-nginx +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%package light -Summary: High perfomance HTTP and reverse proxy server -Summary(pl.UTF-8): Serwer HTTP i odwrotne proxy o wysokiej wydajności -Group: Networking/Daemons/HTTP -Requires(post,preun): /sbin/chkconfig -Requires(post,preun,postun): systemd-units >= 38 -Requires: %{name}-common = %{version}-%{release} -Requires: openssl -Requires: pcre -Requires: zlib -Provides: nginx-daemon -Provides: webserver +%define _sysconfdir /etc/%{name} +%define _nginxdir /home/services/%{name} -%description light +%description nginx ("engine x") is a high-performance HTTP server and reverse proxy, as well as an IMAP/POP3 proxy server. nginx was written by Igor Sysoev for Rambler.ru, Russia's second-most visited website, where it @@ -138,137 +129,69 @@ released the source code under a BSD-like license. Although still in beta, nginx is known for its stability, rich feature set, simple configuration, and low resource consumption. -The smallest, but also the fastest nginx edition. No additional -modules, no Perl, no DAV, no FLV, no IMAP, POP3, SMTP proxy. - -%description light -l pl.UTF-8 +%description -l pl.UTF-8 nginx ("engine x") jest wysokowydajnym serwerem HTTP, odwrotnym proxy -a także IMAP/POP3 proxy. nginx został napisany przez Igora Sysoeva -na potrzeby serwisu Rambler.ru. Jest to drugi pod względem ilości +a także IMAP/POP3 proxy. nginx został napisany przez Igora Sysoeva na +potrzeby serwisu Rambler.ru. Jest to drugi pod względem ilości odwiedzin serwis w Rosji i działa od ponad dwóch i pół roku. Igor -opublikował źródła na licencji BSD. Mimo, że projekt jest ciągle -w fazie beta, już zasłynął dzięki stabilności, bogactwu dodatków, +opublikował źródła na licencji BSD. Mimo, że projekt jest ciągle w +fazie beta, już zasłynął dzięki stabilności, bogactwu dodatków, prostej konfiguracji oraz małej "zasobożerności". -Najmniejsza i najszybsza wersja nginx. Bez wsparcia dla Perla, DAV, -FLV oraz IMAP, POP3, SMTP proxy. +%package mod_http_geoip +Summary: Nginx HTTP geoip module +Group: Daemons +Requires: %{name} = %{version}-%{release} +Requires: GeoIP -%package perl -Summary: High perfomance HTTP and reverse proxy server -Summary(pl.UTF-8): Serwer HTTP i odwrotne proxy o wysokiej wydajności -Group: Networking/Daemons/HTTP -Requires(post,preun): /sbin/chkconfig -Requires(post,preun,postun): systemd-units >= 38 -Requires: %{name}-common = %{version}-%{release} -Requires: openssl -Provides: nginx-daemon -Provides: webserver +%description mod_http_geoip +Nginx HTTP geoip module. -%description perl -nginx ("engine x") is a high-performance HTTP server and reverse -proxy, as well as an IMAP/POP3 proxy server. nginx was written by Igor -Sysoev for Rambler.ru, Russia's second-most visited website, where it -has been running in production for over two and a half years. Igor has -released the source code under a BSD-like license. Although still in -beta, nginx is known for its stability, rich feature set, simple -configuration, and low resource consumption. +%package mod_http_image_filter +Summary: Nginx HTTP image filter module +Group: Daemons +Requires: %{name} = %{version}-%{release} -nginx with Perl support. Mail modules not included. +%description mod_http_image_filter +Nginx HTTP image filter module. -%description perl -l pl.UTF-8 -nginx ("engine x") jest wysokowydajnym serwerem HTTP, odwrotnym proxy -a także IMAP/POP3 proxy. nginx został napisany przez Igora Sysoeva -na potrzeby serwisu Rambler.ru. Jest to drugi pod względem ilości -odwiedzin serwis w Rosji i działa od ponad dwóch i pół roku. Igor -opublikował źródła na licencji BSD. Mimo, że projekt jest ciągle -w fazie beta, już zasłynął dzięki stabilności, bogactwu dodatków, -prostej konfiguracji oraz małej "zasobożerności". - -nginx z obsługą Perla. Bez wsparcia dla modułów poczty. - -%package mail -Summary: High perfomance IMAP, POP3, SMTP proxy server -Summary(pl.UTF-8): IMAP, POP3, SMTP proxy o wysokiej wydajności +%package mod_http_perl +Summary: Nginx HTTP Perl module Group: Networking/Daemons/HTTP -Requires(post,preun): /sbin/chkconfig -Requires(post,preun,postun): systemd-units >= 38 -Requires: %{name}-common = %{version}-%{release} -Requires: openssl -Requires: pcre -Requires: zlib -Provides: nginx-daemon - -%description mail -nginx ("engine x") is a high-performance HTTP server and reverse -proxy, as well as an IMAP/POP3 proxy server. nginx was written by Igor -Sysoev for Rambler.ru, Russia's second-most visited website, where it -has been running in production for over two and a half years. Igor has -released the source code under a BSD-like license. Although still in -beta, nginx is known for its stability, rich feature set, simple -configuration, and low resource consumption. +Requires: %{name} = %{version}-%{release} -nginx with mail support. Only mail modules included. +%description mod_http_perl +Nginx HTTP Perl module. -%description mail -l pl.UTF-8 -nginx ("engine x") jest wysokowydajnym serwerem HTTP, odwrotnym proxy -a także IMAP/POP3 proxy. nginx został napisany przez Igora Sysoeva -na potrzeby serwisu Rambler.ru. Jest to drugi pod względem ilości -odwiedzin serwis w Rosji i działa od ponad dwóch i pół roku. Igor -opublikował źródła na licencji BSD. Mimo, że projekt jest ciągle -w fazie beta, już zasłynął dzięki stabilności, bogactwu dodatków, -prostej konfiguracji oraz małej "zasobożerności". +%package mod_http_xslt_filter +Summary: Nginx XSLT module +Group: Daemons +Requires: %{name} = %{version}-%{release} -nginx ze wsparciem tylko dla modułów poczty. +%description mod_http_xslt_filter +Nginx XSLT module. -%package standard -Summary: High perfomance HTTP and reverse proxy server -Summary(pl.UTF-8): Serwer HTTP i odwrotne proxy o wysokiej wydajności +%package mod_mail +Summary: Nginx mail module Group: Networking/Daemons/HTTP -Requires(post,preun): /sbin/chkconfig -Requires(post,preun,postun): systemd-units >= 38 -Requires: %{name}-common = %{version}-%{release} -Requires: openssl -Provides: nginx -Provides: nginx-daemon -Conflicts: logrotate < 3.7-4 +Requires: %{name} = %{version}-%{release} -%description standard -nginx ("engine x") is a high-performance HTTP server and reverse -proxy, as well as an IMAP/POP3 proxy server. nginx was written by Igor -Sysoev for Rambler.ru, Russia's second-most visited website, where it -has been running in production for over two and a half years. Igor has -released the source code under a BSD-like license. Although still in -beta, nginx is known for its stability, rich feature set, simple -configuration, and low resource consumption. +%description mod_mail +Nginx mail module. -This is standard nginx version, without Perl support and IMAP, POP3, -SMTP proxy. +%package mod_stream +Summary: Nginx stream modules +Group: Daemons +Requires: %{name} = %{version}-%{release} -%description standard -l pl.UTF-8 -nginx ("engine x") jest wysokowydajnym serwerem HTTP, odwrotnym proxy -a także IMAP/POP3 proxy. nginx został napisany przez Igora Sysoeva -na potrzeby serwisu Rambler.ru. Jest to drugi pod względem ilości -odwiedzin serwis w Rosji i działa od ponad dwóch i pół roku. Igor -opublikował źródła na licencji BSD. Mimo, że projekt jest ciągle -w fazie beta, już zasłynął dzięki stabilności, bogactwu dodatków, -prostej konfiguracji oraz małej "zasobożerności". -ginx ("engine x") jest wysokowydajnym serwerem HTTP, odwrotnym proxy -a także IMAP/POP3 proxy. nginx został napisany przez Igora Sysoeva -na potrzeby serwisu Rambler.ru. Jest to drugi pod względem ilości -odwiedzin serwis w Rosji i działa od ponad dwóch i pół roku. Igor -opublikował źródła na licencji BSD. Mimo, że projekt jest ciągle -w fazie beta, już zasłynął dzięki stabilności, bogactwu dodatków, -prostej konfiguracji oraz małej "zasobożerności". - -To jest standardowa wersja nginx, bez obsługi Perla oraz proxy dla -IMAP, POP3, SMTP. +%description mod_stream +Nginx stream modules. %package -n monit-rc-nginx Summary: nginx support for monit Summary(pl.UTF-8): Wsparcie nginx dla monit Group: Applications/System -URL: http://nginx.eu/ -Requires: %{name}-common = %{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires: monit %description -n monit-rc-nginx @@ -278,8 +201,9 @@ monitrc file for monitoring nginx webserver. Plik monitrc do monitorowania serwera WWW nginx. %prep -%setup -q %{?with_rtmp:-a101} +%setup -q %{?with_rtmp:-a101} %{?with_modsecurity:-a22} %patch0 -p0 +%{?with_modsecurity:%patch1 -p0} %if %{with rtmp} mv nginx-rtmp-module-%{rtmp_version} nginx-rtmp-module @@ -291,348 +215,169 @@ mv nginx-rtmp-module-%{rtmp_version} nginx-rtmp-module %build # NB: not autoconf generated configure cp -f configure auto/ -# -%if %{with perl} + ./configure \ --prefix=%{_prefix} \ - --sbin-path=%{_sbindir}/%{name}-perl \ - --conf-path=%{_sysconfdir}/%{name}-perl.conf \ - --error-log-path=%{_localstatedir}/log/%{name}/%{name}-perl_error.log \ - --http-log-path=%{_localstatedir}/log/%{name}/%{name}-perl_access.log \ - --pid-path=%{_localstatedir}/run/%{name}-perl.pid \ - --lock-path=%{_localstatedir}/lock/subsys/%{name}-perl \ + --modules-path=%{_libdir}/%{name}/modules \ + --sbin-path=%{_sbindir}/%{name} \ + --conf-path=%{_sysconfdir}/%{name}.conf \ + --error-log-path=%{_localstatedir}/log/%{name}/error.log \ + --http-log-path=%{_localstatedir}/log/%{name}/access.log \ + --pid-path=%{_localstatedir}/run/%{name}.pid \ + --lock-path=%{_localstatedir}/lock/subsys/%{name} \ + --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 \ --user=nginx \ --group=nginx \ - --with-http_perl_module \ - --without-mail_pop3_module \ - --without-mail_imap_module \ - --without-mail_smtp_module \ - %{?with_addition:--with-http_addition_module} \ - %{?with_dav:--with-http_dav_module} \ - %{?with_flv:--with-http_flv_module} \ - %{?with_ipv6:--with-ipv6} \ - %{?with_sub:--with-http_sub_module} \ + %{?with_select:--with-select_module} \ %{?with_poll:--with-poll_module} \ - %{?with_realip:--with-http_realip_module} \ %{?with_rtsig:--with-rtsig_module} \ - %{?with_select:--with-select_module} \ - %{?with_status:--with-http_stub_status_module} \ - %{?with_ssl:--with-http_ssl_module} \ - %{!?with_http_browser:--without-http_browser_module} \ - %{?with_rtmp:--add-module=./nginx-rtmp-module} \ - --http-client-body-temp-path=%{_localstatedir}/cache/%{name}-perl/client_body_temp \ - --http-proxy-temp-path=%{_localstatedir}/cache/%{name}-perl/proxy_temp \ - --http-fastcgi-temp-path=%{_localstatedir}/cache/%{name}-perl/fastcgi_temp \ - --with-cc="%{__cc}" \ - --with-cc-opt="%{rpmcflags}" \ - --with-ld-opt="%{rpmldflags}" -%{__make} -mv -f objs/nginx contrib/nginx-perl -mv -f objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.bs contrib/nginx.bs -mv -f objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.so contrib/nginx.so -mv -f objs/src/http/modules/perl/nginx.pm contrib/nginx.pm -%endif - + %{?with_perl:--with-http_perl_module=dynamic} \ + %{?with_geoip:--with-http_geoip_module=dynamic} \ + %{?with_gd:--with-http_image_filter_module=dynamic} \ + %{?with_xslt:--with-http_xslt_module=dynamic} \ %if %{with mail} -./configure \ - --prefix=%{_prefix} \ - --sbin-path=%{_sbindir}/%{name}-mail \ - --conf-path=%{_sysconfdir}/%{name}-mail.conf \ - --error-log-path=%{_localstatedir}/log/%{name}/%{name}-mail_error.log \ - --http-log-path=%{_localstatedir}/log/%{name}/%{name}-mail_access.log \ - --pid-path=%{_localstatedir}/run/%{name}-mail.pid \ - --lock-path=%{_localstatedir}/lock/subsys/%{name}-mail \ - --user=nginx \ - --group=nginx \ - --with-imap \ - --with-mail \ + --with-mail=dynamic \ --with-mail_ssl_module \ - --without-http \ - %{?with_ipv6:--with-ipv6} \ - %{?with_poll:--with-poll_module} \ - %{?with_rtsig:--with-rtsig_module} \ - %{?with_select:--with-select_module} \ - --http-client-body-temp-path=%{_localstatedir}/cache/%{name}-mail/client_body_temp \ - --http-proxy-temp-path=%{_localstatedir}/cache/%{name}-mail/proxy_temp \ - --http-fastcgi-temp-path=%{_localstatedir}/cache/%{name}-mail/fastcgi_temp \ - --with-cc="%{__cc}" \ - --with-cc-opt="%{rpmcflags}" \ - --with-ld-opt="%{rpmldflags}" \ - %{?debug:--with-debug} -%{__make} -mv -f objs/nginx contrib/nginx-mail %endif - -%if %{with light} -./configure \ - --prefix=%{_prefix} \ - --sbin-path=%{_sbindir}/%{name}-light \ - --conf-path=%{_sysconfdir}/%{name}-light.conf \ - --error-log-path=%{_localstatedir}/log/%{name}/%{name}-light_error.log \ - --http-log-path=%{_localstatedir}/log/%{name}/%{name}-light_access.log \ - --pid-path=%{_localstatedir}/run/%{name}-light.pid \ - --lock-path=%{_localstatedir}/lock/subsys/%{name}-light \ - --user=nginx \ - --group=nginx \ - %{?with_ipv6:--with-ipv6} \ - %{?with_poll:--with-poll_module} \ - %{?with_realip:--with-http_realip_module} \ - %{?with_rtsig:--with-rtsig_module} \ - %{?with_select:--with-select_module} \ - %{?with_status:--with-http_stub_status_module} \ - %{?with_ssl:--with-http_ssl_module} \ - %{?with_rtmp:--add-module=./nginx-rtmp-module} \ - --without-http_browser_module \ - --without-mail_pop3_module \ - --without-mail_imap_module \ - --without-mail_smtp_module \ - --http-client-body-temp-path=%{_localstatedir}/cache/%{name}-light/client_body_temp \ - --http-proxy-temp-path=%{_localstatedir}/cache/%{name}-light/proxy_temp \ - --http-fastcgi-temp-path=%{_localstatedir}/cache/%{name}-light/fastcgi_temp \ +%if %{with stream} + --with-stream=dynamic \ + --with-stream_ssl_module \ +%endif --with-cc="%{__cc}" \ --with-cc-opt="%{rpmcflags}" \ --with-ld-opt="%{rpmldflags}" \ - %{?debug:--with-debug} -%{__make} -mv -f objs/nginx contrib/nginx-light -%endif - -./configure \ - --prefix=%{_prefix} \ - --sbin-path=%{_sbindir}/%{name}-standard \ - --conf-path=%{_sysconfdir}/%{name}-standard.conf \ - --error-log-path=%{_localstatedir}/log/%{name}/%{name}-standard_error.log \ - --http-log-path=%{_localstatedir}/log/%{name}/%{name}-standard_access.log \ - --pid-path=%{_localstatedir}/run/%{name}-standard.pid \ - --lock-path=%{_localstatedir}/lock/subsys/%{name}-standard \ - --user=nginx \ - --group=nginx \ + %{?with_debug:--with-debug} \ %{?with_addition:--with-http_addition_module} \ %{?with_dav:--with-http_dav_module} \ %{?with_flv:--with-http_flv_module} \ - %{?with_ipv6:--with-ipv6} \ %{?with_sub:--with-http_sub_module} \ - %{?with_poll:--with-poll_module} \ %{?with_realip:--with-http_realip_module} \ - %{?with_rtsig:--with-rtsig_module} \ - %{?with_select:--with-select_module} \ %{?with_status:--with-http_stub_status_module} \ %{?with_ssl:--with-http_ssl_module} \ %{!?with_http_browser:--without-http_browser_module} \ %{?with_rtmp:--add-module=./nginx-rtmp-module} \ - --http-client-body-temp-path=%{_localstatedir}/cache/%{name}-standard/client_body_temp \ - --http-proxy-temp-path=%{_localstatedir}/cache/%{name}-standard/proxy_temp \ - --http-fastcgi-temp-path=%{_localstatedir}/cache/%{name}-standard/fastcgi_temp \ - --with-cc="%{__cc}" \ - --with-cc-opt="%{rpmcflags}" \ - --with-ld-opt="%{rpmldflags}" \ - %{?debug:--with-debug} + %{?with_auth_request:--with-http_auth_request_module} \ + %{?with_threads:--with-threads} \ + %{?with_http2:--with-http_v2_module} \ + %{?with_modsecurity:--add-module=modsecurity-%{modsecurity_version}/nginx/modsecurity} \ + --with-http_secure_link_module \ + %{nil} + %{__make} +%if %{with modsecurity} +cd modsecurity-%{modsecurity_version} +./autogen.sh +%configure \ + --enable-standalone-module \ + --disable-mlogc \ + --enable-alp2 \ + --with-lua=/usr +%{__make} +cd .. +%endif %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/etc/rc.d/init.d \ $RPM_BUILD_ROOT%{_nginxdir}/{cgi-bin,html,errors} \ $RPM_BUILD_ROOT%{_localstatedir}/log/{%{name},archive/%{name}} \ - $RPM_BUILD_ROOT%{_localstatedir}/cache/{%{name}-standard,%{name}-perl,%{name}-mail,%{name}-light} \ - $RPM_BUILD_ROOT%{_localstatedir}/lock/subsys/{%{name}-standard,%{name}-perl,%{name}-mail,%{name}-light} \ + $RPM_BUILD_ROOT%{_localstatedir}/cache/%{name} \ + $RPM_BUILD_ROOT%{_localstatedir}/lock/subsys/%{name} \ $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/{vhosts,webapps}.d} \ $RPM_BUILD_ROOT/etc/{logrotate.d,monit} \ $RPM_BUILD_ROOT{%{systemdunitdir},/etc/systemd/system} -install conf/fastcgi_params $RPM_BUILD_ROOT%{_sysconfdir}/fastcgi.params -install conf/scgi_params $RPM_BUILD_ROOT%{_sysconfdir}/scgi.params -install conf/uwsgi_params $RPM_BUILD_ROOT%{_sysconfdir}/uwsgi.params -install conf/koi-utf $RPM_BUILD_ROOT%{_sysconfdir}/koi-utf -install conf/koi-win $RPM_BUILD_ROOT%{_sysconfdir}/koi-win -install conf/win-utf $RPM_BUILD_ROOT%{_sysconfdir}/win-utf -install html/index.html $RPM_BUILD_ROOT%{_nginxdir}/html -install html/50x.html $RPM_BUILD_ROOT%{_nginxdir}/errors -install %{SOURCE1} $RPM_BUILD_ROOT%{_nginxdir}/html/favicon.ico -install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/proxy.conf -install %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/%{name} -install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/mime.types -install %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-standard.conf -install %{SOURCE15} $RPM_BUILD_ROOT/etc/monit/%{name}-standard.monitrc -install %{SOURCE16} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-standard -install %{SOURCE18} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}-standard.service -install objs/%{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}-standard -ln -sf %{systemdunitdir}/%{name}-standard.service $RPM_BUILD_ROOT/etc/systemd/system/nginx.service - -%if %{with light} -install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-light.conf -install %{SOURCE6} $RPM_BUILD_ROOT/etc/monit/%{name}-light.monitrc -install %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-light -install %{SOURCE19} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}-light.service -install contrib/nginx-light $RPM_BUILD_ROOT%{_sbindir}/%{name}-light -%endif +%{__make} install \ + INSTALLDIRS=vendor \ + DESTDIR=$RPM_BUILD_ROOT -%if %{with mail} -install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-mail.conf -install %{SOURCE9} $RPM_BUILD_ROOT/etc/monit/%{name}-mail.monitrc -install %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-mail -install %{SOURCE21} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}-mail.service -install contrib/nginx-mail $RPM_BUILD_ROOT%{_sbindir}/%{name}-mail -%endif +%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/*.default + +cp -p %{_sourcedir}/%{name}.conf $RPM_BUILD_ROOT%{_sysconfdir} +cp -p %{_sourcedir}/%{name}.service $RPM_BUILD_ROOT%{systemdunitdir} +cp -p %{_sourcedir}/%{name}.monitrc $RPM_BUILD_ROOT/etc/monit +install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} + +cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/%{name} +cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/proxy.conf +cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/mime.types +rm -r $RPM_BUILD_ROOT%{_prefix}/html +cp -p html/index.html $RPM_BUILD_ROOT%{_nginxdir}/html +cp -p html/50x.html $RPM_BUILD_ROOT%{_nginxdir}/errors +cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_nginxdir}/html/favicon.ico %if %{with perl} -install -d $RPM_BUILD_ROOT{%{perl_vendorarch},%{perl_vendorarch}/auto/%{name}} -install %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-perl.conf -install %{SOURCE12} $RPM_BUILD_ROOT/etc/monit/%{name}-perl.monitrc -install %{SOURCE13} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-perl -install %{SOURCE20} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}-perl.service -install contrib/nginx.pm $RPM_BUILD_ROOT%{perl_vendorarch}/%{name}.pm -install contrib/nginx.so $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so -install contrib/nginx.bs $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.bs -install contrib/nginx-perl $RPM_BUILD_ROOT%{_sbindir}/%{name}-perl +%{__rm} $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod +%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/nginx/.packlist %endif -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/*.default -rm -rf $RPM_BUILD_ROOT%{_prefix}/html +# only touch these for ghost packaging +touch $RPM_BUILD_ROOT%{_sysconfdir}/{fastcgi,scgi,uwsgi}.params %clean rm -rf $RPM_BUILD_ROOT -%pre common +%pre %groupadd -r -g 213 %{name} %groupadd -g 51 http %useradd -r -u 213 -d /usr/share/empty -s /bin/false -c "Nginx HTTP User" -g %{name} %{name} %addusertogroup %{name} http -%post standard -for a in access.log error.log; do - if [ ! -f /var/log/%{name}/nginx-standard_$a ]; then - umask 022 - touch /var/log/%{name}/nginx-standard_$a - chown nginx:nginx /var/log/%{name}/nginx-standard_$a - chmod 644 /var/log/%{name}/nginx-standard_$a - fi -done -/sbin/chkconfig --add %{name}-standard -%systemd_post %{name}-standard.service -%service %{name}-standard restart -echo 'NOTE: this nginx daemon is using "/etc/nginx/nginx-standard.conf" as config.' -if ! [ -L /etc/systemd/system/nginx.service ] ; then - ln -s %{systemdunitdir}/%{name}-standard.service /etc/systemd/system/nginx.service || : -fi - -%post light +%post for a in access.log error.log; do - if [ ! -f /var/log/%{name}/nginx-light_$a ]; then + if [ ! -f /var/log/%{name}/$a ]; then umask 022 - touch /var/log/%{name}/nginx-light_$a - chown nginx:nginx /var/log/%{name}/nginx-light_$a - chmod 644 /var/log/%{name}/nginx-light_$a + touch /var/log/%{name}/$a + chown nginx:nginx /var/log/%{name}/$a + chmod 644 /var/log/%{name}/$a fi done -/sbin/chkconfig --add %{name}-light -%systemd_post %{name}-light.service -%service %{name}-light restart -echo 'NOTE: this nginx daemon is using "/etc/nginx/nginx-light.conf" as config' +/sbin/chkconfig --add %{name} +%systemd_post %{name}.service +%service %{name} force-reload -%post perl -for a in access.log error.log; do - if [ ! -f /var/log/%{name}/nginx-perl_$a ]; then - umask 022 - touch /var/log/%{name}/nginx-perl_$a - chown nginx:nginx /var/log/%{name}/nginx-perl_$a - chmod 644 /var/log/%{name}/nginx-perl_$a - fi -done -/sbin/chkconfig --add %{name}-perl -%systemd_post %{name}-perl.service -%service %{name}-perl restart -echo 'NOTE: this nginx daemon is using "/etc/nginx/nginx-perl.conf" as config' - -%post mail -for a in access.log error.log; do - if [ ! -f /var/log/%{name}/nginx-mail_$a ]; then - umask 022 - touch /var/log/%{name}/nginx-mail_$a - chown nginx:nginx /var/log/%{name}/nginx-mail_$a - chmod 644 /var/log/%{name}/nginx-mail_$a - fi -done -/sbin/chkconfig --add %{name}-mail -%systemd_post %{name}-mail.service -%service %{name}-mail restart -echo 'NOTE: this nginx daemon is using "/etc/nginx/nginx-mail.conf" as config' - -%preun standard +%preun if [ "$1" = "0" ];then - %service %{name}-standard stop - /sbin/chkconfig --del %{name}-standard -fi -%systemd_preun %{name}-standard.service - -%preun light -if [ "$1" = "0" ]; then - %service %{name}-light stop - /sbin/chkconfig --del %{name}-light -fi -%systemd_preun %{name}-light.service - -%preun perl -if [ "$1" = "0" ]; then - %service %{name}-perl stop - /sbin/chkconfig --del %{name}-perl + %service %{name} stop + /sbin/chkconfig --del %{name} fi -%systemd_preun %{name}-perl.service +%systemd_preun %{name}.service -%preun mail -if [ "$1" = "0" ]; then - %service %{name}-mail stop - /sbin/chkconfig --del %{name}-mail -fi -%systemd_preun %{name}-mail.service - -%postun common +%postun if [ "$1" = "0" ]; then %userremove %{name} %groupremove %{name} fi - -%postun standard %systemd_reload -%postun light -%systemd_reload - -%postun perl -%systemd_reload - -%postun mail -%systemd_reload - -%triggerpostun -- %{name}-standard < 1.4.1-4 -%systemd_trigger %{name}-standard.service - -%triggerpostun -- %{name}-light < 1.4.1-4 -%systemd_trigger %{name}-light.service - -%triggerpostun -- %{name}-perl < 1.4.1-4 -%systemd_trigger %{name}-perl.service - -%triggerpostun -- %{name}-mail < 1.4.1-4 -%systemd_trigger %{name}-mail.service +%triggerpostun -- %{name} < 1.8.0-2 +# skip *this* trigger on downgrade +[ $1 -le 1 ] && exit 0 +ln -sf fastcgi_params %{_sysconfdir}/fastcgi.params +ln -sf scgi_params %{_sysconfdir}/scgi.params +ln -sf uwsgi_params %{_sysconfdir}/uwsgi.params +exit 0 -%files common +%files %defattr(644,root,root,755) %doc CHANGES LICENSE README html/index.html conf/nginx.conf %doc %lang(ru) CHANGES.ru -%dir %attr(754,root,root) %{_sysconfdir} +%dir %attr(750,root,nginx) %{_sysconfdir} %dir %{_nginxdir} %dir %{_nginxdir}/cgi-bin %dir %{_nginxdir}/html %dir %{_nginxdir}/errors %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name} -# XXX: duplicates, don't use such glob here -#%attr(640,root,root) %{_sysconfdir}/*[_-]* %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(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/scgi.params -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/uwsgi.params +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fastcgi_params +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/scgi_params +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/uwsgi_params +%ghost %{_sysconfdir}/fastcgi.params +%ghost %{_sysconfdir}/scgi.params +%ghost %{_sysconfdir}/uwsgi.params %attr(640,root,root) %{_sysconfdir}/mime.types %attr(640,root,root) %{_sysconfdir}/koi-utf %attr(640,root,root) %{_sysconfdir}/koi-win @@ -643,59 +388,56 @@ fi %attr(750,nginx,logs) /var/log/%{name} %config(noreplace,missingok) %verify(not md5 mtime size) %{_nginxdir}/html/* %config(noreplace,missingok) %verify(not md5 mtime size) %{_nginxdir}/errors/* -%ghost /etc/systemd/system/nginx.service -%files standard %defattr(644,root,root,755) -%attr(755,root,root) %{_sbindir}/%{name}-standard -%attr(770,root,%{name}) /var/cache/%{name}-standard -%attr(754,root,root) /etc/rc.d/init.d/%{name}-standard -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}-standard.conf -%{systemdunitdir}/%{name}-standard.service - -%if %{with mail} -%files mail +%attr(755,root,root) %{_sbindir}/%{name} +%attr(770,root,%{name}) /var/cache/%{name} +%attr(754,root,root) /etc/rc.d/init.d/%{name} +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf +%dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/modules +%{systemdunitdir}/%{name}.service + +%if %{with geoip} +%files mod_http_geoip %defattr(644,root,root,755) -%attr(755,root,root) %{_sbindir}/%{name}-mail -%attr(770,root,%{name}) /var/cache/%{name}-mail -%attr(754,root,root) /etc/rc.d/init.d/%{name}-mail -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}-mail.conf -%{systemdunitdir}/%{name}-mail.service +%attr(755,root,root) %{_libdir}/%{name}/modules/ngx_http_geoip_module.so %endif -%if %{with light} -%files light +%if %{with gd} +%files mod_http_image_filter %defattr(644,root,root,755) -%attr(755,root,root) %{_sbindir}/%{name}-light -%attr(770,root,%{name}) /var/cache/%{name}-light -%attr(754,root,root) /etc/rc.d/init.d/%{name}-light -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}-light.conf -%{systemdunitdir}/%{name}-light.service +%attr(755,root,root) %{_libdir}/%{name}/modules/ngx_http_image_filter_module.so %endif %if %{with perl} -%files perl +%files mod_http_perl %defattr(644,root,root,755) -%attr(755,root,root) %{_sbindir}/%{name}-perl -%attr(754,root,root) /etc/rc.d/init.d/%{name}-perl -%attr(770,root,%{name}) /var/cache/%{name}-perl -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}-perl.conf +%attr(755,root,root) %{_libdir}/%{name}/modules/ngx_http_perl_module.so %dir %{perl_vendorarch}/auto/%{name} %attr(755,root,root) %{perl_vendorarch}/auto/%{name}/%{name}.so -%{perl_vendorarch}/auto/%{name}/%{name}.bs %{perl_vendorarch}/%{name}.pm -%{systemdunitdir}/%{name}-perl.service +%{_mandir}/man3/nginx.3pm* %endif -%files -n monit-rc-nginx +%if %{with xslt} +%files mod_http_xslt_filter %defattr(644,root,root,755) -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/monit/%{name}-standard.monitrc -%if %{with perl} -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/monit/%{name}-perl.monitrc -%endif -%if %{with light} -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/monit/%{name}-light.monitrc +%attr(755,root,root) %{_libdir}/%{name}/modules/ngx_http_xslt_filter_module.so %endif + %if %{with mail} -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/monit/%{name}-mail.monitrc +%files mod_mail +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/%{name}/modules/ngx_mail_module.so %endif + +%if %{with stream} +%files mod_stream +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/%{name}/modules/ngx_stream_module.so +%endif + +%files -n monit-rc-nginx +%defattr(644,root,root,755) +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/monit/%{name}.monitrc