changeset 315:2725e68bc78d

Tweak init.d scripts
author Sebastien Decugis <sdecugis@nict.go.jp>
date Wed, 19 May 2010 11:36:03 +0900
parents 48225b1db9d4
children aa8f41bca657
files INSTALL.Ubuntu debian/freediameter-daemon.init
diffstat 2 files changed, 22 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/INSTALL.Ubuntu	Wed May 19 11:16:02 2010 +0900
+++ b/INSTALL.Ubuntu	Wed May 19 11:36:03 2010 +0900
@@ -12,7 +12,6 @@
 Tested working: Ubuntu Intrepid, Jaunty, Karmic, Lucid. Debian Lenny.
 
 
-
 ===========================================-
 Step by step instructions (with no prerequisite):
 
@@ -54,23 +53,16 @@
 
 
 ===========================================
-apt-get -y install mercurial cmake make gcc bison flex libsctp-dev libgnutls-dev libgcrypt-dev libpq-dev ssl-cert
+
+You can alternatively do:
+apt-get -y install mercurial cmake make gcc bison flex libsctp-dev libgnutls-dev libgcrypt-dev libpq-dev ssl-cert debhelper
 cd /usr/src
 hg clone http://aaa.koganei.wide.ad.jp/hg/freeDiameter
-mkdir fDbuild && cd fDbuild
-cmake -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
-      -DDEFAULT_CONF_PATH:PATH=/etc/freeDiameter \
-      -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-      -DINSTALL_DOCUMENTATION_SUFFIX:PATH=share/doc/freeDiameter \
-      -DBUILD_APP_ACCT:BOOL=ON \
-      -DBUILD_APP_RADGW:BOOL=ON \
-      -DBUILD_DBG_MONITOR:BOOL=ON \
-      -DBUILD_DBG_RT:BOOL=ON \
-      -DBUILD_TEST_APP:BOOL=ON \
-      -DBUILD_APP_ACCT:BOOL=ON \
-      ../freeDiameter
-make
-make install
+cd freeDiameter
+dh binary
+
+
+
 ln -s /etc/ssl/certs/ssl-cert-snakeoil.pem /etc/ssl/certs/freeDiameter.pem
 ln -s /etc/ssl/private/ssl-cert-snakeoil.key /etc/ssl/private/freeDiameter.key
 mkdir /etc/freeDiameter
--- a/debian/freediameter-daemon.init	Wed May 19 11:16:02 2010 +0900
+++ b/debian/freediameter-daemon.init	Wed May 19 11:36:03 2010 +0900
@@ -1,18 +1,18 @@
 #! /bin/sh
-#
-# skeleton	example file to build /etc/init.d/ scripts.
-#		This file should be used to construct scripts for /etc/init.d.
-#
-#		Written by Miquel van Smoorenburg <miquels@cistron.nl>.
-#		Modified for Debian
-#		by Ian Murdock <imurdock@gnu.ai.mit.edu>.
-#               Further changes by Javier Fernandez-Sanguino <jfs@debian.org>
-#
-# Version:	@(#)skeleton  1.9  26-Feb-2001  miquels@cistron.nl
-#
 
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+### BEGIN INIT INFO
+# Provides:          freediameter
+# Default-Start:     3 4 5
+# Default-Stop:      0 1 2 6
+# Short-Description: Start freeDiameter daemon at boot time
+# Description:       Start the freeDiameter daemon at boot time.
+#	freeDiameter is an extensible implementation of the Diameter protocol,
+#	designed for Authentication, Authorization and Accounting. Diameter is
+#	an evolution of the RADIUS protocol.
+### END INIT INFO#
+
 DAEMON=/usr/bin/freeDiameterd
+CONF=/etc/freeDiameter/freeDiameter.conf
 NAME=freediameter
 DESC=freeDiameter daemon
 
@@ -29,6 +29,8 @@
     . /etc/default/freediameter
 fi
 
+test x"" != x$DAEMON_OPTS || test -f $CONF || exit 0
+
 set -e
 
 running_pid()
"Welcome to our mercurial repository"