From c29212f7f8444d2d33c5235e5b06df824b6aecfb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 9 Oct 2018 12:13:12 -0400 Subject: propellor spin --- joeyconfig.hs | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) (limited to 'joeyconfig.hs') diff --git a/joeyconfig.hs b/joeyconfig.hs index b972f8c3..7af5d2ba 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -310,6 +310,10 @@ kite = host "kite.kitenet.net" $ props & alias "kgb.kitenet.net" & JoeySites.kgbServer + + & Systemd.nspawned ancientKitenet + & Systemd.nspawned openidProvider + `requires` Apt.serviceInstalledRunning "ntp" & JoeySites.scrollBox & alias "scroll.joeyh.name" @@ -387,23 +391,19 @@ elephant = host "elephant.kitenet.net" $ props -- & alias "ns3.kitenet.net" -- & myDnsSecondary - & Systemd.nspawned oldusenetShellBox - & Systemd.nspawned ancientKitenet - & Systemd.nspawned openidProvider - `requires` Apt.serviceInstalledRunning "ntp" - - & JoeySites.scrollBox - & alias "scroll.joeyh.name" - & alias "eu.scroll.joeyh.name" + -- & Systemd.nspawned oldusenetShellBox + -- & 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" - & Systemd.nspawned kiteShellBox + -- & alias "shell.kitenet.net" + -- & Systemd.nspawned kiteShellBox -- Nothing is using http port 80, so listen on -- that port for ssh, for traveling on bad networks that -- block 22. - & Ssh.listenPort (Port 80) + -- & Ssh.listenPort (Port 80) beaver :: Host beaver = host "beaver.kitenet.net" $ props @@ -550,11 +550,6 @@ oldusenetShellBox = Systemd.debContainer "oldusenet-shellbox" $ props & alias "shell.olduse.net" & JoeySites.oldUseNetShellBox -kiteShellBox :: Systemd.Container -kiteShellBox = Systemd.debContainer "kiteshellbox" $ props - & standardContainer (Stable "stretch") - & JoeySites.kiteShellBox - type Motd = [String] -- This is my standard system setup. -- cgit v1.2.3