@@ -31,13 +31,10 @@
 
 # yes, anything else is no
 run-wait yes
 
 
-# Use http instead of direct filesystem access
-# transport http
-# transport fs
 
 # If set to "default" the old code is used. Otherwise defaults to 200 or uses
 # numeric value given.
 #
 runqueue 20
@@ -124,27 +121,34 @@
 MAX_ALLOWED_LOAD 200
 # XTERM   [system xterm]
 # RUNDEAD [system exit 56]
 
 [server]
+
+# Use http instead of direct filesystem access
+transport http
+# transport fs
+# transport nmsg
+
 synchronous 0
 
 # If the server can't be started on this port it will try the next port until
 # it succeeds
-port 8080
+port 9080
 
 # This server will keep running this number of hours after last access. 
 # Three minutes is 0.05 hours
 # timeout 0.025
-timeout 0.1
+timeout 0.061
 
 # Server is required - slower but more resistant to Sqlite issues.
-# required yes
+required yes
 
 # Start server when average query takes longer than this
+# server-query-threshold 55500
 server-query-threshold 100
-# 55500
+timeout 0.01
 
 # daemonize yes
 # hostname #{scheme (get-host-name)}
 
 ## disks are:
@@ -167,5 +171,35 @@
 sqlite3 6
 blockz  10
 #       to your jobgroups where N is the number of parallel runs you are likely to see
 #       
 
+#======================================================================
+# Machine flavors
+#
+#   These specify lists of hosts or scripts to use or call for various
+#   flavors of task.
+#
+#======================================================================
+
+[flavors]
+
+plain hosts: xena, phoebe
+strong command: NBFAKE_HOST=zeus nbfake
+arm hosts: cubian
+
+[archive]
+
+# use machines of these flavor
+useflavors plain
+targsize 2G
+
+# minimum space required on an archive disk before allowing archiving to start (MB)
+minspace 10
+
+[archive-disks]
+
+# Archives will be organised under these paths like this:
+#  <testsuite>/<creationdate>
+# Within the archive the data is structured like this:
+#  <target>/<runname>/<test>/
+disk0 /tmp/#{getenv USER}/adisk1