commit last changes

vz/clone_vz.sh

@@ -9,24 +9,30 @@ fi
 
 . ./config
 
+HOMEDIR=/var/lib/vz/private/azbyka/home
 FROM=/var/lib/vz/private/$1
 TO=/var/lib/vz/private/$2
 CFGDIR=/etc/vz/conf
 
 rsync -avPH --exclude "/home/" $FROM/ $TO/
+
 # FIXME: it is better to hold /home out of container
 mkdir -p $TO/home
+
+VEID=$2
 mkdir -p /var/lib/vz/root/$VEID/
 
-cp $CFGDIR/$1.conf $CFGDIR/$2.conf
+cp $CFGDIR/$1.conf $CFGDIR/$VEID.conf
 
 cat <<EOF >$CFGDIR/$2.mount
 #!/bin/bash
 # Mount script to bind-mount /var/something into a VPS
 export VEID=\$(basename \$0 .mount)
 . /etc/vz/vz.conf
-mount --bind /var/lib/vz/private/$1/home /var/lib/vz/root/\$VEID/home
+mount --bind $HOMEDIR /var/lib/vz/root/\$VEID/home
 EOF
 chmod u+x $CFGDIR/$2.mount
 
-#добавить замену ИП в конфиге
\ No newline at end of file
+subst "s|^IP_ADDRESS=\"192.168.3.*|IP_ADDRESS=\"192.168.3.$VEID\"|g" $CFGDIR/$VEID.conf
+
+echo "Start update_cloned_vz.sh now"

vz/config

 FROMCONT=193
-TOCONT="198 201"
+TOCONT="189 198 199 201 202 203 204 205 206 207 208 209"
+TOHOST=azbykar
 
 # get IP from vz config
 get_vzip()

vz/update_cloned_vz.sh

@@ -2,6 +2,20 @@
 
 . ./config
 
+fix_phpconf()
+{
+    local TO="$1"
+    local PCD
+    for i in 5.5 5.4 5.3 ; do
+        PCD="$TO/etc/php/$i/apache2-mod_php/php.ini"
+        if [ -r "$PCD" ] ; then
+            subst "s|^memory_limit =.*|memory_limit = 386M|g" $PCD
+            subst "s|^date.timezone =.*|date.timezone ='Europe/Moscow'|g" $PCD
+            break
+        fi
+    done
+}
+
 update_cloned()
 {
 local TOCONT=$1
@@ -10,7 +24,9 @@ ROOTSYS=/var/lib/vz/private
 FROM=$ROOTSYS/$FROMCONT
 TO=$ROOTSYS/$TOCONT
 
-rsync -av --progress --delete-after $FROM/etc/httpd2/conf/sites-enabled/ $TO/etc/httpd2/conf/sites-enabled/
+fix_phpconf $TO
+
+rsync -av --progress --delete-after $FROM/etc/httpd2/conf/ $TO/etc/httpd2/conf/
 rsync -av --progress --delete-after $FROM/etc/monitrc.d/ $TO/etc/monitrc.d/
 rsync -av --progress --delete-after $FROM/etc/tcb/ $TO/etc/tcb/
 rsync -av --progress --delete-after $FROM/etc/postfix/ $TO/etc/postfix/
@@ -32,6 +48,8 @@ vzctl exec $TOCONT serv monit reload
 vzctl exec $TOCONT serv postfix reload
 }
 
+[ -n "$1" ] && TOCONT=$1
+
 # by list
 for cont in $TOCONT ; do
     update_cloned $cont