X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=nginx.spec;h=a8fa11eee4107218feb1069979f6dedf7edffd15;hb=1a97cd6dd59968a3d3e778ee91e6a7a93f0a57e8;hp=e0f1c3406c76cf420328cd9de4ce454f72179cad;hpb=3c75ce8a320f49acfc43838b79069abdb31e9429;p=packages%2Fnginx.git diff --git a/nginx.spec b/nginx.spec index e0f1c34..a8fa11e 100644 --- a/nginx.spec +++ b/nginx.spec @@ -3,13 +3,11 @@ # - missing perl build/install requires # # Conditional build for nginx: -%bcond_with 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) @@ -18,6 +16,10 @@ %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_with rtmp # rtmp support %bcond_with debug # enable debug logging: http://nginx.org/en/docs/debugging_log.html @@ -48,74 +50,48 @@ Source1: http://nginx.net/favicon.ico Source2: proxy.conf Source3: %{name}.logrotate Source4: %{name}.mime -Source6: %{name}-light.monitrc +Source6: %{name}.monitrc Source7: %{name}.init -Source8: %{name}-mail.conf -Source9: %{name}-mail.monitrc -Source12: %{name}-perl.monitrc Source14: %{name}.conf -Source15: %{name}-standard.monitrc Source17: %{name}-mime.types.sh -Source18: %{name}-standard.service -Source19: %{name}-light.service -Source20: %{name}-perl.service -Source21: %{name}-mail.service +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}/nginx-rtmp-module-%{rtmp_version}.tar.gz +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/ -%{?with_modsecurity:BuildRequires: lua-devel} BuildRequires: mailcap -%{?with_ssl:BuildRequires: openssl-devel >= %{ssl_version}} 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 -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: rc-scripts >= 0.2.0 -Requires: systemd-units >= 38 -Suggests: vim-syntax-nginx +%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) @@ -127,27 +103,24 @@ Provides: webserver(mime) Provides: webserver(reqtimeout) Provides: webserver(rewrite) Provides: webserver(setenv) -Obsoletes: nginx < 1.4.1-4.1 Conflicts: logrotate < 3.8.0 - -%description common -Common files for the nginx daemon. - -%description common -l pl.UTF-8 -Niezbędne pliki dla nginx. - -%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} -%{?with_ssl:Requires: openssl >= %{ssl_version}} -Provides: nginx-daemon -Provides: webserver +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: rc-scripts >= 0.2.0 +Requires: systemd-units >= 38 +Suggests: vim-syntax-nginx +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%description light +%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 @@ -156,10 +129,7 @@ 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 @@ -168,123 +138,60 @@ 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 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} -%{?with_ssl:Requires: openssl >= %{ssl_version}} -Provides: nginx-daemon -Provides: webserver - -%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_geoip +Summary: Nginx HTTP geoip module +Group: Daemons +Requires: %{name} = %{version}-%{release} +Requires: GeoIP -nginx with Perl support. Mail modules not included. +%description mod_http_geoip +Nginx HTTP geoip 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". +%package mod_http_image_filter +Summary: Nginx HTTP image filter module +Group: Daemons +Requires: %{name} = %{version}-%{release} -nginx z obsługą Perla. Bez wsparcia dla modułów poczty. +%description mod_http_image_filter +Nginx HTTP image filter module. -%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} -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} -%{?with_ssl:Requires: openssl >= %{ssl_version}} -Provides: nginx -Provides: nginx-daemon -Provides: webserver -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 @@ -309,11 +216,6 @@ mv nginx-rtmp-module-%{rtmp_version} nginx-rtmp-module # NB: not autoconf generated configure cp -f configure auto/ -install -d bin - -# build with default options -build() { - local type=$1; shift ./configure \ --prefix=%{_prefix} \ --modules-path=%{_libdir}/%{name}/modules \ @@ -328,40 +230,25 @@ build() { --http-proxy-temp-path=%{_localstatedir}/cache/%{name}/proxy_temp \ --user=nginx \ --group=nginx \ - %{?with_ipv6:--with-ipv6} \ %{?with_select:--with-select_module} \ %{?with_poll:--with-poll_module} \ %{?with_rtsig:--with-rtsig_module} \ -%if %{with perl} - --with-http_perl_module=dynamic \ -%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} --with-mail=dynamic \ --with-mail_ssl_module \ +%endif +%if %{with stream} + --with-stream=dynamic \ + --with-stream_ssl_module \ %endif --with-cc="%{__cc}" \ --with-cc-opt="%{rpmcflags}" \ --with-ld-opt="%{rpmldflags}" \ %{?with_debug:--with-debug} \ - "$@" -%{__make} -} - -%if %{with modsecurity} -cd modsecurity-%{modsecurity_version} -./autogen.sh -%configure \ - --enable-standalone-module \ - --disable-mlogc \ - --enable-alp2 \ - --with-lua=/usr -%{__make} -cd .. -%endif - -%if %{with perl} && 0 -build perl \ - --with-http_perl_module \ %{?with_addition:--with-http_addition_module} \ %{?with_dav:--with-http_dav_module} \ %{?with_flv:--with-http_flv_module} \ @@ -374,68 +261,31 @@ build perl \ %{?with_auth_request:--with-http_auth_request_module} \ %{?with_threads:--with-threads} \ %{?with_http2:--with-http_v2_module} \ - --with-http_secure_link_module \ - %{nil} - -mv -f objs/nginx bin/nginx-perl -mv -f objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.so bin/nginx.so -mv -f objs/src/http/modules/perl/nginx.pm bin/nginx.pm -%endif - -%if %{with mail} && 0 -build mail \ - --without-http \ - --with-imap \ - --with-mail \ - --with-mail_ssl_module \ - %{nil} - -mv -f objs/nginx bin/nginx-mail -%endif - -%if %{with light} -build light \ - %{?with_realip:--with-http_realip_module} \ - %{?with_status:--with-http_stub_status_module} \ - %{?with_ssl:--with-http_ssl_module} \ - %{?with_rtmp:--add-module=./nginx-rtmp-module} \ - %{?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} \ - --without-http_browser_module \ --with-http_secure_link_module \ %{nil} -mv -f objs/nginx bin/nginx-light -%endif - -build standard \ - %{?with_addition:--with-http_addition_module} \ - %{?with_dav:--with-http_dav_module} \ - %{?with_flv:--with-http_flv_module} \ - %{?with_sub:--with-http_sub_module} \ - %{?with_realip:--with-http_realip_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} \ - %{?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} -mv -f objs/nginx bin/nginx-standard +%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} @@ -446,6 +296,11 @@ install -d $RPM_BUILD_ROOT/etc/rc.d/init.d \ %{__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 @@ -465,130 +320,40 @@ 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 force-reload -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 -for a in access.log error.log; do - if [ ! -f /var/log/%{name}/nginx-light_$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 - fi -done -/sbin/chkconfig --add %{name}-light -%systemd_post %{name}-light.service -%service %{name}-light force-reload -echo 'NOTE: this nginx daemon is using "/etc/nginx/nginx-light.conf" as config' - -%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 force-reload -echo 'NOTE: this nginx daemon is using "/etc/nginx/nginx-perl.conf" as config' - -%post mail +%post for a in access.log error.log; do - if [ ! -f /var/log/%{name}/nginx-mail_$a ]; then + if [ ! -f /var/log/%{name}/$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 + touch /var/log/%{name}/$a + chown nginx:nginx /var/log/%{name}/$a + chmod 644 /var/log/%{name}/$a fi done -/sbin/chkconfig --add %{name}-mail -%systemd_post %{name}-mail.service -%service %{name}-mail force-reload -echo 'NOTE: this nginx daemon is using "/etc/nginx/nginx-mail.conf" as config' +/sbin/chkconfig --add %{name} +%systemd_post %{name}.service +%service %{name} force-reload -%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 -fi -%systemd_preun %{name}-perl.service - -%preun mail -if [ "$1" = "0" ]; then - %service %{name}-mail stop - /sbin/chkconfig --del %{name}-mail + %service %{name} stop + /sbin/chkconfig --del %{name} fi -%systemd_preun %{name}-mail.service +%systemd_preun %{name}.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 common -- %{name}-common < 1.8.0-2 +%triggerpostun -- %{name} < 1.8.0-2 # skip *this* trigger on downgrade [ $1 -le 1 ] && exit 0 ln -sf fastcgi_params %{_sysconfdir}/fastcgi.params @@ -596,7 +361,7 @@ 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 @@ -606,8 +371,6 @@ exit 0 %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 @@ -625,73 +388,56 @@ exit 0 %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/* -%if 0 -%ghost /etc/systemd/system/nginx.service -%files standard %defattr(644,root,root,755) -%endif %attr(755,root,root) %{_sbindir}/%{name} -%if 0 -%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 -%endif - -%if %{with mail} -%files mail +%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) %{_libdir}/%{name}/modules/ngx_mail_module.so -%endif -%if 0 -%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) %{_libdir}/%{name}/modules/ngx_http_perl_module.so -%if 0 -%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 -%endif %dir %{perl_vendorarch}/auto/%{name} %attr(755,root,root) %{perl_vendorarch}/auto/%{name}/%{name}.so %{perl_vendorarch}/%{name}.pm %{_mandir}/man3/nginx.3pm* -%if 0 -%{systemdunitdir}/%{name}-perl.service -%endif %endif -%if 0 -%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