summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--joeyconfig.hs27
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs12
2 files changed, 11 insertions, 28 deletions
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.
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index ff096d95..f170803d 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -369,18 +369,6 @@ ircBouncer = propertyList "IRC bouncer" $ props
where
conf = "/home/znc/.znc/configs/znc.conf"
-kiteShellBox :: Property DebianLike
-kiteShellBox = propertyList "kitenet.net shellinabox" $ props
- & Apt.installed ["openssl", "shellinabox", "openssh-client"]
- & File.hasContent "/etc/default/shellinabox"
- [ "# Deployed by propellor"
- , "SHELLINABOX_DAEMON_START=1"
- , "SHELLINABOX_PORT=443"
- , "SHELLINABOX_ARGS=\"--no-beep --service=/:SSH:kitenet.net\""
- ]
- `onChange` Service.restarted "shellinabox"
- & Service.running "shellinabox"
-
githubBackup :: Property (HasInfo + DebianLike)
githubBackup = propertyList "github-backup box" $ props
& Apt.installed ["github-backup", "moreutils"]