[myserver-commit] [SCM] GNU MyServer branch, master, updated. 2ada0449424827d1a1a445cd4578c0ae49a6a738

[Giuseppe Scrivano]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  2ada0449424827d1a1a445cd4578c0ae49a6a738 (commit)
       via  fc8a8e2b6f14b287622965e6ae7ec6434cdb3f6e (commit)
      from  7f0c89b9f11c75439d20a0a36d6cb5cae34d9365 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 2ada0449424827d1a1a445cd4578c0ae49a6a738
Author: Giuseppe Scrivano <address@hidden>
Date:   Sat Jul 18 20:52:25 2009 +0200

    Install the correct configuration files.

diff --git a/myserver/binaries/Makefile.am b/myserver/binaries/Makefile.am
index afc027e..3fdce61 100644
--- a/myserver/binaries/Makefile.am
+++ b/myserver/binaries/Makefile.am
@@ -6,6 +6,6 @@ EXTRA_DIST = myserver-daemon MIMEtypes.default.xml 
myserver.default.xml \
 configdir = $(root_prefix)/etc/myserver
 
 install: install-recursive
-       $(install_sh_DATA) MIMEtypes.xml.unix.default $(configdir)/MIMEtypes.xml
-       $(install_sh_DATA) myserver.xml.unix.default $(configdir)/myserver.xml
-       $(install_sh_DATA) virtualhosts.xml.unix.default 
$(configdir)/virtualhosts.xml
+       $(install_sh_DATA) MIMEtypes.default.xml $(configdir)/MIMEtypes.xml
+       $(install_sh_DATA) myserver.default.xml $(configdir)/myserver.xml
+       $(install_sh_DATA) virtualhosts.default.xml 
$(configdir)/virtualhosts.xml



commit fc8a8e2b6f14b287622965e6ae7ec6434cdb3f6e
Author: Giuseppe Scrivano <address@hidden>
Date:   Sat Jul 18 20:51:46 2009 +0200

    Do not handle the PIDFILE by the `start-stop-daemon' helper.

diff --git a/myserver/binaries/myserver-daemon 
b/myserver/binaries/myserver-daemon
index 1abd58d..e1a8089 100644
--- a/myserver/binaries/myserver-daemon
+++ b/myserver/binaries/myserver-daemon
@@ -39,23 +39,25 @@ test -x $DAEMON || exit 0
 
 d_start()
 {
-       start-stop-daemon --start --pidfile $PIDFILE \
-       --exec $DAEMON -- -rSERVICE --log="file://$LOGFILE" --pidfile=$PIDFILE
+       start-stop-daemon --start --exec $DAEMON -- -rSERVICE \
+  --log="file://$LOGFILE" --pidfile=$PIDFILE
 }
 
 
 d_stop()
 {
-       start-stop-daemon --stop --pidfile $PIDFILE \
-       --exec $DAEMON -- -rSERVICE --log="file://$LOGFILE" --pidfile=$PIDFILE
-
+  if test -e $PIDFILE; then
+         start-stop-daemon --stop --exec $DAEMON -- -rSERVICE \
+  --log="file://$LOGFILE" --pidfile=$PIDFILE;
+    rm -f $PIDFILE;
+  fi
 }
 
 
 d_reload()
 {
-       start-stop-daemon --stop  --signal 1  --pidfile $PIDFILE \
-       --exec $DAEMON -- -rSERVICE --log="file://$LOGFILE" --pidfile=$PIDFILE
+       start-stop-daemon --stop  --signal 1  --exec $DAEMON -- -rSERVICE \
+  --log="file://$LOGFILE" --pidfile=$PIDFILE
 }
 
 d_restart()

-----------------------------------------------------------------------

Summary of changes:
 myserver/binaries/Makefile.am     |    6 +++---
 myserver/binaries/myserver-daemon |   16 +++++++++-------
 2 files changed, 12 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
GNU MyServer