Generalize host configuration

1 files changed, 17 insertions, 144 deletions

diff --git a/steuermann/hosts.ini b/steuermann/hosts.ini
index 0ba9b07..6742e75 100644
--- a/steuermann/hosts.ini
+++ b/steuermann/hosts.ini
@@ -23,12 +23,19 @@ maxproc=2
 ; convenient place to stash it for now.
 local=[ 'sh', '-c', '%(script)s' ]
 
+[linux:sh]
+like=all
+run=[ 'ssh', '-q', '-x', '%(hostname)s', ' cd %(workdir)s; export sm_node %(node)s; export sm_run %(runname)s; source bin/.steuermann.%(hostname)s.sh; %(script)s; ' ]
+
+[mac:sh]
+like=linux:sh
+
+[solaris:sh]
+like=linux:sh
+
+
 [linux:csh]
-; for CSH
-;
-; -q = quiet
-; -x = do not forward X windows; prevents errors locking .Xauthority when lots of ssh come in at the same time
-run=[ 'ssh', '-q', '-x', '%(hostname)s', ' cd %(workdir)s; setenv sm_node %(node)s; setenv sm_run %(runname)s; source bin/.steuermann.%(hostname)s; %(script)s; show_status $status ' ]
+run=[ 'ssh', '-q', '-x', '%(hostname)s', ' cd %(workdir)s; setenv sm_node %(node)s; setenv sm_run %(runname)s; source bin/.steuermann.%(hostname)s.csh; %(script)s; ' ]
 like=all
 
 [mac:csh]
@@ -37,152 +44,18 @@ like=linux:csh
 [solaris:csh]
 like=linux:csh
 
-[windows:xp]
-run=[ 'python', '-m', 'steuermann.rexec', '-d', '%(workdir)s', '-h', '%(hostname)s', '-p', 'pass', 'set w_node=%(w_node)s & set sm_run=%(runname)s & call bin\\steuermann_%(hostname)s & call %(script)s & call show_status %%errorlevel%%' ]
-like=all
-
-
-; machines defined named after each OS
-
-[rhe4-32]
-like=herbert
-
-[rhe4-64]
-like=thor
-
-[rhe5-64]
-like=arzach
-
-[leopard]
-like=bond
-
-[snow-leopard]
-like=cadeau
-
 ; actual machines
 
-[nott]
-hostname=nott
+[local]
+hostname=localhost
 like=linux:csh
 workdir=/srv/work
 maxproc=32
 
-[jwcalibdev]
-hostname=jwcalibdev
-like=linux:csh
-workdir=/data1/iraf/steuermann
-maxproc=32
-
-[herbert]
-hostname=herbert
-like=linux:csh
-workdir=/herbert/data1/iraf/steuermann
-maxproc=4
-
-[thor]
-hostname=thor
-like=linux:csh
-workdir=/thor/data2/iraf/steuermann
-maxproc=4
-
-[arzach]
-hostname=arzach
-like=linux:csh
-workdir=/arzach/data1/iraf/steuermann
-maxproc=4
-
-[etcbrady]
-hostname=etcbrady
-like=linux:csh
-workdir=/home/iraf/sm_work
-; because each thing wants all the processors
-maxproc=1
-
-[etccartier]
-hostname=etccartier
-like=linux:csh
-workdir=/home/iraf/sm_work
-; because each thing wants all the processors
-maxproc=1
-
-[etcdevens]
-hostname=etcdevens
-like=linux:csh
-workdir=/home/iraf/sm_work
-; because each thing wants all the processors
-maxproc=1
-
-[etcedis]
-hostname=etcedis
-like=linux:csh
-workdir=/home/iraf/sm_work
-; because each thing wants all the processors
-maxproc=1
-
-[dljwetcv3]
-like=linux:csh
-hostname=dljwetcv3
-maxproc=12
-
-[dljwetcv4]
-like=linux:csh
-hostname=dljwetcv4
-maxproc=12
-
-[dljwetcv7]
-like=etcedis
-hostname=dljwetcv7
-maxproc=12
-
-[dljwetcv8]
-like=etcedis
-hostname=dljwetcv8
-maxproc=12
-
-[localhost]
-like=ssb
-
-[ssb]
-hostname=ssbwebv1
-like=linux:csh
-workdir=/ssbwebv1/data1/iraf/work
-maxproc=2
+; machines defined named after each OS
 
-[bond]
-hostname=bond
-like=mac:csh
-workdir=/Users/iraf/work/steuermann
-maxproc=8
-
-[cadeau]
-hostname=cadeau
-like=mac:csh
-workdir=/Users/iraf/work/steuermann
-maxproc=8
-
-[banana]
-hostname=banana
-like=mac:csh
-workdir=/Users/iraf/work/steuermann
-maxproc=4
-
-[aten]
-hostname=aten
-like=solaris:csh
-maxproc=1
-workdir=/aten/data2/iraf/steuermann
-
-[grail]
-hostname=grail
-like=solaris:csh
-maxproc=1
-workdir=/data/grail1/iraf/steuermann
-
-[vxp-dukat]
-hostname=vxp-dukat
-like=windows:xp
-maxproc=1
-workdir=c:/work
+[self]
+like=local
 
 ; There is a section [ALL] that is used with every machine name
 [ALL]