Changeset 244 for install/scripts/upgrades/0.9.1.sh

Timestamp:

02/21/06 23:54:07 (7 years ago)

Author:

anarcat

Message:

[project @ alternc: changeset 2004-05-20 14:12:03 by anarcat]

• various bugfixes from production tests:

• make this work again on first run

• do echo something because it can be very confusing to have this script output nothing for a long time

• add a line to override_php.conf for *each* domain, in a function

Original author: anarcat
Date: 2004-05-20 14:12:03

File:

• install/scripts/upgrades/0.9.1.sh (modified) (3 diffs)

install/scripts/upgrades/0.9.1.sh

@@ -38 +38 @@
         cat > $tmpfile
         if [ -r $realfile ] &&
-                diff -q $tmpfile $realfile > /dev/null || \
-                        diff -u $tmpfile $realfile  | grep '^ ' | sed 's/^ //' | diff -q - $tmpfile > /dev/null
+                (diff -q $tmpfile $realfile > /dev/null || \
+                        diff -u $tmpfile $realfile  | grep '^ ' | sed 's/^ //' | diff -q - $tmpfile > /dev/null)
         then
                 status=0
@@ -50 +50 @@
 }
 
+add_dom_entry() {
+        # protect ourselves from interrupts
+        trap "rm -f ${override_f}.new; exit 1" 1 2 15
+        # ajouter une entrée, seulement s'il n'y en pas déjà, pour ce domaine
+        (echo $1; [ -r $override_f ] && cat $override_f) | \
+        sort -u > ${override_f}.new && \
+        cp ${override_f}.new ${override_f} && \
+        rm ${override_f}.new
+}
+
+echo -n adding open_base_dir protection for:
 # boucle sur tous les domaines hébergés
 # XXX: je ne suis pas sûr qu'il soit véritablement nécessaire de
@@ -70 +81 @@
 
         mkdir -p $override_d/$initial_domain
-        append_no_dupe "$override_d/$initial_domain/$domain" <<EOF
+        if append_no_dupe "$override_d/$initial_domain/$domain" <<EOF
 <Directory ${path1}>
   php_admin_value open_basedir ${path2}/
 </Directory>
 EOF
+        then
+                #echo no change: $domain
+                true
+        else
+                echo -n " $domain"
+        fi
+        add_dom_entry "Include $override_d/$initial_domain/$domain"
 done
 
-# protect ourselves from interrupts
-trap "rm -f ${override_f}.new; exit 1" 1 2 15
-
-# ajouter une entrée, seulement s'il n'y en pas déjà, pour ce domaine
-(echo "Include $override_d/$initial_domain/$domain" ; \
-        [ -r $override_f ] && cat $override_f)  | \
-        sort -u > ${override_f}.new && \
-        cp ${override_f}.new ${override_f} && \
-        rm ${override_f}.new
+echo .