# TODO
# - /etc/sysconfig/nginx file
# - missing perl build/install requires
-# - prepare pld style like nginx.conf
-# - maybe -with-cpu-opt=CPU (pentium, pentiumpro, pentium3, pentium4, athlon, opteron, amd64, sparc32, sparc64, ppc64)
+# - 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
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.7
+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
+# Source0-md5: 837bcfb88bdc6b6efc4e63979c9c7b41
Source1: http://www.nginx.eu/favicon.ico
# Source1-md5: 2aaf2115c752cbdbfb8a2f0b3c3189ab
Source2: http://www.nginx.eu/download/proxy.conf
Source13: %{name}-perl.init
Source14: %{name}-standard.conf
Source15: %{name}-standard.monitrc
-Source15: %{name}-standard.init
-Source16: %{name}-mime.types.sh
-Patch0: %{name}-config.patch
+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: pcre
Requires: rc-scripts >= 0.2.0
Requires: zlib
+Suggests: nginx-standard
Provides: group(http)
Provides: group(nginx)
Provides: user(nginx)
Provides: webserver
-Suggests: nginx-standard
Conflicts: logrotate < 3.7-4
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%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.
-Common files for Nginx daemon.
+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".
-Niezb¿dne pliki dla Nginx.
+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/
+Group: Networking/Daemons/HTTP
Requires(post,preun): /sbin/chkconfig
Requires(postun): /usr/sbin/groupdel
Requires(postun): /usr/sbin/userdel
Provides: nginx-daemon
Provides: user(nginx)
Provides: webserver
-#Conflicts: %{name}
-#Conflicts: %{name}-mail
-#Conflicts: %{name}-perl
%description light
-The smallest, but also the fastest Nginx edition. No additional
+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
-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/
+Group: Networking/Daemons/HTTP
Requires(post,preun): /sbin/chkconfig
Requires(postun): /usr/sbin/groupdel
Requires(postun): /usr/sbin/userdel
Requires: openssl
Provides: group(http)
Provides: group(nginx)
-Provides: nginx-daemon
+Provides: nginx-daemon
Provides: user(nginx)
Provides: webserver
-#Conflicts: %{name}
-#Conflicts: %{name}-light
-#Conflicts: %{name}-mail
%description perl
-Nginx with Perl support. Mail modules not included.
+nginx with Perl support. Mail modules not included.
%description perl -l pl.UTF-8
-Nignx z obsługą Perla. Bez wsparcia dla modułów 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: zlib
Provides: group(http)
Provides: group(nginx)
-Provides: nginx-daemon
+Provides: nginx-daemon
Provides: user(nginx)
Provides: webserver
-#Conflicts: %{name}
-#Conflicts: %{name}-light
-#Conflicts: %{name}-perl
%description mail
-Nginx with mail support. Only mail modules included.
+nginx with mail support. Only mail modules included.
%description mail -l pl.UTF-8
-Nginx ze wsparciem tylko dla modułów poczty.
+nginx ze wsparciem tylko dla modułów poczty.
%package standard
-Summary: Configuration files and documentation for Nginx
-Summary(pl.UTF-8): Pliki konfiguracyjne i dokumentacja dla Nginx
-License: BSD-like
-Group: Networking/Daemons
-URL: http://nginx.net/
+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}
-Provides: nginx-daemon
+Requires: openssl
+Provides: group(http)
+Provides: group(nginx)
+Provides: nginx-daemon
Conflicts: logrotate < 3.7-4
%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.
-
-This is standard nginx version, without perl support and imap, pop3,
-smtp proxy.
+This is standard nginx version, without Perl support and IMAP, POP3,
+SMTP proxy.
%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 Sysoev'a
-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".
-
-To jest standardowa wersja nginx, bez obs?ugi perla oraz proxy dla
-imap, pop3, smtp.
+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(pl.UTF-8): Wsparcie Nginx dla monit
-License: BSD-like
+Summary: nginx support for monit
+Summary(pl.UTF-8): Wsparcie nginx dla monit
Group: Applications/System
URL: http://nginx.eu/
-Requires: monit
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 %{SOURCE16} /etc/mime.types
+#sh %{SOURCE17} /etc/mime.types
%build
# NB: not autoconf generated configure
$RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}} \
$RPM_BUILD_ROOT/etc/{logrotate.d,monit}
-#install conf/* $RPM_BUILD_ROOT%{_sysconfdir}
+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 %{SOURCE1} $RPM_BUILD_ROOT%{_nginxdir}/html/favicon.ico
%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}/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
+%service %{name}-light restart
+echo 'NOTE: daemon is now 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
+%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
-
-%pre standard
-/sbin/chkconfig --add %{name}-standard
-%service %{name}-standard restart
-
-%pre light
-/sbin/chkconfig --add %{name}-light
-%service %{name}-light restart
-
-%pre perl
-/sbin/chkconfig --add %{name}-perl
-%service %{name}-perl restart
-
-%pre mail
/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 -q %{name}-standard stop
+if [ "$1" = "0" ];then
+ %service %{name}-standard stop
/sbin/chkconfig --del %{name}-standard
fi
%preun light
if [ "$1" = "0" ]; then
- %service -q %{name}-light stop
+ %service %{name}-light stop
/sbin/chkconfig --del %{name}-light
fi
%preun perl
if [ "$1" = "0" ]; then
- %service -q %{name}-perl stop
+ %service %{name}-perl stop
/sbin/chkconfig --del %{name}-perl
fi
%preun mail
if [ "$1" = "0" ]; then
- %service -q %{name}-mail stop
+ %service %{name}-mail stop
/sbin/chkconfig --del %{name}-mail
fi
%dir %{_nginxdir}/html
%dir %{_nginxdir}/errors
%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(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/*
%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