commit all scripts

vz/azbyka/base.task

@@ -6,7 +6,7 @@ PKGPROFILE="apache2-php7"
 
 # PHP
 PHP_memory_limit=386M
-PHP_max_execution_time=15
+PHP_max_execution_time=30
 
 # Site
 DOMAIN=site.azbyka.ru

vz/azbyka/bylist.sh

+#!/bin/sh
+
+CMD="$1"
+shift
+for i in ves/* ; do
+    $CMD $i "$@"
+done

vz/azbyka/createbylist.sh

@@ -3,14 +3,19 @@
 CONFDIR=/vz/root/900/etc/nginx/sites-enabled.d/azbyka.d
 
 #for task in crosswords miloserdie propovedi katehizacija ; do
-for task in fiction zdorovie rabota news ; do
-    veid=$(grep sites80 $CONFDIR/$task.conf | sed -e "s|.*//sites80\([0-9][0-9]\).*|\1|")
+#for task in fiction zdorovie rabota news ; do
+#for task in priobretaykitay ; do
+#for task in deti parkhomenko stenyaev molitvoslov ; do
+#for task in bogosluzhenie chinaorthodox ; do
+#for task in viktorina shorohova orthodoxy ; do
+for task in al-masih 03 ; do
+    veid=$(grep sites80 $CONFDIR/$task.conf | sed -e "s|.*//sites80\([0-9][0-9]\).*|\1|" | head -n1)
     [ -n "$veid" ] || { echo "skip $task" ; continue ; }
-    cat <<EOF >task.task
+    cat <<EOF >ves/$task.task
 VEID=1$veid
 NAME=$task
 EOF
-    cat task.task
+    #cat task.task
     #continue
-    ./createbytask.sh task.task
+    ./createbytask.sh ves/$task.task
 done

vz/azbyka/createbytask.int.sh

@@ -22,7 +22,7 @@ tune_php7()
 {
     # FIXME: php version
     PHPVERSION=7.1
-    local aphp=/etc/php/PHPVERSION/apache2-mod_php/php.ini
+    local aphp=/etc/php/$PHPVERSION/apache2-mod_php/php.ini
     #[ -s php7.add ] && cat php7.add | st tee -a $aphp
     [ -n "$PHP_memory_limit" ] && subst "s|^memory_limit =.*|memory_limit = $PHP_memory_limit|" $aphp
     [ -n "$PHP_max_execution_time" ] && subst "s|^max_execution_time = .*|max_execution_time = $PHP_max_execution_time|" $aphp
@@ -33,6 +33,9 @@ tune_apache2()
     for i in mod_php7 status mpm_itk remoteip setenvif rewrite session; do
         a2enmod $i
     done
+    for i in include; do
+        a2dismod $i
+    done
 cat <<EOF > /etc/httpd2/conf/mods-available/remoteip.conf
     <IfModule remoteip_module>
         RemoteIPHeader X-Forwarded-For
@@ -81,20 +84,31 @@ EOF
 groupadd $AUSER -g $AGROUPID
 useradd -M $AUSER -u $AUSERID -g $AGROUPID #|| fatal
 
+if ! grep -q "Azbyka's hosts" /etc/hosts ; then
+cat <<EOF >>/etc/hosts
+# Azbyka's hosts
+192.168.3.188	memcached.azbyka
+192.168.3.186	redis.azbyka
+192.168.3.191	mysql.azbyka
+192.168.3.191	mysql
+192.168.3.191	mysql.$AUSER
+EOF
+fi
+
 for i in $PKGPROFILE ; do
     case $i in
         apache2-php7)
             epmi --auto --skip-installed apache2-mod_mpm_itk apache2-mod_php7
             # opcache zip intl xsl memcache yaml xdebug redis tidy memcached suhosin
             epmi --auto --skip-installed php7-mbstring php7-pdo php7-curl php7-fileinfo php7-dom php7-exif \
-                 php7-pdo_mysql php7-mysqli php7-pcntl php7-openssl php7-mcrypt php7-gd2
+                 php7-pdo_mysql php7-mysqli php7-pcntl php7-openssl php7-mcrypt php7-gd2 php7-xmlreader php7-memcached
             tune_php7
             tune_apache2
             ;;
         apache2-php5)
             epmi --auto --skip-installed apache2-mod_mpm_itk apache2-mod_php5 php5-suhosin
             epmi --auto --skip-installed php5-opcache php5-mbstring php5-mysql php5-zip php5-pspell php5-pdo php5-intl php5-curl php5-fileinfo php5-dom php5-exif php5-xsl php5-memcache \
-                 php5-pdo_mysql php5-yaml php5-mysqli php5-xdebug php5-redis php5-pcntl php5-tidy php5-openssl php5-memcached php5-mcrypt php5-gd2
+                 php5-pdo_mysql php5-yaml php5-mysqli php5-xdebug php5-redis php5-pcntl php5-tidy php5-openssl php5-memcached php5-mcrypt php5-gd2 php5-xmlreader
             ;;
     esac
 done

vz/azbyka/createbytask.sh

@@ -29,6 +29,8 @@ TASK="$1"
 # TODO
 VEIP=192.168.3.$VEID
 AUSER=azbyka_$NAME
+# hack
+[ "$NAME" = "azbyka" ] && AUSER=azbyka
 
 assure $NAME
 assure $VEID
@@ -36,18 +38,19 @@ assure $VEIDORIG
 
 if ! vzlist -a | grep " $VEIP " ; then
     vzctl create $VEID --ostemplate=$TEMPLATE || fatal
-    vzctl set $VEID --name $NAME --hostname $NAME.$DOMAIN --onboot yes --ipadd $VEIP --save || fatal 
+    vzctl set $VEID --name $NAME --hostname $NAME.$DOMAIN --onboot yes --ipadd $VEIP --save || fatal
     vzctl set $VEID --shmpages 300M --physpages 1G --privvmpages 2G --tcprcvbuf unlimited  --kmemsize 40M:45M --numproc 512 --dcachesize unlimited --save || fatal
 fi
 
 if [ ! -s /etc/vz/conf/$VEID.mount ] ; then
 cat > /etc/vz/conf/$VEID.mount <<EOF
 #!/bin/bash
-export VEID=$(basename $0 .mount)
+export VEID=\$(basename \$0 .mount)
 . /etc/vz/vz.conf
-#mount --bind /azbyka /var/lib/vz/root/$VEID/home
-mkdir -p /var/lib/vz/root/$VEID/home/$AUSER/
-mount --bind /azbyka/$AUSER/ /var/lib/vz/root/$VEID/home/$AUSER/
+#mount --bind /azbyka /var/lib/vz/root/\$VEID/home
+mkdir -p /var/lib/vz/root/\$VEID/home/$AUSER/
+mount --bind /azbyka/$AUSER/ /var/lib/vz/root/\$VEID/home/$AUSER/
+$MOUNTCMD
 EOF
 chmod 0755 /etc/vz/conf/$VEID.mount
 fi

vz/azbyka/nginxbylist.sh

+#!/bin/sh
+
+
+NGINXSTAT=/var/lib/vz/root/900/etc/nginx/sites-enabled.d/apache2/server-status.conf
+
+# name server
+add_nginx()
+{
+cat <<EOF
+
+    location = /$1/server-status {
+        set \$subserver $2;
+        proxy_pass \$subserver/server-status;
+        include include/trans-proxy.conf;
+
+        access_log  /var/log/nginx/azbyka_server-access.log logdetail;
+        error_log  /var/log/nginx/azbyka_server-status-error.log;
+    }
+EOF
+}
+
+echo "# server-status, generated by $0 at $(date)" > $NGINXSTAT
+for i in ves/*.task ; do
+    . $i
+    [ "$NAME" = "azbyka" ] && NAME=""
+    SERVER="http://sites$((8000 + $VEID - 100))";
+    add_nginx "$NAME" $SERVER >> $NGINXSTAT
+done

vz/azbyka/runbytask.sh

+#!/bin/bash -x
+
+fatal()
+{
+    echo "$*" >&2
+    exit 1
+}
+
+# TODO
+assure()
+{
+    [ -n "$1" ] || fatal "empty"
+}
+
+if [ -s "base.task" ] ; then
+. base.task
+fi
+
+TASK="$1"
+shift
+
+[ -s "$TASK" ] || fatal
+. $TASK
+
+# detect name by filename
+[ -n "$NAME" ] || NAME=$(basename $TASK .task)
+
+# TODO
+VEIP=192.168.3.$VEID
+AUSER=azbyka_$NAME
+# FIXME: hack
+[ "$NAME" = "azbyka" ] && AUSER=azbyka
+
+assure $NAME
+assure $VEID
+#assure $VEIDORIG
+
+st()
+{
+    vzctl exec $VEID "$@"
+}
+
+st "$@"

vz/azbyka/runscriptbytask.sh

+#!/bin/bash -x
+
+fatal()
+{
+    echo "$*" >&2
+    exit 1
+}
+
+# TODO
+assure()
+{
+    [ -n "$1" ] || fatal "empty"
+}
+
+if [ -s "base.task" ] ; then
+. base.task
+fi
+
+TASK="$1"
+shift
+
+SCRIPT="$1"
+shift
+
+[ -s "$TASK" ] || fatal
+. $TASK
+
+# detect name by filename
+[ -n "$NAME" ] || NAME=$(basename $TASK .task)
+
+# TODO
+VEIP=192.168.3.$VEID
+AUSER=azbyka_$NAME
+# FIXME: hack
+[ "$NAME" = "azbyka" ] && AUSER=azbyka
+
+assure $NAME
+assure $VEID
+#assure $VEIDORIG
+
+st()
+{
+    vzctl exec $VEID "$@"
+}
+
+#st "$@"
+# copy task into
+ATASK=/tmp/$(basename $TASK)
+( [ -s "base.task" ] && cat base.task ; echo ; cat $TASK ; ) | st tee $ATASK
+
+# if we detected it before
+echo "NAME=$NAME" | st tee -a $ATASK
+
+echo "AUSER=$AUSER" | st tee -a $ATASK
+
+auserid=$(vzctl exec $VEIDORIG id -u $AUSER)
+[ -n "$auserid" ] || fatal "can't get user id"
+echo "AUSERID=$auserid" | st tee -a $ATASK
+
+agroupid=$(vzctl exec $VEIDORIG id -g $AUSER)
+[ -n "$agroupid" ] || fatal "can't get group id"
+echo "AGROUPID=$agroupid" | st tee -a $ATASK
+
+#echo "WEBMASTER=$(vzctl exec $VEIDORIG id -g $AUSER)" | st tee -a $ATASK
+
+cat $SCRIPT | st tee /tmp/createbytask.int.sh
+st chmod 0755 /tmp/createbytask.int.sh
+st /tmp/createbytask.int.sh $ATASK || fatal