SPECS: nginx.spec - some bconds - added favicon.ico - serverroot /...

[sardzent]

Author: sardzent                     Date: Wed Sep  5 19:31:01 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- some bconds
- added favicon.ico
- serverroot /home/services/nginx/
- missing error pages
- missing logrotate
- added nginx.monitrc

---- Files affected:
SPECS:
   nginx.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: SPECS/nginx.spec
diff -u SPECS/nginx.spec:1.17 SPECS/nginx.spec:1.18
--- SPECS/nginx.spec:1.17	Wed Sep  5 19:09:41 2007
+++ SPECS/nginx.spec	Wed Sep  5 21:30:56 2007
@@ -1,18 +1,36 @@
 # $Revision$, $Date$
 # TODO
-# - bconds for modules as these are statically linked in
 # - logrotate script
+# - more bconds (??)
+# - subpackage with error pages
+# Conditional build for nginx:
+%bcond_with	stub_status		# stats module
+%bcond_with	rtsig
+%bcond_with	select
+%bcond_with	poll
+%bcond_with	ssl			# ssl support
+%bcond_with	imap			# imap proxy
+%bcond_without	http_browser		# parse header "User-agent"
+#
 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.31
-Release:	2
+Release:	0.1
 License:	BSD-like
 Group:		Networking/Daemons
 Source0:	http://sysoev.ru/nginx/%{name}-%{version}.tar.gz
 # Source0-md5:	d84ef8e624b8953faf9cee2b5da535c1
 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/nginx.monitrc
+# Source5-md5:	1d3f5eedfd34fe95213f9e0fc19daa88
+Source6:	http://www.nginx.eu/download/nginx.conf
+# Source6-md5:	1c112d6f03d0f365e4acc98c1d96261a
 Patch0:		%{name}-config.patch
 URL:		http://nginx.net/
 BuildRequires:	mailcap
@@ -30,7 +48,8 @@
 Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_sysconfdir /etc/%{name}
+%define		_sysconfdir	/etc/%{name}
+%define		_nginxdir	/home/services/%{name}
 
 %description
 High perfomance HTTP and reverse proxy server.
@@ -55,16 +74,17 @@
 	--pid-path=%{_localstatedir}/run/%{name}.pid \
 	--user=nginx \
 	--group=nginx \
-	--with-rtsig_module \
-	--with-select_module \
-	--with-poll_module \
-	--with-http_ssl_module \
-	--with-http_stub_status_module \
+	%{?with_stub_status:--with-http_stub_status_module} \
+	%{?with_rtsig:--with-rtsig_module} \
+	%{?with_select:--with-select_module} \
+	%{?with_poll:--with-poll_module} \
+	%{?with_ssl:--with-http_ssl_module} \
+	%{?with_imap:--with-imap} \
+	%{?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 \
-	--with-imap \
 	--with-cc="%{__cc}" \
 	--with-cc-opt="%{rpmcflags}" \
 	--with-ld-opt="%{rpmldflags}" \
@@ -74,11 +94,18 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_sbindir},%{_sysconfdir},/var/{log/%{name},cache/%{name}}}
+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{%{_sbindir},%{_sysconfdir}}
 
 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 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/proxy.conf
+install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/nginx.monitrc
+install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/nginx.conf
 
 install objs/%{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
 
@@ -90,9 +117,18 @@
 
 %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
+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
+	fi
+done
 /sbin/chkconfig --add %{name}
 %service %{name} restart
 
@@ -116,10 +152,13 @@
 %dir %attr(754,root,root) %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf
 %attr(640,root,root) %{_sysconfdir}/*[_-]*
+%attr(640,root,root) %{_sysconfdir}/proxy.conf
+%attr(640,root,root) %{_sysconfdir}/nginx.monitrc
 %attr(640,root,root) %{_sysconfdir}/mime.types
 %attr(755,root,root) %{_sbindir}/%{name}
 %attr(770,root,%{name}) /var/cache/%{name}
 %attr(750,%{name},logs) /var/log/%{name}
+%attr(755,%{name},%{name}) %{_nginxdir}/html/favicon.ico
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -127,6 +166,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2007/09/05 19:30:56  sardzent
+- some bconds
+- added favicon.ico
+- serverroot /home/services/nginx/
+- missing error pages
+- missing logrotate
+- added nginx.monitrc
+
 Revision 1.17  2007/09/05 17:09:41  sardzent
 - added with-http_stub_status_module
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/nginx.spec?r1=1.17&r2=1.18&f=u