propellor spin

config-joey.hs

@@ -96,7 +96,10 @@ clam = standardSystem "clam.kitenet.net" Unstable "amd64"
 	& "/var/www/index.html" `File.hasContent` ["hello, world"]
 	& alias "helloworld.kitenet.net"
 	& Docker.docked oldusenetShellBox
+
 	& JoeySites.scrollBox
+	& alias "scroll.joeyh.name"
+	& alias "us.scroll.joeyh.name"
 	
 	-- ssh on some extra ports to deal with horrible networks
 	-- while travelling
@@ -273,6 +276,10 @@ elephant = standardSystem "elephant.kitenet.net" Unstable "amd64"
 	& Docker.docked jerryPlay
 	& Docker.garbageCollected `period` (Weekly (Just 1))
 	
+	& JoeySites.scrollBox
+	& alias "scroll.joeyh.name"
+	& alias "eu.scroll.joeyh.name"
+	
 	-- For https port 443, shellinabox with ssh login to
 	-- kitenet.net
 	& alias "shell.kitenet.net"

src/Propellor/Property/SiteSpecific/JoeySites.hs

@@ -24,7 +24,6 @@ import Data.String.Utils
 
 scrollBox :: Property HasInfo
 scrollBox = propertyList "scroll server" $ props
-	& alias "scroll.joeyh.name"
 	& User.accountFor "scroll"
 	& Git.cloned "scroll" "git://git.kitenet.net/scroll" (d </> "scroll") Nothing
 	& Apt.installed ["ghc", "make", "cabal-install", "libghc-vector-dev",