summaryrefslogtreecommitdiff
path: root/zshrc
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2008-10-05 18:42:10 +0000
committerweasel <weasel@bc3d92e2-beff-0310-a7cd-cc87d7ac0ede>2008-10-05 18:42:10 +0000
commite8bdeb6693f88ece16acae62697a86fc8e3d4426 (patch)
tree81bdd42d187d08043a7fa1e62a1b947a90507304 /zshrc
parent6cba842a7381382caf98fdb9413a9eb1490bebcd (diff)
Update upgrade-porter-chroots to use script installed on servers,
remove commented out code for setting on irssi aliases add samhain-check alias git-svn-id: svn+ssh://asteria.noreply.org/svn/weaselutils/trunk@367 bc3d92e2-beff-0310-a7cd-cc87d7ac0ede
Diffstat (limited to 'zshrc')
-rw-r--r--zshrc60
1 files changed, 12 insertions, 48 deletions
diff --git a/zshrc b/zshrc
index cc4f2dc..1bdb510 100644
--- a/zshrc
+++ b/zshrc
@@ -177,6 +177,7 @@ if [ -x /usr/bin/recode ]; then
alias unix2dos='recode lat1..ibmpc'
alias dos2unix='recode ibmpc..lat1'
fi
+[[ -x /usr/sbin/samhain ]] && alias samhain-check='sudo /usr/sbin/samhain -t check -i -p err -s none -l none -m none'
alias 221='pstops "2:0L@.7(21cm,0)+1L@.7(21cm,14.85cm)"'
alias rot13='tr a-zA-Z n-za-mN-ZA-M'
@@ -223,44 +224,6 @@ if [ "$HOSTNAME" = 'asteria' ] && [ -r "$HOME/.oftc-hosts" ] ; then
alias -g $name-testnet-ip="$ip"
alias irssi-testnet-$name="irssi --home=$HOME/.irssi-MASTER --connect=TESTNET-$name"
-
-# irssi-$name () {
-# local ip name oftcircport
-# name=`echo "$0" | sed -e 's/irssi-//'`
-# ip=`awk '$1=="'"$name"'" {print $2}' $HOME/.oftc-hosts`
-# if ! [ -d "$HOME/.irssi-$name" ] && [ -e "$HOME/.irssi-MASTER" ]; then
-# mkdir "$HOME/.irssi-$name"
-# ln -s ../.irssi-MASTER/config $HOME/.irssi-$name/config
-# fi
-# if ! [ -e "$HOME/.irssi-$name/scripts" ] && [ -e "$HOME/.irssi-MASTER/scripts" ]; then
-# ln -s ../.irssi-MASTER/scripts $HOME/.irssi-$name/scripts
-# fi
-# if [ -e "$HOME/.oftc-port" ]; then
-# oftcircport="--port=`cat $HOME/.oftc-port`"
-# else
-# oftcircport=""
-# fi
-# irssi --home=$HOME/.irssi-$name --connect=$ip --nick=weasel-$name $oftcircport
-# }
-
-# irssi-testnet-$name () {
-# local ip name oftcircport
-# name=`echo "$0" | sed -e 's/irssi-testnet-//'`
-# ip=`awk '$1=="'"$name"'" {print $2}' $HOME/.oftc-hosts`
-# if ! [ -d "$HOME/.irssi-testnet-$name" ] && [ -e "$HOME/.irssi-MASTER" ]; then
-# mkdir "$HOME/.irssi-testnet-$name"
-# ln -s ../.irssi-MASTER/config $HOME/.irssi-testnet-$name/config
-# fi
-# if ! [ -e "$HOME/.irssi-testnet-$name/scripts" ] && [ -e "$HOME/.irssi-MASTER/scripts" ]; then
-# ln -s ../.irssi-MASTER/scripts $HOME/.irssi-testnet-$name/scripts
-# fi
-# if [ -e "$HOME/.oftc-testnet-port" ]; then
-# oftcircport="--port=`cat $HOME/.oftc-port`"
-# else
-# oftcircport=""
-# fi
-# irssi --home=$HOME/.irssi-testnet-$name --connect=$ip --nick=weasel-$name $oftcircport
-# }
done
fi
@@ -353,16 +316,17 @@ upgrade-porter-chroots() {
mkdir hosts/chroot-$i 2>/dev/null || continue;
echo $i;
preexec $i;
- ssh $i -t 'cd ~/chroot &&
- for i in */; do
- echo;
- echo `hostname` $i;
- echo;
- sudo chroot $i apt-get update &&
- sudo chroot $i apt-get dist-upgrade -y &&
- sudo chroot $i apt-get clean;
- sudo chroot $i apt-get autoremove;
- done';
+ ssh $i -t 'sudo /usr/sbin/upgrade-porter-chroots'
+ #ssh $i -t 'cd ~/chroot &&
+ # for i in */; do
+ # echo;
+ # echo `hostname` $i;
+ # echo;
+ # sudo chroot $i apt-get update &&
+ # sudo chroot $i apt-get dist-upgrade -y &&
+ # sudo chroot $i apt-get clean;
+ # sudo chroot $i apt-get autoremove;
+ # done';
done
}
upgrade-debian-hosts() {