[Cdd-commits] cdd/common/cdd/templates common.config,1.3,1.4 common.postinst,1.5,1.6

[Andreas Tille]

Update of /cvsroot/cdd/cdd/common/cdd/templates
In directory haydn:/tmp/cvs-serv28097

Modified Files:
	common.config common.postinst 
Log Message:
Do not use these.  They are brocken because of currently brocken cdd-action but should be a preview how it should work in the future.


Index: common.config
===================================================================
RCS file: /cvsroot/cdd/cdd/common/cdd/templates/common.config,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- common.config	14 Jun 2004 20:57:47 -0000	1.3
+++ common.config	18 Jun 2004 12:33:17 -0000	1.4
@@ -20,5 +20,18 @@
 # Add at least one default role for each CDD
 addRole #CDD# #CDD#
 
+# Login names of all users of the system as comma separated list 
+USERS=`getAllUsers 0`
+
+# "login (Real Name)" of users registered to the CDD #CDD#
+CDDUSERS=`getUsersInRole #CDD# #CDD# ,`
+
+db_set #CDD#-common/group "$CDDUSERS"
+db_subst #CDD#-common/group users "$USERS"
+db_get #CDD#-common/group
+
+db_input high #CDD#-common/group || true
+db_go
+
 db_stop
 exit 0

Index: common.postinst
===================================================================
RCS file: /cvsroot/cdd/cdd/common/cdd/templates/common.postinst,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- common.postinst	14 Jun 2004 20:57:47 -0000	1.5
+++ common.postinst	18 Jun 2004 12:33:17 -0000	1.6
@@ -1,43 +1,33 @@
 #!/bin/sh -e
 
-PKG=$(basename $0 | sed 's/\.postinst//')
-CDD=`echo ${PKG} | sed "s/^\([a-z][a-z]*\)-common/\1/"`
-
-[ -s /etc/cdd/cdd.conf ]         && . /etc/cdd/cdd.conf
-[ -s /etc/cdd/#CDD#/#CDD#.conf ] && . /etc/cdd/#CDD#/#CDD#.conf 
-
-# Login names of all users of the system as comma separated list
-USERS=`/usr/sbin/get-group-users --comma`
-# "login (Real Name)" of CDD members as comma separated list
-# Add the $CDD as system group if not yet existing
-CDDUSERS=`/usr/sbin/get-group-users --comma --add "$CDD"`
+# if cdd-common package is not yet installed we have to stop here
+if [ ! -f /etc/cdd/cdd.conf ] ; then
+   echo "Custom Debian Distribution configuration file /etc/cdd/cdd.conf is missing."
+   exit -1
+fi
 
+if [ ! -f /etc/cdd/#CDD#/#CDD#.conf ] ; then
+   echo "#CDDNAME# configuration file /etc/cdd/#CDD#/#CDD#.conf is missing."
+   exit -1
+fi
 
 # Source debconf library.
 . /usr/share/debconf/confmodule
 db_version 2.0
 
-db_set ${PKG}/group "$CDDUSERS"
-db_subst ${PKG}/group users "$USERS"
-db_get ${PKG}/group
-
-db_input high ${PKG}/group || true
-db_go
-
-db_get ${PKG}/group
+db_get #CDD#-common/group 
 
-CURRENTCDDUSERS=`/usr/sbin/get-group-users --simple --add "$CDD"`
+CURRENTCDDUSERS=`getUsersInRole #CDD# #CDD#`
 # Add those users which were selected but are not yet in the group
 for user in `echo "$RET" | sed "s/([^)]*)//g" | sed "s/ //g" |  tr ',' '\n'` ; do
    if [ `echo "${CURRENTCDDUSERS}" | grep -c -w "$user"` -eq 0 ] ; then
-      /usr/sbin/cdd-user add $CDD $user
+      /usr/sbin/cdd-user add #CDD# $user
    fi
 done
 # Del those users which were obviousely removed from list of CDD users
-for user in `/usr/sbin/get-group-users --simple` ; do
-   if [ `echo "$RET" | grep -c -w "$user"` -eq 0 ] && [ `getent group "$CDD" | grep -c -w $user` -gt 0 ] ; then
-#      deluser $user $CDD
-      /usr/sbin/cdd-user del $CDD $user
+for user in `getAllUsers 0` ; do
+   if [ `echo "$RET" | grep -c -w "$user"` -eq 0 ] && [ `getent group #CDD# | grep -c -w $user` -gt 0 ] ; then
+      /usr/sbin/cdd-user del #CDD# $user
    fi
 done