Index: trunk/deploy.sh.in
===================================================================
--- trunk/deploy.sh.in	(revision 37)
+++ trunk/deploy.sh.in	(revision 38)
@@ -245,4 +245,9 @@
 export host
 
+# hostgroup; empty default
+#
+hostgroup=
+export hostgroup
+
 
 # action; no default
@@ -432,4 +437,5 @@
     echo
     echo " --host=<FQDN>          The host where you want to install."
+    echo " --group=<group>        Optional group the host belongs to."
     echo " --arch=<arch>          The architecture/operating system of this host."
     echo "        This is used to get the correct binary package."
@@ -556,4 +562,12 @@
     ;;
 
+  --group | -group)
+    opt_prev=hostgroup
+    ;;
+
+  --group=* | -group=*)
+    hostgroup="$optarg"; export hostgroup
+    ;;
+
   # Build
 
Index: trunk/docs/Changelog
===================================================================
--- trunk/docs/Changelog	(revision 37)
+++ trunk/docs/Changelog	(revision 38)
@@ -1,2 +1,3 @@
+	* deploy.sh: allow to set a group for hosts upon installation
 	* patch by Yoann: fix an issue when setting the idmef_inode_t object
 	* fix memory leaks in error paths in sh_prelude.c
Index: trunk/dsys/funcINSTALL
===================================================================
--- trunk/dsys/funcINSTALL	(revision 37)
+++ trunk/dsys/funcINSTALL	(revision 38)
@@ -62,4 +62,5 @@
     echo "  <client>"
     echo "    <client_host>${host}</client_host>"
+    echo "    <client_group>${hostgroup}</client_group>"
     echo "    <client_os_machine>${arch}</client_os_machine>"
     echo "    <client_install_status>${install_entry}</client_install_status>"
@@ -172,6 +173,10 @@
 		if test "x$?" = "x1"
 		then
+		    #
+		    # Write the full entry when client_os_machine is found
+		    #
 		    case "$line" in
 		    *\<client_os_machine\>*\</client_os_machine\>)
+		    echo "    <client_group>${hostgroup}</client_group>"           >>"${tmpF}"
 		    echo "    <client_os_machine>${arch}</client_os_machine>"           >>"${tmpF}"
 		    echo "    <client_install_status>${install_entry}</client_install_status>"    >>"${tmpF}"
@@ -182,26 +187,25 @@
 		    ;;
 
+		    *\<client_group\>*\</client_group\>)
+		    :
+		    ;;
+			
 		    *\<client_install_status\>*\</client_install_status\>)
-                    # echo "    <client_install_status>${install_entry}</client_install_status>"    >>"${tmpF}"
 		    :
 		    ;;
 
 		    *\<client_install_date\>*\</client_install_date\>)
-                    # echo "    <client_install_date>${IDATE}</client_install_date>"         >>"${tmpF}"
 		    :
 	            ;;
 
 		    *\<client_install_name\>*\</client_install_name\>)
-                    # echo "    <client_install_name>${SH_NAME}</client_install_name>"       >>"${tmpF}"
 		    :
 		    ;;
 
 		    *\<client_install_prefix\>*\</client_install_prefix\>)
-                    # echo "    <client_install_prefix>${SH_PREFIX}</client_install_prefix>" >>"${tmpF}"
 		    :
 		    ;;
 
 		    *\<client_install_version\>*\</client_install_version\>)
-                    # echo "    <client_install_version>${src_version}.${realformat}</client_install_version>" >>"${tmpF}"
 		    :
 		    ;;
@@ -247,5 +251,5 @@
      printINFO "Write ${DATABASE} from scratch"
      echo '<?xml version="1.0" encoding="ISO-8859-1"?>' >"${tmpF}"
-     echo '<!DOCTYPE yule_db SYSTEM "http://la-samhna.de/yule_db-0.1.dtd">' \
+     echo '<!DOCTYPE yule_db SYSTEM "http://la-samhna.de/yule_db-0.2.dtd">' \
 	  >>"${tmpF}"
      echo "<yule_db>"   >>"${tmpF}"
Index: trunk/scripts/README
===================================================================
--- trunk/scripts/README	(revision 37)
+++ trunk/scripts/README	(revision 38)
@@ -1,5 +1,5 @@
 
 
-This directory contains miscellaneous useful scripts, mostly contributed
+This directory contains miscellaneous useful scripts, some of them contributed
 by various users. Additions and/or improvements are welcome. 
 
@@ -102,24 +102,3 @@
 
 
-samhain-scripts/   Administrative scripts by 
-----------------   Simon Bailey <simon.bailey@uibk.ac.at> and
-                   Michael Redinger <michael.redinger@uibk.ac.at>
-
-		   You may need to adjust some of the variables in the
-		   top lines of these scripts.
-                
-   samhain.table.rotate.pl: Move old entries from mysql log table to a
-   			    backup table
-
-   samhain-admin: Interactive script to (1) clear log entries in SQL database,
-   		  (2) re-initialize file database of remote client, or (3) add
-		  a new host.
-		  This script requires that you are using samhains deploy
-		  system (i.e. the deploy.sh script et al.).
-		  Re-initialize will stop the daemon on the remote host,
-		  create a temp dir for the database, run samhain -t init,
-		  copy the database to the server, and clear the mysql log for
-		  this host.
-		  
-   samhain.clearhost: Helper script for samhain-admin.