Changeset 2585

Timestamp:

10/09/09 17:08:38 (4 years ago)

Author:

azerttyu

Message:

Normalisation de la creation des fichiers de conf temporaire

• host_prepare_conf : genere un HOST_TMP copie d'un template
• host_save_conf : deplace la configuration dans le bon repertoire

File:

• alternc-vhost/trunk/usr/lib/alternc/hosting_functions.sh (modified) (4 diffs)

alternc-vhost/trunk/usr/lib/alternc/hosting_functions.sh

@@ -1 +1 @@
 HOST_DIR="/etc/apache2/sites-available"
 TEMPLATE_DIR="/etc/alternc/templates/apache2"
+
+host_prepare_conf() {
+    local TEMPLATE=$1
+    HOST_TMP=`mktemp`
+    
+    cp $TEMPLATE_DIR"/"$TEMPLATE $HOST_TMP
+}
+
+host_save_conf() {
+    
+    local SOURCE=$1    
+    local TARGET=$2
+
+    TARGET_DIR=`dirname $TARGET`
+    mkdir -p $TARGET_DIR
+    mv $SOURCE $TARGET
+}
 
 host_create_panel() {
@@ -8 +25 @@
     local USER=$1
     local FQDN=$2
-    local TEMPLATE=$TEMPLATE_DIR"/panel.conf"
-    local HOST_TMP=`mktemp`
-    
-    cp $TEMPLATE $HOST_TMP
+    local TEMPLATE="panel.conf"
+    local TARGET=$HOST_DIR"/"$USER"/"$FQDN    
+    host_prepare_conf $TEMPLATE #Return #HOST_TMP
 
     sed -i -e "s/%%fqdn%%/$FQDN/" $HOST_TMP
 
-    mkdir -p $HOST_DIR/$USER
-    mv $HOST_TMP $HOST_DIR/$USER/$FQDN
+    host_save_conf $HOST_TMP $TARGET
 }
 
@@ -26 +41 @@
     local FQDN=$2
     local DIRECTORY=$3
-    local TEMPLATE=$TEMPLATE_DIR"/vhost.conf"
-    local HOST_TMP=`mktemp`
-    
-    cp $TEMPLATE $HOST_TMP
+    local TEMPLATE="vhost.conf"
+    local TARGET=$HOST_DIR"/"$USER"/"$FQDN
+    host_prepare_conf $TEMPLATE #Return #HOST_TMP   
 
     sed -i -e "s/%%fqdn%%/$FQDN/" $HOST_TMP
     sed -i -e "s/%%document_root%%/$DIRECTORY/" $HOST_TMP    
 
-    mkdir -p $HOST_DIR/$USER
-    mv $HOST_TMP $HOST_DIR/$USER/$FQDN
+    host_save_conf $HOST_TMP $TARGET
 }
 
@@ -44 +57 @@
     local USER=$1
     local FQDN=$2
-    local TEMPLATE=$TEMPLATE_DIR"/webmail.conf"
-    
-    local HOST_TMP=`mktemp`
-    
-    cp $TEMPLATE $HOST_TMP
+    local TEMPLATE="/webmail.conf"
+    local TARGET=$HOST_DIR"/"$USER"/"$FQDN
+    host_prepare_conf $TEMPLATE #Return #HOST_TMP 
 
     sed -i -e "s/%%fqdn%%/$FQDN/" $HOST_TMP
 
-    mkdir -p $HOST_DIR/$USER
-    mv $HOST_TMP $HOST_DIR/$USER/$FQDN
+    host_save_conf $HOST_TMP $TARGET
 }