summaryrefslogtreecommitdiff
path: root/joeyconfig.hs
diff options
context:
space:
mode:
authorJoey Hess2018-07-11 14:11:11 -0400
committerJoey Hess2018-07-11 14:11:11 -0400
commit740a14c89c63dbfeca74b0867008067fcc764799 (patch)
treeafdebd1794d47a52cf7d43ac8215ec2d807fbebd /joeyconfig.hs
parent6387e7db95a584ce426e22c2112e781ed2d4e14c (diff)
propellor spin
Diffstat (limited to 'joeyconfig.hs')
-rw-r--r--joeyconfig.hs13
1 files changed, 5 insertions, 8 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs
index 2c6d77e1..1ebb1452 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -107,20 +107,12 @@ clam = host "clam.kitenet.net" $ props
, (SshEcdsa, "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPhfvcOuw0Yt+MnsFc4TI2gWkKi62Eajxz+TgbHMO/uRTYF8c5V8fOI3o+J/3m5+lT0S5o8j8a7xIC3COvi+AVw=")
]
& Apt.unattendedUpgrades
- & Systemd.persistentJournal
- & Journald.systemMaxUse "50MiB"
& Apt.serviceInstalledRunning "swapspace"
& Tor.isRelay
& Tor.named "kite1"
& Tor.bandwidthRate (Tor.PerMonth "400 GB")
- & Systemd.nspawned oldusenetShellBox
-
- & JoeySites.scrollBox
- & alias "scroll.joeyh.name"
- & alias "us.scroll.joeyh.name"
-
baleen :: Host
baleen = host "baleen.kitenet.net" $ props
& standardSystem Unstable X86_64 [ "New git-annex build box." ]
@@ -308,6 +300,11 @@ kite = host "kite.kitenet.net" $ props
& alias "nntp.olduse.net"
& JoeySites.oldUseNetServer hosts
+ & Systemd.nspawned oldusenetShellBox
+
+ & JoeySites.scrollBox
+ & alias "scroll.joeyh.name"
+ & alias "us.scroll.joeyh.name"
& alias "ns4.kitenet.net"
& myDnsPrimary "kitenet.net"