Changeset 2587

Timestamp:

10/13/09 16:41:42 (4 years ago)

Author:

azerttyu

Message:

Renforcer l'utilisation de sed

• # au lieu de // permet de donner des url en argument
• faire un remplacement global de chaque chaine
• typo : supprimer les espaces inutiles

File:

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

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

@@ -5 +5 @@
     local TEMPLATE=$1
     HOST_TMP=`mktemp`
-    
+
     cp $TEMPLATE_DIR"/"$TEMPLATE $HOST_TMP
 }
 
 host_save_conf() {
-    
-    local SOURCE=$1    
+
+    local SOURCE=$1
     local TARGET=$2
 
@@ -20 +20 @@
 
 host_create_panel() {
-    
+
     echo "création panel $1"
 
@@ -26 +26 @@
     local FQDN=$2
     local TEMPLATE="panel.conf"
-    local TARGET=$HOST_DIR"/"$USER"/"$FQDN    
+    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#%%fqdn%%#$FQDN#g" $HOST_TMP
 
     host_save_conf $HOST_TMP $TARGET
@@ -35 +35 @@
 
 host_create_vhost() {
-    
+
     echo "création vhost $1 pour $2, repertoire $3"
 
@@ -43 +43 @@
     local TEMPLATE="vhost.conf"
     local TARGET=$HOST_DIR"/"$USER"/"$FQDN
-    host_prepare_conf $TEMPLATE #Return #HOST_TMP   
+    host_prepare_conf $TEMPLATE #Return #HOST_TMP
 
-    sed -i -e "s/%%fqdn%%/$FQDN/" $HOST_TMP
-    sed -i -e "s/%%document_root%%/$DIRECTORY/" $HOST_TMP    
+    sed -i -e "s#%%fqdn%%#$FQDN#g" $HOST_TMP
+    sed -i -e "s#%%document_root%%#$DIRECTORY#g" $HOST_TMP
 
     host_save_conf $HOST_TMP $TARGET
@@ -52 +52 @@
 
 host_create_webmail() {
-    
+
     echo "création webmail $1 pour $2"
 
@@ -59 +59 @@
     local TEMPLATE="webmail.conf"
     local TARGET=$HOST_DIR"/"$USER"/"$FQDN
-    host_prepare_conf $TEMPLATE #Return #HOST_TMP 
+    host_prepare_conf $TEMPLATE #Return #HOST_TMP
 
-    sed -i -e "s/%%fqdn%%/$FQDN/" $HOST_TMP
+    sed -i -e "s#%%fqdn%%#$FQDN#g" $HOST_TMP
 
     host_save_conf $HOST_TMP $TARGET
@@ -67 +67 @@
 
 host_create_redirect() {
-    
+
     echo "création redirection pour $1 de $2 vers $3"
 
     local USER=$1
     local FQDN=$2
-    local REDIRECT=$3    
+    local REDIRECT=$3
     local TEMPLATE="redirect.conf"
     local TARGET=$HOST_DIR"/"$USER"/"$FQDN
-    host_prepare_conf $TEMPLATE #Return #HOST_TMP 
+    host_prepare_conf $TEMPLATE #Return #HOST_TMP
 
-    sed -i -e "s/%%fqdn%%/$FQDN/" $HOST_TMP
-    sed -i -e "s/%%redirect%%/$REDIRECT/" $HOST_TMP    
+    sed -i -e "s#%%fqdn%%#${FQDN}#g" $HOST_TMP
+    sed -i -e "s#%%redirect%%#${REDIRECT}#g" $HOST_TMP
 
     host_save_conf $HOST_TMP $TARGET