rpms/tinyerp/FC-4 tinyerp-server.logrotate, NONE, 1.1 tinyerp-server, 1.1, 1.2 tinyerp.spec, 1.10, 1.11
Dan Horak (sharkcz)
fedora-extras-commits at redhat.com
Sun Dec 18 20:12:54 UTC 2005
Author: sharkcz
Update of /cvs/extras/rpms/tinyerp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22840
Modified Files:
tinyerp-server tinyerp.spec
Added Files:
tinyerp-server.logrotate
Log Message:
- reverted shell change
- improved startup script, suggested by Enrico Scholz
- added log rotation
--- NEW FILE tinyerp-server.logrotate ---
/var/log/tinyerp/*.log {
copytruncate
missingok
notifempty
}
Index: tinyerp-server
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-server,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tinyerp-server 20 Nov 2005 18:40:53 -0000 1.1
+++ tinyerp-server 18 Dec 2005 20:12:51 -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
Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tinyerp.spec 14 Dec 2005 14:26:17 -0000 1.10
+++ tinyerp.spec 18 Dec 2005 20:12:51 -0000 1.11
@@ -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ä)
More information about the scm-commits
mailing list