SPECS: inn.spec - create+own /home/services/news dir - don't mess ...

qboosh qboosh at pld-linux.org
Sat Mar 25 16:34:31 CET 2006


Author: qboosh                       Date: Sat Mar 25 15:34:31 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- create+own /home/services/news dir
- don't mess with syslog configuration - PLD syslogs handle news.* by default now

---- Files affected:
SPECS:
   inn.spec (1.165 -> 1.166) 

---- Diffs:

================================================================
Index: SPECS/inn.spec
diff -u SPECS/inn.spec:1.165 SPECS/inn.spec:1.166
--- SPECS/inn.spec:1.165	Tue Feb 28 20:50:36 2006
+++ SPECS/inn.spec	Sat Mar 25 16:34:25 2006
@@ -359,8 +359,6 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-# FIXME: unify this! and change setup package! and /home/services/news
-# doesn't exist so why bother changing it?
 if [ "`getent passwd news | cut -d: -f6`" = "/var/spool/news" ]; then
 	/usr/sbin/usermod -d /home/services/news news
 fi
@@ -415,35 +413,6 @@
 	chmod 660 /var/log/news/news.err
 fi
 
-
-umask 027
-# DUDE !!! LEAVE MY SYSLOG ALONE!
-if [ -f /etc/syslog.conf ]; then
-	if ! grep -q INN /etc/syslog.conf; then
-		sed -i 's/mail.none;/mail.none;news.none;/' /etc/syslog.conf
-	# FIXME: use cat <<-EOF here
-		echo ''										>> /etc/syslog.conf
-		echo '#'										>> /etc/syslog.conf
-		echo '# INN'									>> /etc/syslog.conf
-		echo '#' 										>> /etc/syslog.conf
-		echo 'news.=crit                                        /var/log/news/news.crit'	>> /etc/syslog.conf
-		echo 'news.=err                                         /var/log/news/news.err'	>> /etc/syslog.conf
-		echo 'news.notice                                       /var/log/news/news.notice'	>> /etc/syslog.conf
-    fi
-	if [ -f /var/run/syslog.pid ]; then
-		kill -HUP `cat /var/run/syslog.pid` 2> /dev/null ||:
-	fi
-else
-# FIXME, i use syslog-ing what then?
-	# syslog.conf does not exist
-	echo "mail.none /var/log/messages" 							> /etc/syslog.conf.inn
-	echo "" 										>> /etc/syslog.conf.inn
-	echo "# INN" 									>> /etc/syslog.conf.inn
-	echo "news.=crit                                      /var/log/news/news.crit"	>> /etc/syslog.conf.inn
-	echo "news.=err                                       /var/log/news/news.err"	>> /etc/syslog.conf.inn
-	echo "news.notice                                     /var/log/news/news.notice"	>> /etc/syslog.conf.inn
-fi
-
 /sbin/chkconfig --add inn
 %service inn restart "inn news server"
 
@@ -464,6 +433,7 @@
 %files
 %defattr(644,root,root,755)
 %doc CONTRIBUTORS ChangeLog INSTALL LICENSE NEWS README TODO doc/[Icehs]*
+%attr(700,news,news) %dir /home/services/news
 
 # DB
 %attr(770,root,news) %dir /var/lib/news
@@ -690,6 +660,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.166  2006/03/25 15:34:25  qboosh
+- create+own /home/services/news dir
+- don't mess with syslog configuration - PLD syslogs handle news.* by default now
+
 Revision 1.165  2006/02/28 19:50:36  glen
 - use %service, unify docdir in %desc, fixed getent http, tabs, planted FIXME-TODO-KILLME-s allover %post, add blocker due that
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/inn.spec?r1=1.165&r2=1.166&f=u



More information about the pld-cvs-commit mailing list