last changes

common/restore_file.sh

@@ -4,6 +4,6 @@
 # 1. file to restore (full path)
 # 2. time
 
-BB=/var/local/backup-hosting/host03-vps/var/lib/vz/private/44
+BB=/var/local/backup-hosting/azbyka-vps/var/lib/vz/private/193
 mkdir -p RFDIR/ || exit
-rdiff-backup -r "$2" backup@backup::/$BB/"$1" RFDIR/$(basename "$1")
+rdiff-backup $3 -r "$2" backup@backup::/$BB/"$1" RFDIR/$(basename "$1")

web/add_ftpuser.sh

@@ -6,6 +6,8 @@ FTPUSER=$4
 
 [ -r /etc/vsftpd/user_list ] || exit
 
+service nscd status && NSCD=1 && service nscd stop
+
 if [ -n "$SUFFIX" ] ; then
     [ -n "$FTPPATH" ] || exit 1
 
@@ -24,3 +26,4 @@ passwd $FTPUSER
 echo
 echo "Login: $FTPUSER"
 echo "Path: $FTPPATH"
+[ -n "$NSCD" ] && service nscd start

web/add_site.sh

@@ -34,12 +34,13 @@ umask u=rwx,g=rwx,o=x
 
 if [ ! -d "$LOGDIR" ] ; then
 	mkdir -p $LOGDIR $HOSTBASE $SESSIONDIR
-	chown -R $2:webmaster $LOGDIR /home/$2
-	chmod g+rwx /home/$2 $LOGDIR
-	chmod o+x /home/$2 $LOGDIR
-	chmod g+s /home/$2 $LOGDIR
+	chown -R $2:webmaster /home/$2
+	chmod g+rwx /home/$2
+	chmod g+s /home/$2
 	chmod g-w /home/$2
-	chmod o-rw /home/$2
+	chmod o-rwx /home/$2 /home/$2/www
+	chown -R root:root $LOGDIR
+	chmod 0755 $LOGDIR
 fi
 
 #mkdir -p $SITE/cgi
@@ -50,9 +51,9 @@ test -f $SITE/favicon.ico || touch $SITE/favicon.ico
 touch $SITE/robots.txt
 # due nscd?
 chown -R $2:webmaster $SITE/ || { sleep 10; chown -R $2:webmaster $SITE/ ; }
-chmod o+r $SITE/robots.txt $SITE/favicon.ico
+#chmod o+r $SITE/robots.txt $SITE/favicon.ico
 chmod g+rwx $SITE/
-chmod o+x $SITE/
+chmod o-rwx $SITE/
 chmod g+s $SITE/
 
 cat <<EOF >$DOMAINNAME.conf
@@ -61,8 +62,8 @@ cat <<EOF >$DOMAINNAME.conf
 # ----- $1 -----
 <VirtualHost *>
     ServerName $DOMAINNAME
-    ServerAlias www.$DOMAINNAME $USERNAME.$TECHNAME
-    AssignUserID $2 webmaster
+    ServerAlias www.$DOMAINNAME $USERNAME.$TECHHOST
+    AssignUserID $2 $2
     php_admin_value session.save_path "$SESSIONDIR"
     php_admin_value open_basedir "$HOMEDIR"
     php_admin_value upload_tmp_dir "$TMPDIR"
@@ -79,4 +80,4 @@ service httpd2 reload
 
 service httpd2 status && echo OK
 
-echo "You can use technical name: $USERNAME.$TECHNAME"
+echo "You can use technical name: $USERNAME.$TECHHOST"

web/add_user.sh

@@ -3,6 +3,8 @@
 USER=$1
 [ -n "$USER" ] || exit
 
+service nscd status && NSCD=1 && service nscd stop
+
 useradd -G users $USER || exit
 
 pwgen
@@ -14,3 +16,5 @@ passwd $USER || exit
 echo "$MYSQLHOST	mysql.$USER" >>/etc/hosts
 
 echo "$USER" >>/etc/vsftpd/user_list
+
+[ -n "$NSCD" ] && service nscd start

web/check_logs.sh

+#!/bin/sh
+
+# TODO:
+#  
+#     
+#    ftp  ssh
+
+if [ "$1" = "alllog" ] ; then
+	shift
+	ALLLOG=1
+fi
+
+if [ -n "$1" ] ; then
+	shift
+	USER="$1"
+else
+	USER="*"
+fi
+
+export USER
+for i in $(echo /home/$USER/log) ; do
+	HOME=$(dirname $i); USER=$(basename $HOME)
+	test -L "$HOME" && continue
+	echo Check in $i
+	find $i -name "*_access.log" | xargs -t grep "/home/" >report_log_home_$USER.log
+	if [ -n "$ALLLOG" ] ; then
+		find $i -name "*_access.log.*.bz2" | xargs -t bzgrep "/home/" >>report_log_home_$USER.log
+	fi
+done

web/check_phpmyadmin.sh

+#!/bin/sh
+# Find files changed since last 3 day
+USER="*"
+[ -n "$1" ] && USER="$1"
+find /home/$USER/www -type f | grep "db_details.php" | xargs -n1 ls -l

web/config

@@ -4,3 +4,6 @@ MYSQLHOST=192.168.3.91
 TECHHOST=site.host03.eterhost.ru
 # Адрес системого администратора
 ADMINMAIL=support@eterhost.ru
+
+# Удалённый каталог backup
+BACKUPDIR=/var/local/backup-hosting/azbyka-vps/

web/list_text_files.sh

+#!/bin/sh
+# Find files changed since last 3 day
+USER="*"
+[ -n "$1" ] && USER="$1"
+find /home/$USER/www -mtime -3 -type f -size -200k | grep -v /cache/ | grep -v -i "jpg\$" | grep -v -i "gif\$" | grep -v ".db\$" | xargs -n1 ls -l

common/restore_site_dump.sh → web/restore_site_dump.sh

 #!/bin/sh -x
 
-# Lav 2012
+# Lav (c) 2012
 # Скрипт для восстановления бэкапа сайта
-# user site [date]
-# date in 2012-03-02T20:00:00 format (or 4D)
+# Using: user site [date]
+# date format: 2012-03-02T20:00:00 (or 4D)
 
-RBCONTDIR=/var/local/backup-hosting/host03-vps/var/lib/vz/private/390
+VEID=`echo $(cat /proc/user_beancounters | grep kmemsize | cut -f1 -d:)`
+
+. ./config
+
+RBCONTDIR=$BACKUPDIR/var/lib/vz/private/$VEID
+echo "Restore from $RBCONTDIR"
 
 HUSER=$1
 [ -n "$HUSER" ] || exit
@@ -20,4 +25,4 @@ BACKUPDIR=/home/$HUSER/restored-backup
 mkdir -p $BACKUPDIR || exit
 
 RESTOREDIR=$RBCONTDIR/home/$HUSER/www/$RSITE
-rdiff-backup -r $BDATE backup::$RESTOREDIR $BACKUPDIR/$RSITE
+rdiff-backup -r $BDATE backup::$RESTOREDIR $BACKUPDIR/$(basename $RSITE)