improve rooter scripts

rooter/add_eterkey.sh

@@ -49,7 +49,7 @@ HSSH=/home/$USERNAME/.ssh
 # TODO: исправить повторное добавление ключей
 add_key_cmd()
 {
-	echo "$SUDO useradd $USERNAME ; $SUDO su - $USERNAME -c 'mkdir -p $HSSH ; chmod 700 $HSSH ; touch $HSSH/authorized_keys ; chmod 600 $HSSH/authorized_keys' ; cat >> $HSSH/authorized_keys"
+	echo "$SUDO useradd $USERNAME ; $SUDO su - $USERNAME -c 'mkdir -p $HSSH ; chmod 700 $HSSH ; touch $HSSH/authorized_keys ; chmod 600 $HSSH/authorized_keys ; cat >> $HSSH/authorized_keys'"
 }
 
 # copy key in host system

rooter/get_iptables.sh

@@ -6,7 +6,7 @@
 
 fatal()
 {
-	echo "Error: $@"
+	echo "Error: $@" >&2
 	exit 1
 }
 
@@ -23,4 +23,4 @@ shift
 echo "$HOSTLIST" | grep -q -- "$HOST" || fatal "Unknown host $HOST. Call to the administrator."
 
 
-fastssh "root@$HOST" $SUDO iptables -L -n -t nat | grep "^DNAT"
+fastssh "root@$HOST" $SUDO iptables -L -n -t nat | grep "^DNAT" | sed -e "s/ \+$//g"

rooter/get_ssh_pubkey.sh

@@ -22,7 +22,8 @@ else
 	HOMEDIR=/home/$USERNAME
 fi
 
-USERKEY=$HOMEDIR/.ssh/id_dsa.pub
+USERKEY=$HOMEDIR/.ssh/id_ed25519.pub
+[ -r "$USERKEY" ] || USERKEY=$HOMEDIR/.ssh/id_dsa.pub
 [ -r "$USERKEY" ] || USERKEY=$HOMEDIR/.ssh/id_rsa.pub
 
 #[ -r "$USERKEY" ] || fatal "Can't read ssh key $USERKEY"

rooter/get_vzlist.sh

@@ -6,14 +6,14 @@
 
 fatal()
 {
-	echo "Error: $@"
+	echo "Error: $@" >&2
 	exit 1
 }
 
 # 5 minutes cache
 is_obsoleted()
 {
-	test -z "$(find "$1" -cmin -5 2>/dev/null)"
+	test -z "$(find "$1" -cmin -1200 2>/dev/null)"
 }
 
 get_log()