- some bconds

- added favicon.ico
- serverroot /home/services/nginx/
- missing error pages
- missing logrotate
- added nginx.monitrc

Changed files:
    nginx.spec -> 1.18

diff --git a/nginx.spec b/nginx.spec
index eced635d1de4bd02b1e41cc3d6e1036907ad42c3..acfde4cd402deaae7ed60757b89cecf2d34476fe 100644 (file)
--- a/nginx.spec
+++ b/nginx.spec
@@ -1,17 +1,35 @@
 # 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
@@ -29,7 +47,8 @@ Requires(pre):        /usr/sbin/useradd
 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.
@@ -54,16 +73,17 @@ sh %{SOURCE2} /etc/mime.types
        --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}" \
@@ -73,11 +93,18 @@ sh %{SOURCE2} /etc/mime.types
 
 %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}
 
@@ -89,9 +116,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %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
 
@@ -115,7 +151,10 @@ fi
 %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