removed some hosts

1 files changed, 0 insertions, 71 deletions

diff --git a/joeyconfig.hs b/joeyconfig.hs
index e104fc1c..3fb62c4d 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -58,7 +58,6 @@ hosts =                 --                  (o)  `
 	, mouse
 	, peregrine
 	, pell
-	, keysafe
 	] ++ monsters
 
 darkstar :: Host
@@ -86,9 +85,6 @@ darkstar = host "darkstar.kitenet.net" $ props
 	& imageBuiltFor honeybee
 		(RawDiskImage "/srv/honeybee.img")
 		(Debootstrapped mempty)
-	! imageBuiltFor banana
-		(RawDiskImage "/srv/banana.img")
-		(Debootstrapped mempty)
 
 dragon :: Host
 dragon = host "dragon.kitenet.net" $ props
@@ -159,17 +155,6 @@ orca = host "orca.kitenet.net" $ props
 		GitAnnexBuilder.standardAutoBuilder
 		Testing ARM64 Nothing (Cron.Times "1 * * * *") "4h")
 
-banana :: Host
-banana = host "banana.kitenet.net" $ props
-	& lemaker_Banana_Pi
-	& hasPartition
-		( partition EXT4
-			`mountedAt` "/"
-			`setSize` MegaBytes 950
-		)
-	& osDebian Testing ARMHF
-	& User.hasInsecurePassword (User "root") "root"
-
 honeybee :: Host
 honeybee = host "honeybee.kitenet.net" $ props
 	& standardSystem Testing ARMHF
@@ -407,62 +392,6 @@ pell = host "pell.branchable.com" $ props
 	& Branchable.server hosts
 	& Linode.serialGrub
 
--- See https://joeyh.name/code/keysafe/servers/ for requirements.
-keysafe :: Host
-keysafe = host "keysafe.joeyh.name" $ props
-	& ipv4 "139.59.17.168"
-	& Hostname.sane
-	& Hostname.mailname
-	& osDebian (Stable "buster") X86_64
-	& Apt.stdSourcesList `onChange` Apt.upgrade
-	& Apt.unattendedUpgrades
-	& DigitalOcean.distroKernel
-	-- This is a 500 mb VM, so need more ram to build propellor.
-	& Apt.serviceInstalledRunning "swapspace"
-	& Cron.runPropellor (Cron.Times "30 * * * *")
-	& Apt.installed ["etckeeper", "sudo"]
-	& JoeySites.noExim
-	& Apt.removed ["nfs-common", "rsyslog", "acpid", "rpcbind", "at"]
-
-	& User.hasSomePassword (User "root")
-	& User.accountFor (User "joey")
-	& User.hasSomePassword (User "joey")
-	& Sudo.enabledFor (User "joey")
-
-	& Ssh.installed
-	& Ssh.randomHostKeys
-	& User "root" `Ssh.authorizedKeysFrom` (User "joey", darkstar)
-	& User "joey" `Ssh.authorizedKeysFrom` (User "joey", darkstar)
-	& Ssh.noPasswords
-
-	& Tor.installed
-	& Tor.hiddenServiceAvailable "keysafe" (Port 4242)
-		`requires` Tor.hiddenServiceData "keysafe" hostContext
-	& Tor.bandwidthRate (Tor.PerMonth "750 GB")
-
-	-- keysafe installed manually until package is available
-	& Systemd.enabled "keysafe"
-
-	& Gpg.keyImported (Gpg.GpgKeyId "CECE11AE") (User "root")
-	& Ssh.knownHost hosts "usw-s002.rsync.net" (User "root")
-	& Ssh.userKeys (User "root")
-		(Context "keysafe.joeyh.name")
-		[ (SshEd25519, "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEx8bK9ZbXVEgEvxQeXLjnr9cGa/QvoB459aglP529My root@keysafe")
-		]
-	-- Note that this is not an incremental backup; it uploads the
-	-- whole content every time. So, only run weekly.
-	& Cron.niceJob "keysafe backup" Cron.Weekly (User "root") "/" backupcmd
-		`requires` Apt.installed ["rsync"]
-  where
-	datadir = "/var/lib/keysafe"
-	backupdir = "/var/backups/keysafe"
-	rsyncnetbackup = "2318@usw-s002.rsync.net:keysafe"
-	backupcmd = unwords
-		[ "keysafe --store-directory", datadir, "--backup-server", backupdir
-		, "&& rsync -a --delete --max-delete 3 ",  backupdir , rsyncnetbackup
-		]
-
-
 
 
        --'                        __|II|      ,.