SPECS: cherokee.spec - secure config dirs, add logdir

[glen]

Author: glen                         Date: Sat Dec 31 16:18:39 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- secure config dirs, add logdir

---- Files affected:
SPECS:
   cherokee.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SPECS/cherokee.spec
diff -u SPECS/cherokee.spec:1.8 SPECS/cherokee.spec:1.9
--- SPECS/cherokee.spec:1.8	Sat Dec 31 16:34:58 2005
+++ SPECS/cherokee.spec	Sat Dec 31 17:18:34 2005
@@ -12,7 +12,7 @@
 Summary(pl):	Cherokee - serwer WWW
 Name:		cherokee
 Version:	0.4.29
-Release:	0.7
+Release:	0.12
 License:	GPL v2
 Group:		Networking/Daemons
 Source0:	http://www.0x50.org/download/0.4/0.4.29/%{name}-%{version}.tar.gz
@@ -114,7 +114,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d}
+install -d $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},/var/log/%{name}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -145,7 +145,7 @@
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add %{name}
-%service %{name} restart "Cherokee webserver"
+%service %{name} restart "Cherokee webserver" || :
 
 %preun
 if [ "$1" = "0" ]; then
@@ -164,21 +164,21 @@
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog TODO html
-%dir %{_sysconfdir}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cherokee.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/icons.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/advanced.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mime.conf
-%dir %{_sysconfdir}/mods-available
-%dir %{_sysconfdir}/mods-enabled
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mods-available/admin
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mods-available/ssl
-%dir %{_sysconfdir}/sites-available
-%dir %{_sysconfdir}/sites-enabled
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sites-available/default
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sites-available/example.com
+%dir %attr(750,root,root) %{_sysconfdir}
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cherokee.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/icons.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/advanced.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mime.conf
+%dir %attr(750,root,root) %{_sysconfdir}/mods-available
+%dir %attr(750,root,root) %{_sysconfdir}/mods-enabled
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mods-available/admin
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mods-available/ssl
+%dir %attr(750,root,root) %{_sysconfdir}/sites-available
+%dir %attr(750,root,root) %{_sysconfdir}/sites-enabled
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sites-available/default
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sites-available/example.com
 %config(missingok) %{_sysconfdir}/sites-enabled/default
-%attr(750,root,root) %dir %{_sysconfdir}/ssl
+%dir %attr(750,root,root) %{_sysconfdir}/ssl
 
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/cherokee
 %attr(754,root,root) /etc/rc.d/init.d/cherokee
@@ -221,7 +221,10 @@
 %{_datadir}/cherokee
 
 %dir %{_wwwhome}
-%{_wwwroot}
+%dir %{_wwwroot}
+%config(missingok) %{_wwwroot}/*
+
+%dir %attr(750,root,logs) /var/log/%{name}
 
 %files devel
 %defattr(644,root,root,755)
@@ -243,6 +246,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2005/12/31 16:18:34  glen
+- secure config dirs, add logdir
+
 Revision 1.8  2005/12/31 15:34:58  glen
 - added user
 - files fixes
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/cherokee.spec?r1=1.8&r2=1.9&f=u