Vanilla Development Mailing List Archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CVS update: Vanilla/rpm
Date: Saturday July 17, 1999 @ 1:48
Author: tanner
Update of /home/netrek/cvsroot/Vanilla/rpm
In directory cvs.castle.real-time.com:/var/tmp/cvs-serv12821/rpm
Modified Files:
Vanilla.spec cvs2rpm netrek.init netrek.logrotate
Added Files:
netrek.functions
Log Message:
* rpm/cvs2rpm (source): Copy the netrek.functions into the
RPM_BUILD_SOURCE directory.
* rpm/netrek.init: New functions for running daemon processes as
non-root users AND still keep it looking like a Redhat 6.0 runlevel.
* rpm/netrek.functions: Some customized init script functions
needed to allow Redhat to run daemons as non-root users.
* rpm/Vanilla.spec (Group): symlink logfiles that are generated in
LIBDIR to their linux-location in /var/log/netrek.
* rpm/netrek.logrotate: Added errors.LOG
****************************************
Index: Vanilla/rpm/Vanilla.spec
diff -u Vanilla/rpm/Vanilla.spec:1.16 Vanilla/rpm/Vanilla.spec:1.17
--- Vanilla/rpm/Vanilla.spec:1.16 Fri Jul 16 18:00:33 1999
+++ Vanilla/rpm/Vanilla.spec Sat Jul 17 01:48:44 1999
@@ -117,7 +117,7 @@
touch $RPM_BUILD_ROOT/usr/bin/netrekd
touch $RPM_BUILD_ROOT/usr/games/netrek/rsa_key
-for f in god.LOG log logfile mesg.LOG newstartd.LOG updated.LOG; do
+for f in god.LOG log logfile mesg.LOG newstartd.LOG updated.LOG errors.LOG; do
touch $RPM_BUILD_ROOT/var/log/netrek/$f
done
@@ -125,15 +125,31 @@
#install -c gum $RPM_BUILD_DIR/usr/games/netrek/gum
%clean
-rm -rf $RPM_BUILD_ROOT
+# rm -rf $RPM_BUILD_ROOT
%post
chkconfig --add netrek
+
+# James wants netrekd int /usr/bin, so symlink
ln -s /usr/games/netrek/newstartd /usr/bin/netrekd
+# newstart/netrekd writes logs to LIBDIR/log, symlink it to
+# /var/log/netrek/newstartd.LOG to keep with the linux standards.
+ln -s /var/log/netrek/newstartd.LOG /usr/games/netrek/log
+ln -s /var/log/netrek/god.LOG /usr/games/netrek/god.LOG
+ln -s /var/log/netrek/logfile /usr/games/netrek/newstartd.LOG
+ln -s /var/log/netrek/ERRORS /usr/games/netrek/errors.LOG
+
+%preun
+rm -f /usr/bin/netrekd
+rm -f /usr/games/netrek/log
+rm -f /usr/games/netrek/god.LOG
+rm -f /usr/games/netrek/newstartd.LOG
+rm -f /usr/games/netrek/errors.LOG
+
+
%postun
chkconfig --del netrek
-rm -f /usr/bin/netrekd
%files
%defattr(-, root, root)
@@ -151,6 +167,7 @@
%ghost /var/log/netrek/mesg.LOG
%ghost /var/log/netrek/updated.LOG
%ghost /var/log/netrek/newstartd.LOG
+%ghost /var/log/netrek/errors.LOG
%config /usr/games/netrek/.planets
%config /usr/games/netrek/.features
%config /usr/games/netrek/.motd_clue
@@ -169,6 +186,7 @@
%config /usr/games/netrek/.bypass
%config /usr/games/netrek/.clue-bypass
/etc/cron.hourly/netrek
+%ghost /usr/games/netrek/log
/usr/games/netrek/rsa_key
/usr/games/netrek/ntserv
/usr/games/netrek/daemonII
Index: Vanilla/rpm/cvs2rpm
diff -u Vanilla/rpm/cvs2rpm:1.6 Vanilla/rpm/cvs2rpm:1.7
--- Vanilla/rpm/cvs2rpm:1.6 Fri Jul 16 08:31:16 1999
+++ Vanilla/rpm/cvs2rpm Sat Jul 17 01:48:44 1999
@@ -5,7 +5,7 @@
#
# Make sure you check and set your VS and VL variable to get this to work.
#
-# $Id: cvs2rpm,v 1.6 1999/07/16 13:31:16 cameron Exp $
+# $Id: cvs2rpm,v 1.7 1999/07/17 06:48:44 tanner Exp $
#
# Change these if necessary!
@@ -88,7 +88,7 @@
exit 1
fi
-for i in init logrotate crontab; do
+for i in init logrotate crontab functions; do
cp netrek.$i $RPM_SOURCE_DIR
if [ $? -ne 0 ]; then
echo "Cannot cp netrek.$ to $RPM_SOURCE_DIR. Aborting."
Index: Vanilla/rpm/netrek.init
diff -u Vanilla/rpm/netrek.init:1.5 Vanilla/rpm/netrek.init:1.6
--- Vanilla/rpm/netrek.init:1.5 Fri Jul 16 18:00:33 1999
+++ Vanilla/rpm/netrek.init Sat Jul 17 01:48:44 1999
@@ -13,6 +13,9 @@
# Source function library.
. /etc/rc.d/init.d/functions
+# Source Vanilla Development function library
+. /etc/rc.d/init.d/functions-games
+
# Source networking configuration.
. /etc/sysconfig/network
@@ -28,15 +31,15 @@
start)
# Start the server.
echo -n "Starting netrek server: "
- su -c "/usr/games/netrek/tools/updatekeys" - games
- su -c "netrekd >> /var/log/netrek/newstartd.LOG 2>&1" - games
+ run_as games /usr/games/netrek/tools/updatekeys
+ daemon_user games netrekd
echo
touch /var/lock/subsys/netrek
;;
stop)
# Stop the server.
echo -n "Shutting down netrek server: "
- su -c "netrekd stop >> /var/log/netrek/newstartd.LOG 2>&1" - games
+ killproc "netrekd"
echo
rm -f /var/lock/subsys/netrek
;;
@@ -53,4 +56,3 @@
esac
exit 0
-
Index: Vanilla/rpm/netrek.logrotate
diff -u Vanilla/rpm/netrek.logrotate:1.2 Vanilla/rpm/netrek.logrotate:1.3
--- Vanilla/rpm/netrek.logrotate:1.2 Fri Jul 16 03:20:13 1999
+++ Vanilla/rpm/netrek.logrotate Sat Jul 17 01:48:44 1999
@@ -22,3 +22,10 @@
monthly
create 0644 games games
}
+
+/var/log/netrek/errors.LOG {
+ monthly
+ create 0644 games games
+}
+
+