X-Git-Url: https://git.distorted.org.uk/~mdw/distorted-ansible/blobdiff_plain/3f6c599278bae19250f1551830d96d103c1ff38d..dc2a2cfa3141927976f8ffa0ef5a17058d9e5dcd:/hosts/hosts.lisp

diff --git a/hosts/hosts.lisp b/hosts/hosts.lisp
index b8436a2..79676b6 100644
--- a/hosts/hosts.lisp
+++ b/hosts/hosts.lisp
@@ -9,50 +9,62 @@
   :hypervisor :kvm
   :os :debian
   :location house
-  :server (:multihome :ntp))
+  :server #(:multihome :ntp))
 
 (defhost radius
   :vm-host ibanez
   :os :debian
-  :server (:router :dns :syslog :vpn))
+  :server #(:router :dns :syslog :vpn))
 
 (defhost roadstar
   :vm-host ibanez
   :os :debian
-  :server (:multihome :dns :ftp :http :nfs :www-cache :rsync :munin))
+  :server #(:multihome :dns :ftp :http :nfs :www-cache :rsync :munin))
 
 (defhost jem
   :vm-host ibanez
   :os :debian
-  :server (:multihome :login :rsync :http :nfs :mail))
+  :mail-mode :usersat
+  :mail-daemon :heavy
+  :print-client t
+  :server #(:multihome :login :rsync :http :nfs :mail))
 
 (defhost artist
   :vm-host ibanez
   :os :debian
-  :server (:router :login :http :rsync :mail))
+  :mail-mode :usersat
+  :server #(:router :login :http :rsync :mail))
 
 ;; Other servers.
 
 (defhost vampire
   :os :debian
   :location house
-  :server (:router :ntp :vpn :nfs))
+  :mail-mode :usersat
+  :server #(:router :ntp :vpn :nfs :print))
 
 (defhost groove
   :os :debian
   :location house
-  :server (:http))
+  :server #(:http))
 
 ;; Clients.
 
 (defhost gibson
   :os :debian
   :location house
+  :mail-daemon :heavy
   :client t)
 
 (defhost crybaby
   :os :debian
   :location :mobile
+  :mail-daemon :heavy
+  :client t)
+
+(defhost haze
+  :os :sailfish
+  :location :mobile
   :client t)
 
 ;;;--------------------------------------------------------------------------
@@ -64,26 +76,31 @@
   :hypervisor :kvm
   :os :debian
   :location jump
-  :server (:multihome :ntp))
+  :server #(:multihome :ntp))
 
 (defhost precision
   :vm-host fender
   :os :debian
-  :server (:router :dns :vpn))
+  :server #(:router :dns :vpn))
 
 (defhost telecaster
   :vm-host fender
   :os :debian
-  :server (:multihome :dns :ftp :http :rsync :munin :nfs))
+  :mail-mode :srv
+  :mail-daemon :heavy
+  :server #(:multihome :dns :ftp :http :rsync :munin :nfs :mail))
 
 (defhost stratocaster
   :vm-host fender
   :os :debian
-  :server (:multihome :login :rsync :http :nfs :mail-hub))
+  :mail-mode :hub
+  :mail-daemon :heavy
+  :server #(:multihome :login :rsync :http :nfs :mail))
 
 (defhost jazz
   :vm-host fender
   :os :debian
-  :server (:multihome :login :http :mail :vpn))
+  :mail-mode :usersat
+  :server #(:multihome :login :http :mail :vpn))
 
 ;;;----- That's all, folks --------------------------------------------------