[tango] 03/04: use variables to set the tango user and group

[Frédéric-Emmanuel Picca]

This is an automated email from the git hooks/post-receive script.

picca pushed a commit to branch master
in repository tango.

commit 588a0cd5105948c63cc43a03abd40c7fdb4fd709
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sat Feb 8 13:17:09 2014 +0100

    use variables to set the tango user and group
---
 debian/tango-accesscontrol.init.d | 6 ++++--
 debian/tango-common.postinst      | 2 ++
 debian/tango-db.init.d            | 6 ++++--
 debian/tango-db.postinst          | 5 ++++-
 debian/tango-db.prerm             | 1 -
 debian/tango-starter.init.d       | 6 ++++--
 6 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/debian/tango-accesscontrol.init.d b/debian/tango-accesscontrol.init.d
index d36ea7c..d69f96b 100644
--- a/debian/tango-accesscontrol.init.d
+++ b/debian/tango-accesscontrol.init.d
@@ -22,6 +22,8 @@ CONFFILE=/etc/tangorc
 CANON_HOST=`grep TANGO_HOST $CONFFILE | awk -F ":" '{print $1}' | awk -F "=" '{print $2}' | awk -F "." '{print $1}'`
 DAEMON=/usr/lib/tango/$NAME_REAL
 DAEMON_ARGS="1"
+DAEMON_USER=tango
+DAEMON_GROUP=tango
 PIDFILE=/var/run/$NAME.pid
 
 # Exit if the package is not installed
@@ -51,10 +53,10 @@ do_start()
 	fi
 	export SUPER_TANGO=true
 	tango_admin --ping-database 6 || return 2
-	start-stop-daemon --start --quiet --chuid tango:tango --background \
+	start-stop-daemon --start --quiet --chuid $DAEMON_USER:$DAEMON_GROUP --background \
 	    --make-pidfile --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
 	    || return 1
-	start-stop-daemon --start --quiet --chuid tango:tango --background \
+	start-stop-daemon --start --quiet --chuid $DAEMON_USER:$DAEMON_GROUP --background \
 	    --make-pidfile --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS \
 	    || return 2
 	# Add code here, if necessary, that waits for the process to be ready
diff --git a/debian/tango-common.postinst b/debian/tango-common.postinst
index 23e83a5..a403441 100644
--- a/debian/tango-common.postinst
+++ b/debian/tango-common.postinst
@@ -1,5 +1,7 @@
 #!/bin/sh
+
 CONFIGFILE=/etc/tangorc
+
 set -e
 . /usr/share/debconf/confmodule
 
diff --git a/debian/tango-db.init.d b/debian/tango-db.init.d
index 9d0a71f..7073308 100644
--- a/debian/tango-db.init.d
+++ b/debian/tango-db.init.d
@@ -25,6 +25,8 @@ PORT=`grep TANGO_HOST $CONFFILE | awk -F ":" '{print $2}'`
 HOST=`grep TANGO_HOST $CONFFILE | awk -F ":" '{print $1}' | awk -F "=" '{print $2}'`
 CANON_HOST=`grep TANGO_HOST $CONFFILE | awk -F ":" '{print $1}' | awk -F "=" '{print $2}' | awk -F "." '{print $1}'`
 DAEMON=/usr/lib/tango/$NAME_REAL
+DAEMON_USER=tango
+DAEMON_GROUP=tango
 PIDFILE=/var/run/$NAME.pid
 
 # Exit if the package is not installed
@@ -57,10 +59,10 @@ do_start()
 		DAEMON_ARGS="2 -ORBendPoint giop:tcp::$PORT"
 		tango_admin --ping-network 40 || return 2
 	fi
-	start-stop-daemon --start --quiet --chuid tango:tango --background \
+	start-stop-daemon --start --quiet --chuid $DAEMON_USER:$DAEMON_GROUP --background \
 	    --make-pidfile --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
 	    || return 1
-	start-stop-daemon --start --quiet --chuid tango:tango --background \
+	start-stop-daemon --start --quiet --chuid $DAEMON_USER:$DAEMON_GROUP --background \
 	    --make-pidfile --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS \
 	    || return 2
 	# Add code here, if necessary, that waits for the process to be ready
diff --git a/debian/tango-db.postinst b/debian/tango-db.postinst
index 6456e76..1b809de 100644
--- a/debian/tango-db.postinst
+++ b/debian/tango-db.postinst
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+TANGO_USER=tango
+TANGO_GROUP=tango
+
 set -e
 . /usr/share/debconf/confmodule
 . /usr/share/dbconfig-common/dpkg/postinst.mysql
@@ -7,7 +10,7 @@ set -e
 # Create the .my.cnf file
 dbc_generate_include="template:/var/lib/tango/.my.cnf"
 dbc_generate_include_args="-o template_infile=/usr/share/tango-db/my.cnf"
-dbc_generate_include_owner="tango:tango"
+dbc_generate_include_owner="$TANGO_USER:$TANGO_GROUP"
 dbc_generate_include_perms="600"
 dbc_go tango-db $@
 
diff --git a/debian/tango-db.prerm b/debian/tango-db.prerm
index 20fb678..6095945 100644
--- a/debian/tango-db.prerm
+++ b/debian/tango-db.prerm
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 set -e
-#set -x
 
 . /usr/share/debconf/confmodule
 . /usr/share/dbconfig-common/dpkg/prerm.mysql 
diff --git a/debian/tango-starter.init.d b/debian/tango-starter.init.d
index 4e6223b..f3671f8 100644
--- a/debian/tango-starter.init.d
+++ b/debian/tango-starter.init.d
@@ -22,6 +22,8 @@ CONFFILE=/etc/tangorc
 CANON_HOST=`grep TANGO_HOST $CONFFILE | awk -F ":" '{print $1}' | awk -F "=" '{print $2}' | awk -F "." '{print $1}'`
 DAEMON=/usr/lib/tango/$NAME_REAL
 DAEMON_ARGS=`hostname`
+DAEMON_USER=tango
+DAEMON_GROUP=tango
 PIDFILE=/var/run/$NAME.pid
 TAC_DEVICE=sys/access_control/1
 
@@ -58,10 +60,10 @@ do_start()
 	# register the tango-starter if necessary
 	tango_admin --check-device tango/admin/`hostname` || tango_admin --add-server Starter/`hostname` Starter tango/admin/`hostname` || return 2
 
-	start-stop-daemon --start --quiet --chuid tango:tango --background \
+	start-stop-daemon --start --quiet --chuid $DAEMON_USER:$DAEMON_GROUP --background \
 	    --make-pidfile --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
 	    || return 1
-	start-stop-daemon --start --quiet --chuid tango:tango --background \
+	start-stop-daemon --start --quiet --chuid $DAEMON_USER:$DAEMON_GROUP --background \
 	    --make-pidfile --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS \
 	    || return 2
 	# Add code here, if necessary, that waits for the process to be ready

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tango.git