reorg

config-joey.hs

@@ -36,14 +36,24 @@ main = defaultMain hosts --  /   \___-=O`/|O`/__|                      (____.'
      Deployed -}          --  `/-==__ _/__|/__=-|          (       \_
 hosts :: [Host]          --   *             \ | |           '--------'
 hosts =                --                  (o)  `
-	[ host "darkstar.kitenet.net"
+	[ darkstar
+	, clam
+	, orca
+	, kite
+	, diatom
+	, elephant
+	] ++ containers ++ monsters
+
+darkstar :: Host
+darkstar = host "darkstar.kitenet.net"
 	& ipv6 "2001:4830:1600:187::2" -- sixxs tunnel
 
 	& Apt.buildDep ["git-annex"] `period` Daily
 	& Docker.configured
 	! Docker.docked hosts "android-git-annex"
 
-	, standardSystem "clam.kitenet.net" Unstable "amd64"
+clam :: Host
+clam = standardSystem "clam.kitenet.net" Unstable "amd64"
 	[ "Unreliable server. Anything here may be lost at any time!" ]
 	& ipv4 "162.248.9.29"
 
@@ -62,8 +72,8 @@ hosts =                 --                  (o)  `
 	& Ssh.listenPort 80
 	& Ssh.listenPort 443
 	
-	-- Orca is the main git-annex build box.
+orca :: Host
-	, standardSystem "orca.kitenet.net" Unstable "amd64"
+orca = standardSystem "orca.kitenet.net" Unstable "amd64"
 	[ "Main git-annex build box." ]
 	& ipv4 "138.38.108.179"
 
@@ -81,7 +91,8 @@ hosts =                 --                  (o)  `
 -- This is not a complete description of kite, since it's a
 -- multiuser system with eg, user passwords that are not deployed
 -- with propellor.
-  	, standardSystemUnhardened "kite.kitenet.net" Unstable "amd64"
+kite :: Host
+kite = standardSystemUnhardened "kite.kitenet.net" Unstable "amd64"
 	[ "Welcome to the new kitenet.net server!"
 	, "This is still under construction and not yet live.."
 	]
@@ -125,7 +136,8 @@ hosts =                 --                  (o)  `
 		, "zsh"
 		]
 
-  	, standardSystem "diatom.kitenet.net" Stable "amd64"
+diatom :: Host
+diatom = standardSystem "diatom.kitenet.net" Stable "amd64"
 	[ "Important stuff that needs not too much memory or CPU." ]
 	& ipv4 "107.170.31.195"
 
@@ -157,7 +169,6 @@ hosts =                 --                  (o)  `
 		`requires` Ssh.keyImported SshRsa "joey" (Context "downloads.kitenet.net")
 		`requires` Ssh.knownHost hosts "usbackup.kitenet.net" "joey"
 	& JoeySites.gitAnnexDistributor
-
 		& alias "tmp.kitenet.net"
 	& JoeySites.annexWebSite "/srv/git/joey/tmp.git"
 		"tmp.kitenet.net"
@@ -183,13 +194,12 @@ hosts =                 --                  (o)  `
 	
 	& Dns.secondaryFor ["animx"] hosts "animx.eu.org"
 
-	, let ctx = Context "elephant.kitenet.net"
+elephant :: Host
-	  in standardSystem "elephant.kitenet.net" Unstable "amd64"
+elephant = standardSystem "elephant.kitenet.net" Unstable "amd64"
   	[ "Storage, big data, and backups, omnomnom!"
 	, "(Encrypt all data stored here.)"
 	]
 	& ipv4 "193.234.225.114"
-
 		& Grub.chainPVGrub "hd0,0" "xen/xvda1" 30
 	& Postfix.satellite
 	& Apt.unattendedUpgrades
@@ -197,24 +207,20 @@ hosts =                 --                  (o)  `
 	& sshPubKey "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAJkoPRhUGT8EId6m37uBdYEtq42VNwslKnc9mmO+89ody066q6seHKeFY6ImfwjcyIjM30RTzEwftuVNQnbEB0="
 	& Ssh.keyImported SshRsa "joey" ctx
 	& Apt.serviceInstalledRunning "swapspace"
-
 		& alias "eubackup.kitenet.net"
 	& Apt.installed ["obnam", "sshfs", "rsync"]
 	& JoeySites.obnamRepos ["wren", "pell", "kite"]
 	& JoeySites.githubBackup
 	& JoeySites.rsyncNetBackup hosts
 	& JoeySites.backupsBackedupTo hosts "usbackup.kitenet.net" "lib/backup/eubackup"
-
 		& alias "podcatcher.kitenet.net"
 	& JoeySites.podcatcher
 	
 	& alias "znc.kitenet.net"
 	& JoeySites.ircBouncer
-
 		-- I'd rather this were on diatom, but it needs unstable.
 	& alias "kgb.kitenet.net"
 	& JoeySites.kgbServer
-
 		& alias "mumble.kitenet.net"
 	& JoeySites.mumbleServer hosts
 	
@@ -222,7 +228,6 @@ hosts =                 --                  (o)  `
 	& myDnsSecondary
 	
 	& Docker.configured
-
 		& Docker.docked hosts "oldusenet-shellbox"
 	& Docker.docked hosts "openid-provider"
 	 	`requires` Apt.serviceInstalledRunning "ntp"
@@ -238,6 +243,8 @@ hosts =                 --                  (o)  `
 	-- that port for ssh, for traveling on bad networks that
 	-- block 22.
 	& Ssh.listenPort 80
+  where
+	ctx = Context "elephant.kitenet.net"
 
 
 	    --'                        __|II|      ,.
@@ -247,9 +254,10 @@ hosts =                 --                  (o)  `
 	----------------------- :                    / -----------------------
 	------------------------ \____, o          ,' ------------------------
 	------------------------- '--,___________,'  -------------------------
-
+containers :: [Host]
+containers =
 	-- Simple web server, publishing the outside host's /var/www
-	, standardContainer "webserver" Stable "amd64"
+	[ standardContainer "webserver" Stable "amd64"
 		& Docker.publish "8080:80"
 		& Docker.volume "/var/www:/var/www"
 		& Apt.serviceInstalledRunning "apache2"
@@ -287,7 +295,7 @@ hosts =                 --                  (o)  `
 	, let gitannexdir = GitAnnexBuilder.homedir </> "git-annex"
 	  in GitAnnexBuilder.androidContainer dockerImage "android-git-annex" doNothing gitannexdir
 		& Docker.volume ("/home/joey/src/git-annex:" ++ gitannexdir)
-	] ++ monsters
+	]
 
 type Motd = [String]