rpms/tinyerp/FC-3 tinyerp-server.logrotate, NONE, 1.1 tinyerp-server, 1.1, 1.2 tinyerp-server.patch, 1.2, 1.3 tinyerp.spec, 1.8, 1.9

Sun Dec 18 20:19:14 UTC 2005

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23099

Modified Files:
	tinyerp-server tinyerp-server.patch tinyerp.spec 
Added Files:
	tinyerp-server.logrotate 
Log Message:
 - reverted shell change
 - improved init.d script, suggested by Enrico Scholz
 - added log rotation
 - new server patch with improved startup script

--- NEW FILE tinyerp-server.logrotate ---
/var/log/tinyerp/*.log {
    copytruncate
    missingok
    notifempty
}


Index: tinyerp-server
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp-server,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tinyerp-server	27 Nov 2005 09:26:58 -0000	1.1
+++ tinyerp-server	18 Dec 2005 20:19:12 -0000	1.2
@@ -29,38 +29,22 @@
 RETVAL=0
 
 start() {
-    # create temporary startup script to get pid of the server process
-    cat > /tmp/tinyerp-server.run << EOF
-/usr/bin/tinyerp-server $OPTS >> /var/log/tinyerp/tinyerp-server.log 2>&1 &
-echo \$! > /tmp/tinyerp-server.pid
-EOF
-    chmod 0755 /tmp/tinyerp-server.run
-    
     echo -n $"Starting $prog: "
-    su -l tinyerp -c "/tmp/tinyerp-server.run"
+    daemon --user tinyerp --check tinyerp-server "/usr/bin/setsid /usr/bin/tinyerp-server $OPTS &"
+
     RETVAL=$?
-    
-    if [ $RETVAL -eq 0 ]; then
-        mv /tmp/tinyerp-server.pid /var/run
-	
-        touch /var/lock/subsys/tinyerp-server
-        echo_success
-        echo
-    else
-	echo_failure
-	echo
-    fi
-    rm -f /tmp/tinyerp-server.run
+    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/tinyerp-server
+    echo
     return $RETVAL
 }
 
 stop() {
     echo -n  $"Stopping $prog: "
-    kill -TERM `cat /var/run/tinyerp-server.pid` > /dev/null 2>&1
+    kill -TERM `cat /var/spool/tinyerp/tinyerp-server.pid` > /dev/null 2>&1
     RETVAL=$?
     if [ $RETVAL -eq 0 ] ; then
     	rm -f /var/lock/subsys/tinyerp-server
-    	rm -f /var/run/tinyerp-server.pid
+    	rm -f /var/spool/tinyerp/tinyerp-server.pid
 
 	echo_success
 	echo 

tinyerp-server.patch:

Index: tinyerp-server.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp-server.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tinyerp-server.patch	28 Nov 2005 14:40:32 -0000	1.2
+++ tinyerp-server.patch	18 Dec 2005 20:19:12 -0000	1.3
@@ -11,7 +11,7 @@
  Maintainer: Tiny.be
 diff -Nru tinyerp-server-3.1.1.orig/setup.py tinyerp-server-3.1.1/setup.py
 --- tinyerp-server-3.1.1.orig/setup.py	2005-09-18 16:16:19.000000000 +0200
-+++ tinyerp-server-3.1.1/setup.py	2005-11-28 15:30:50.000000000 +0100
++++ tinyerp-server-3.1.1/setup.py	2005-12-18 20:51:56.000000000 +0100
 @@ -21,7 +21,7 @@
  opj = os.path.join
  
@@ -33,3 +33,14 @@
                glob.glob('doc/i18n/*')),
               (opj('lib', 'python%s' % py_short_version, 'site-packages', 'tinyerp-server', 'addons', 'custom'),
                glob.glob('bin/addons/custom/*xml') + 
+@@ -104,8 +104,9 @@
+ # create startup script
+ start_script = \
+ "#!/bin/sh\n\
++echo $$ > /var/spool/tinyerp/tinyerp-server.pid\n\
+ cd %s/lib/python%s/site-packages/tinyerp-server\n\
+-exec %s ./tinyerp-server.py $@" % (sys.prefix, py_short_version, sys.executable)
++exec %s ./tinyerp-server.py $@ >> /var/log/tinyerp/tinyerp-server.log 2>&1" % (sys.prefix, py_short_version, sys.executable)
+ # write script
+ f = open('tinyerp-server', 'w')
+ f.write(start_script)


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tinyerp.spec	14 Dec 2005 14:24:27 -0000	1.8
+++ tinyerp.spec	18 Dec 2005 20:19:12 -0000	1.9
@@ -13,6 +13,7 @@
 Source2:	tinyerp.desktop
 Source3:	tinyerp-server.conf
 Source4:	tinyerp-server
+Source5:	tinyerp-server.logrotate
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	python, pygtk2-devel, pygtk2-libglade
@@ -79,6 +80,7 @@
 
 install -m 644 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/tinyerp-server.conf
 install -m 755 -D %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/tinyerp-server
+install -m 644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/tinyerp-server
 mkdir -p $RPM_BUILD_ROOT/var/log/tinyerp
 mkdir -p $RPM_BUILD_ROOT/var/spool/tinyerp
 
@@ -100,6 +102,7 @@
 %attr(750,tinyerp,tinyerp) %dir /var/spool/tinyerp
 %config(noreplace) %{_sysconfdir}/tinyerp-server.conf
 %{_sysconfdir}/rc.d/init.d/tinyerp-server
+%{_sysconfdir}/logrotate.d/tinyerp-server
 %{_bindir}/tinyerp-server
 %{python_sitelib}/tinyerp-server/   
 %{_defaultdocdir}/%{name}-server-%{version}/
@@ -107,7 +110,7 @@
 
 %pre server
 /usr/sbin/fedora-groupadd 13 -r tinyerp &>/dev/null || :
-/usr/sbin/fedora-useradd 13 -r -s /bin/bash -d /var/spool/tinyerp -M \
+/usr/sbin/fedora-useradd 13 -r -s /sbin/nologin -d /var/spool/tinyerp -M \
 	-c 'TinyERP Server Owner' -g tinyerp tinyerp &>/dev/null || :
 
 exit 0
@@ -131,9 +134,10 @@
 
 
 %changelog
-* Wed Dec 14 2005 Dan Horak <dan at danny.cz> 3.1.1-5
+* Sun Dec 18 2005 Dan Horak <dan at danny.cz> 3.1.1-5
 - added Requires(postun) to the -server package (Ville SkyttÃ¤)
-- tinyerp user requires a real shell
+- improved startup script, suggested by Enrico Scholz
+- added log rotation
 
 * Sun Dec 11 2005 Dan Horak <dan at danny.cz> 3.1.1-4
 - moved Requires(pre) to the -server package (Ville SkyttÃ¤)


