# TODO
# - /etc/sysconfig/nginx file
# - missing perl build/install requires
-# - prepare pld style like nginx.conf
-# - split into nginx-common, nginx, nginx-perl packages
+# - nginx should have own group (and work with it) or use http group ?
#
# Conditional build for nginx:
%bcond_without light # don't build light version
%bcond_without addition # adds module
%bcond_without dav # WebDAV
%bcond_without flv # FLV stream
+%bcond_without sub # ngx_http_sub_module
%bcond_without poll # poll
%bcond_without realip # real ip (behind proxy)
%bcond_without rtsig # rtsig
Summary: High perfomance HTTP and reverse proxy server
Summary(pl.UTF-8): Serwer HTTP i odwrotne proxy o wysokiej wydajności
Name: nginx
-Version: 0.5.33
-Release: 0.2
+Version: 0.6.34
+Release: 1
License: BSD-like
-Group: Networking/Daemons
+Group: Networking/Daemons/HTTP
Source0: http://sysoev.ru/nginx/%{name}-%{version}.tar.gz
-# Source0-md5: a78be74b4fd8e009545ef02488fcac86
-Source1: %{name}.init
-Source2: %{name}-mime.types.sh
-Source3: http://www.nginx.eu/favicon.ico
-# Source3-md5: 2aaf2115c752cbdbfb8a2f0b3c3189ab
-Source4: http://www.nginx.eu/download/proxy.conf
-# Source4-md5: f5263ae01c2edb18f46d5d1df2d3a5cd
-Source5: http://www.nginx.eu/download/%{name}.monitrc
-# Source5-md5: 1d3f5eedfd34fe95213f9e0fc19daa88
-Source6: http://www.nginx.eu/download/%{name}.conf
-# Source6-md5: 1c112d6f03d0f365e4acc98c1d96261a
-Source7: %{name}.logrotate
-Patch0: %{name}-config.patch
+# Source0-md5: 837bcfb88bdc6b6efc4e63979c9c7b41
+Source1: http://www.nginx.eu/favicon.ico
+# Source1-md5: 2aaf2115c752cbdbfb8a2f0b3c3189ab
+Source2: http://www.nginx.eu/download/proxy.conf
+# Source2-md5: f5263ae01c2edb18f46d5d1df2d3a5cd
+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
+Source17: %{name}-mime.types.sh
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.268
BuildRequires: zlib-devel
Requires(pre): /usr/bin/getgid
Requires(pre): /usr/sbin/groupadd
Requires(pre): /usr/sbin/useradd
-Requires: %{name}-common = %{version}-%{release}
+Requires: nginx-daemon
Requires: openssl
Requires: pcre
Requires: rc-scripts >= 0.2.0
Requires: zlib
+Suggests: nginx-standard
Provides: group(http)
Provides: group(nginx)
Provides: user(nginx)
Provides: webserver
Conflicts: logrotate < 3.7-4
-Conflicts: %{name}-light
-Conflicts: %{name}-mail
-Conflicts: %{name}-perl
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
+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
+beta, nginx is known for its stability, rich feature set, simple
configuration, and low resource consumption.
-This is standard nginx version, without perl support and imap, pop3,
-smtp proxy.
+Common files for nginx daemon.
%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 Sysoev'a
+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ÄÅ dzieki stabilnoÅi, bogactwu dodatków,
-prostej konfiguracji oraz maÅej "zasobożernoÅi".
+w fazie beta, już zasÅ\82ynÄ\85Å\82 dziÄ\99ki stabilnoÅ\9bci, bogactwu dodatków,
+prostej konfiguracji oraz maÅ\82ej "zasobożernoÅ\9bci".
-To jest standardowa wersja nginx, bez obs³ugi perla oraz proxy dla
-imap, pop3, smtp.
+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
-License: BSD-like
-Group: Networking/Daemons
-URL: http://nginx.net/
+Summary(pl.UTF-8): Serwer HTTP i odwrotne proxy o wysokiej wydajności
+Group: Networking/Daemons/HTTP
Requires(post,preun): /sbin/chkconfig
Requires(postun): /usr/sbin/groupdel
Requires(postun): /usr/sbin/userdel
-Requires: %{name}-common = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires: openssl
Requires: pcre
Requires: zlib
Provides: group(http)
Provides: group(nginx)
+Provides: nginx-daemon
Provides: user(nginx)
Provides: webserver
-Conflicts: %{name}
-Conflicts: %{name}-mail
-Conflicts: %{name}-perl
%description light
-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.
-
The smallest, but also the fastest nginx edition. No additional
-modules, no perl, no dav, no flv, no imap, pop3, smtp proxy.
+modules, no Perl, no DAV, no FLV, no IMAP, POP3, SMTP proxy.
%description light -l pl.UTF-8
-Nginx ("engine x") jest wysokowydajnym serwerem HTTP, odwrotnym proxy
-a także IMAP/POP3 proxy. Nginx zostaÅ<82> napisany przez Igora Sysoev'a
-na potrzeby serwisu Rambler.ru. Jest to drugi pod wzglÄ<99>dem iloÅ<9B>ci
-odwiedzin serwis w Rosji i dziaÅ<82>a od ponad dwóch i póÅ<82> roku. Igor
-opublikowaÅ<82> źródÅ<82>a na licencji BSD. Mimo, że projekt jest ciÄ<85>gle
-w fazie beta, już zasÅynÄÅ dzieki stabilnoÅi, bogactwu dodatków,
-prostej konfiguracji oraz maÅej "zasobożernoÅi".
-
-Najmniejsza i najszybsza wersja nginx. Bez wsparcia dla perla,
-dav, flv oraz imap, pop3, smtp proxy.
+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
-License: BSD-like
-Group: Networking/Daemons
-URL: http://nginx.net/
+Summary(pl.UTF-8): Serwer HTTP i odwrotne proxy o wysokiej wydajności
+Group: Networking/Daemons/HTTP
Requires(post,preun): /sbin/chkconfig
Requires(postun): /usr/sbin/groupdel
Requires(postun): /usr/sbin/userdel
-Requires: %{name}-common = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires: openssl
-Requires: perl-mod_%{mod_name} = %{epoch}:%{version}-%{release}
Provides: group(http)
Provides: group(nginx)
+Provides: nginx-daemon
Provides: user(nginx)
Provides: webserver
-Conflicts: %{name}
-Conflicts: %{name}-light
-Conflicts: %{name}-mail
%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.
-
-Nginx with perl support. Mail modules not included.
+nginx with Perl support. Mail modules not included.
%description perl -l pl.UTF-8
-Nginx ("engine x") jest wysokowydajnym serwerem HTTP, odwrotnym proxy
-a także IMAP/POP3 proxy. Nginx zostaÅ<82> napisany przez Igora Sysoev'a
-na potrzeby serwisu Rambler.ru. Jest to drugi pod wzglÄ<99>dem iloÅ<9B>ci
-odwiedzin serwis w Rosji i dziaÅ<82>a od ponad dwóch i póÅ<82> roku. Igor
-opublikowaÅ<82> źródÅ<82>a na licencji BSD. Mimo, że projekt jest ciÄ<85>gle
-w fazie beta, już zasÅynÄÅ dzieki stabilnoÅi, bogactwu dodatków,
-prostej konfiguracji oraz maÅej "zasobożernoÅi".
-
-Nginx z obsluga perla. Bez wsparcia dla modulow poczty.
+nginx z obsługą Perla. Bez wsparcia dla modułów poczty.
%package mail
-Summary: High perfomance HTTP and reverse proxy server
-Summary(pl.UTF-8): Serwer HTTP i odwrotne proxy o wysokiej wydajno�~[ci
-License: BSD-like
-Group: Networking/Daemons
-URL: http://nginx.net/
+Summary: High perfomance IMAP, POP3, SMTP proxy server
+Summary(pl.UTF-8): IMAP, POP3, SMTP proxy o wysokiej wydajności
+Group: Networking/Daemons/HTTP
Requires(post,preun): /sbin/chkconfig
Requires(postun): /usr/sbin/groupdel
Requires(postun): /usr/sbin/userdel
-Requires: %{name}-common = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires: openssl
Requires: pcre
Requires: zlib
Provides: group(http)
Provides: group(nginx)
+Provides: nginx-daemon
Provides: user(nginx)
Provides: webserver
-Conflicts: %{name}
-Conflicts: %{name}-light
-Conflicts: %{name}-perl
%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.
-
-Nginx with mail support. Only mail modules included.
+nginx with mail support. Only mail modules included.
%description mail -l pl.UTF-8
-Nginx ("engine x") jest wysokowydajnym serwerem HTTP, odwrotnym proxy
-a także IMAP/POP3 proxy. Nginx zostaÅ<82> napisany przez Igora Sysoev'a
-na potrzeby serwisu Rambler.ru. Jest to drugi pod wzglÄ<99>dem iloÅ<9B>ci
-odwiedzin serwis w Rosji i dziaÅ<82>a od ponad dwóch i póÅ<82> roku. Igor
-opublikowaÅ<82> źródÅ<82>a na licencji BSD. Mimo, że projekt jest ciÄ<85>gle
-w fazie beta, już zasÅynÄÅ dzieki stabilnoÅi, bogactwu dodatków,
-prostej konfiguracji oraz maÅej "zasobożernoÅi".
-
-Nginx ze wsparciem tylko dla modulow poczty.
-
+nginx ze wsparciem tylko dla modułów poczty.
-%package common
-Summary: Configuration files and documentation for Nginx
-Summary(pl.UTF-8): Pliki konfiguracyjne i dokumentacja dla Nginx
-Group: Networking/Daemons
-
-%description common
-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.
-
-Common files for nginx daemon.
+%package standard
+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(postun): /usr/sbin/groupdel
+Requires(postun): /usr/sbin/userdel
+Requires: %{name} = %{version}-%{release}
+Requires: openssl
+Provides: group(http)
+Provides: group(nginx)
+Provides: nginx-daemon
+Conflicts: logrotate < 3.7-4
-%description common -l pl.UTF-8
-Nginx ("engine x") jest wysokowydajnym serwerem HTTP, odwrotnym proxy
-a także IMAP/POP3 proxy. Nginx zostaÅ<82> napisany przez Igora Sysoev'a
-na potrzeby serwisu Rambler.ru. Jest to drugi pod wzglÄ<99>dem iloÅ<9B>ci
-odwiedzin serwis w Rosji i dziaÅ<82>a od ponad dwóch i póÅ<82> roku. Igor
-opublikowaÅ<82> źródÅ<82>a na licencji BSD. Mimo, że projekt jest ciÄ<85>gle
-w fazie beta, już zasÅynÄÅ dzieki stabilnoÅi, bogactwu dodatków,
-prostej konfiguracji oraz maÅej "zasobożernoÅi".
+%description standard
+This is standard nginx version, without Perl support and IMAP, POP3,
+SMTP proxy.
-Niezbedne pliki dla nginx.
+%description standard -l pl.UTF-8
+To jest standardowa wersja nginx, bez obsługi Perla oraz proxy dla
+IMAP, POP3, SMTP.
%package -n monit-rc-nginx
-Summary: Nginx support for monit
+Summary: nginx support for monit
Summary(pl.UTF-8): Wsparcie nginx dla monit
-License: BSD-like
Group: Applications/System
URL: http://nginx.eu/
Requires: %{name} = %{version}-%{release}
Requires: monit
%description -n monit-rc-nginx
-monitrc file for monitoring nginx webserver server.
+monitrc file for monitoring nginx webserver.
%description -n monit-rc-nginx -l pl.UTF-8
-Plik monitrc do monitorowania serwera www nginx.
-
+Plik monitrc do monitorowania serwera WWW nginx.
%prep
%setup -q
-%patch0 -p0
# build mime.types.conf
-sh %{SOURCE2} /etc/mime.types
+#sh %{SOURCE17} /etc/mime.types
%build
# NB: not autoconf generated configure
%if %{with perl}
./configure \
--prefix=%{_prefix} \
- --sbin-path=%{_sbindir}/%{name} \
- --conf-path=%{_sysconfdir}/%{name}.conf \
- --error-log-path=%{_localstatedir}/log/%{name}/error.log \
- --pid-path=%{_localstatedir}/run/%{name}.pid \
- --lock-path=%{_localstatedir}/lock/subsys/%{name} \
+ --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 \
--user=nginx \
--group=nginx \
--with-http_perl_module \
%{?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_poll:--with-poll_module} \
%{?with_realip:--with-http_realip_module} \
%{?with_rtsig:--with-rtsig_module} \
%{?with_status:--with-http_stub_status_module} \
%{?with_ssl:--with-http_ssl_module} \
%{!?with_http_browser:--without-http_browser_module} \
- --http-log-path=%{_localstatedir}/log/%{name}/access.log \
- --http-client-body-temp-path=%{_localstatedir}/cache/%{name}/client_body_temp \
- --http-proxy-temp-path=%{_localstatedir}/cache/%{name}/proxy_temp \
- --http-fastcgi-temp-path=%{_localstatedir}/cache/%{name}/fastcgi_temp \
+ --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/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
%if %{with mail}
-%{__make} clean
./configure \
--prefix=%{_prefix} \
- --sbin-path=%{_sbindir}/%{name} \
- --conf-path=%{_sysconfdir}/%{name}.conf \
- --error-log-path=%{_localstatedir}/log/%{name}/error.log \
- --pid-path=%{_localstatedir}/run/%{name}.pid \
- --lock-path=%{_localstatedir}/lock/subsys/%{name} \
+ --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_ssl_module \
- %{?with_addition:--with-http_addition_module} \
+ --without-http \
%{?with_poll:--with-poll_module} \
- %{?with_realip:--with-http_realip_module} \
%{?with_rtsig:--with-rtsig_module} \
%{?with_select:--with-select_module} \
- %{!?with_http_browser:--without-http_browser_module} \
- --http-log-path=%{_localstatedir}/log/%{name}/access.log \
- --http-client-body-temp-path=%{_localstatedir}/cache/%{name}/client_body_temp \
- --http-proxy-temp-path=%{_localstatedir}/cache/%{name}/proxy_temp \
- --http-fastcgi-temp-path=%{_localstatedir}/cache/%{name}/fastcgi_temp \
+ --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
+mv -f objs/nginx contrib/nginx-mail
%endif
%if %{with light}
-%{__make} clean
./configure \
--prefix=%{_prefix} \
- --sbin-path=%{_sbindir}/%{name} \
- --conf-path=%{_sysconfdir}/%{name}.conf \
- --error-log-path=%{_localstatedir}/log/%{name}/error.log \
- --pid-path=%{_localstatedir}/run/%{name}.pid \
- --lock-path=%{_localstatedir}/lock/subsys/%{name} \
+ --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_poll:--with-poll_module} \
--without-mail_pop3_module \
--without-mail_imap_module \
--without-mail_smtp_module \
- --http-log-path=%{_localstatedir}/log/%{name}/access.log \
- --http-client-body-temp-path=%{_localstatedir}/cache/%{name}/client_body_temp \
- --http-proxy-temp-path=%{_localstatedir}/cache/%{name}/proxy_temp \
- --http-fastcgi-temp-path=%{_localstatedir}/cache/%{name}/fastcgi_temp \
+ --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 \
--with-cc="%{__cc}" \
--with-cc-opt="%{rpmcflags}" \
--with-ld-opt="%{rpmldflags}" \
%{?debug:--with-debug}
%{__make}
-mv -f objs/nginx contrib/nginx.light
+mv -f objs/nginx contrib/nginx-light
%endif
-%{__make} clean
./configure \
--prefix=%{_prefix} \
- --sbin-path=%{_sbindir}/%{name} \
- --conf-path=%{_sysconfdir}/%{name}.conf \
- --error-log-path=%{_localstatedir}/log/%{name}/error.log \
- --pid-path=%{_localstatedir}/run/%{name}.pid \
- --lock-path=%{_localstatedir}/lock/subsys/%{name} \
+ --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_addition:--with-http_addition_module} \
%{?with_dav:--with-http_dav_module} \
%{?with_flv:--with-http_flv_module} \
- %{?with_imap:--with-imap} \
- %{?with_mail:--with-mail} \
- %{?with_mail:--with-mail_ssl_module} \
- %{?with_perl:--with-http_perl_module} \
+ %{?with_sub:--with-http_sub_module} \
%{?with_poll:--with-poll_module} \
%{?with_realip:--with-http_realip_module} \
%{?with_rtsig:--with-rtsig_module} \
%{?with_status:--with-http_stub_status_module} \
%{?with_ssl:--with-http_ssl_module} \
%{!?with_http_browser:--without-http_browser_module} \
- --http-log-path=%{_localstatedir}/log/%{name}/access.log \
- --http-client-body-temp-path=%{_localstatedir}/cache/%{name}/client_body_temp \
- --http-proxy-temp-path=%{_localstatedir}/cache/%{name}/proxy_temp \
- --http-fastcgi-temp-path=%{_localstatedir}/cache/%{name}/fastcgi_temp \
+ --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}" \
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}},%{_localstatedir}/cache/%{name}} \
- $RPM_BUILD_ROOT%{_localstatedir}/lock/subsys/%{name} \
+ $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{%{_sbindir},%{_sysconfdir}} \
$RPM_BUILD_ROOT/etc/{logrotate.d,monit}
-install conf/* $RPM_BUILD_ROOT%{_sysconfdir}
-install mime.types $RPM_BUILD_ROOT%{_sysconfdir}/mime.types
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-install %{SOURCE3} $RPM_BUILD_ROOT%{_nginxdir}/html/favicon.ico
+install conf/fastcgi_params $RPM_BUILD_ROOT%{_sysconfdir}/fastcgi.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 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/proxy.conf
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/monit/%{name}.monitrc
-install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/nginx.conf
-install %{SOURCE7} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
-install objs/%{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
+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 objs/%{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}-standard
%if %{with light}
-install contrib/nginx.light $RPM_BUILD_ROOT%{_sbindir}/%{name}
+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 contrib/nginx-light $RPM_BUILD_ROOT%{_sbindir}/%{name}-light
%endif
%if %{with mail}
-install contrib/nginx.mail $RPM_BUILD_ROOT%{_sbindir}/%{name}
+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 contrib/nginx-mail $RPM_BUILD_ROOT%{_sbindir}/%{name}-mail
%endif
%if %{with perl}
install -d $RPM_BUILD_ROOT{%{perl_vendorarch},%{perl_vendorarch}/auto/%{name}}
-install objs/src/http/modules/perl/nginx.pm $RPM_BUILD_ROOT%{perl_vendorarch}/%{name}.pm
-install objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.so $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so
-install objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.bs $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.bs
-install contrib/nginx.perl $RPM_BUILD_ROOT%{_sbindir}/%{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 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
%endif
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/*.default
%useradd -r -u 213 -d /usr/share/empty -s /bin/false -c "Nginx HTTP User" -g %{name} %{name}
%addusertogroup %{name} http
-%post
+%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
+%service %{name}-standard restart
+echo 'NOTE: daemon is now using "/etc/nginx/nginx-standard.conf" as config.'
+
+%post light
for a in access.log error.log; do
- if [ ! -f /var/log/%{name}/$a ]; then
- touch /var/log/%{name}/$a
- chown nginx:nginx /var/log/%{name}/$a
- chmod 644 /var/log/%{name}/$a
+ 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}
-%service %{name} restart
+/sbin/chkconfig --add %{name}-light
+%service %{name}-light restart
+echo 'NOTE: daemon is now using "/etc/nginx/nginx-light.conf" as config'
-%preun
+%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
+%service %{name}-perl restart
+echo 'NOTE: daemon is now 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
+%service %{name}-mail restart
+echo 'NOTE: daemon is now using "/etc/nginx/nginx-mail.conf" as config'
+
+%preun standard
+if [ "$1" = "0" ];then
+ %service %{name}-standard stop
+ /sbin/chkconfig --del %{name}-standard
+fi
+
+%preun light
+if [ "$1" = "0" ]; then
+ %service %{name}-light stop
+ /sbin/chkconfig --del %{name}-light
+fi
+
+%preun perl
+if [ "$1" = "0" ]; then
+ %service %{name}-perl stop
+ /sbin/chkconfig --del %{name}-perl
+fi
+
+%preun mail
if [ "$1" = "0" ]; then
- %service -q %{name} stop
- /sbin/chkconfig --del %{name}
+ %service %{name}-mail stop
+ /sbin/chkconfig --del %{name}-mail
fi
%postun
%files
%defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/%{name}
-
-%files common
-%defattr(644,root,root,755)
-%doc CHANGES LICENSE README html/index.html conf/nginx.conf objs/src/http/modules/perl/blib/man3/nginx.3pm
+%doc CHANGES LICENSE README html/index.html conf/nginx.conf
%doc %lang(ru) CHANGES.ru
-%attr(754,root,root) /etc/rc.d/init.d/%{name}
%dir %attr(754,root,root) %{_sysconfdir}
%dir %{_nginxdir}
%dir %{_nginxdir}/cgi-bin
%dir %{_nginxdir}/html
%dir %{_nginxdir}/errors
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
-%attr(640,root,root) %{_sysconfdir}/*[_-]*
-%attr(640,root,root) %{_sysconfdir}/proxy.conf
+# 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) %{_sysconfdir}/mime.types
-%attr(770,root,%{name}) /var/cache/%{name}
+%attr(640,root,root) %{_sysconfdir}/koi-utf
+%attr(640,root,root) %{_sysconfdir}/koi-win
+%attr(640,root,root) %{_sysconfdir}/win-utf
%attr(750,root,root) %dir /var/log/archive/%{name}
%attr(750,%{name},logs) /var/log/%{name}
%config(noreplace,missingok) %verify(not md5 mtime size) %{_nginxdir}/html/*
%config(noreplace,missingok) %verify(not md5 mtime size) %{_nginxdir}/errors/*
+%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
+
%if %{with mail}
%files mail
%defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/%{name}
+%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
%endif
%if %{with light}
%files light
%defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/%{name}
+%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
%endif
%if %{with perl}
%files perl
%defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/%{name}
+%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
%dir %{perl_vendorarch}/auto/%{name}
%attr(755,root,root) %{perl_vendorarch}/auto/%{name}/%{name}.so
-%attr(700,root,root) %{perl_vendorarch}/auto/%{name}/%{name}.bs
-%attr(700,root,root) %{perl_vendorarch}/%{name}.pm
+%{perl_vendorarch}/auto/%{name}/%{name}.bs
+%{perl_vendorarch}/%{name}.pm
%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
+%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
+%endif
+%if %{with mail}
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/monit/%{name}-mail.monitrc
+%endif