summaryrefslogtreecommitdiff
path: root/joeyconfig.hs
diff options
context:
space:
mode:
authorJoey Hess2017-03-21 13:21:12 -0400
committerJoey Hess2017-03-21 13:21:12 -0400
commit9fbf9fac4efab8764608ba3d804054c031b25318 (patch)
treee6821b132bf6731f3e7a1f52cdb96a42350ac237 /joeyconfig.hs
parent5649502fc04f6afd325363eb22be09829460507a (diff)
propellor spin
Diffstat (limited to 'joeyconfig.hs')
-rw-r--r--joeyconfig.hs13
1 files changed, 1 insertions, 12 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs
index 54096e25..3414d80e 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -132,8 +132,6 @@ clam = host "clam.kitenet.net" $ props
& Tor.named "kite1"
& Tor.bandwidthRate (Tor.PerMonth "400 GB")
- ! Systemd.nspawned webserver
-
& Systemd.nspawned oldusenetShellBox
& JoeySites.scrollBox
@@ -170,6 +168,7 @@ oyster = host "oyster.kitenet.net" $ props
& Network.ipv6to4
& Systemd.persistentJournal
& Journald.systemMaxUse "500MiB"
+ & Apt.serviceInstalledRunning "swapspace"
& Tor.isRelay
& Tor.named "kite4"
@@ -536,13 +535,6 @@ keysafe = host "keysafe.joeyh.name" $ props
--------------------------- \____, o ,' ----------------------------
---------------------------- '--,___________,' -----------------------------
--- Simple web server, publishing the outside host's /var/www
-webserver :: Systemd.Container
-webserver = Systemd.debContainer "webserver" $ props
- & standardContainer (Stable "jessie")
- & Systemd.bind "/var/www"
- & Apache.installed
-
-- My own openid provider. Uses php, so containerized for security
-- and administrative sanity.
openidProvider :: Systemd.Container
@@ -655,9 +647,6 @@ monsters = -- but do want to track their public keys etc.
& Ssh.hostPubKey SshEcdsa "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFSMqzJeV9rUzU4kWitGjeR4PWSa29SPqJ1fVkhtj3Hw9xjLVXVYrU9QlYWrOLXBpQ6KWjbjTDTdDkoohFzgbEY="
, host "ns6.gandi.net" $ props
& ipv4 "217.70.177.40"
- , host "turtle.kitenet.net" $ props
- & ipv4 "67.223.19.96"
- & ipv6 "2001:4978:f:2d9::2"
, host "mouse.kitenet.net" $ props
& ipv6 "2001:4830:1600:492::2"
& ipv4 "67.223.19.96"