summaryrefslogtreecommitdiff
path: root/config-joey.hs
diff options
context:
space:
mode:
authorJoey Hess2015-10-10 12:11:29 -0400
committerJoey Hess2015-10-10 12:11:29 -0400
commit7a9806f569c5a35a9cf98a5599258db27fe59668 (patch)
tree170b1ae2f40f847512b58d67e35c3c5e2d8bb8cd /config-joey.hs
parent2e467773d002b6e452c090a428807bf761760f8d (diff)
propellor spin
Diffstat (limited to 'config-joey.hs')
-rw-r--r--config-joey.hs23
1 files changed, 14 insertions, 9 deletions
diff --git a/config-joey.hs b/config-joey.hs
index a240cd12..1701d58c 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -36,6 +36,7 @@ import qualified Propellor.Property.SiteSpecific.IABak as IABak
import qualified Propellor.Property.SiteSpecific.Branchable as Branchable
import qualified Propellor.Property.SiteSpecific.JoeySites as JoeySites
import Propellor.Property.DiskImage
+import Propellor.Types.Container
main :: IO () -- _ ______`| ,-.__
main = defaultMain hosts -- / \___-=O`/|O`/__| (____.'
@@ -322,14 +323,16 @@ elephant = standardSystem "elephant.kitenet.net" Unstable "amd64"
& alias "ns3.kitenet.net"
& myDnsSecondary
- & Docker.configured
- & Docker.docked openidProvider
- `requires` Apt.serviceInstalledRunning "ntp"
- & Docker.docked ancientKitenet
- & Docker.docked jerryPlay
- & Docker.garbageCollected `period` (Weekly (Just 1))
+ -- & Docker.configured
+ -- & Docker.docked openidProvider
+ -- `requires` Apt.serviceInstalledRunning "ntp"
+ -- & Docker.docked ancientKitenet
+ -- & Docker.docked jerryPlay
+ -- & Docker.garbageCollected `period` (Weekly (Just 1))
& Systemd.nspawned oldusenetShellBox
+ & Systemd.nspawned ancientKitenet
+ `requires` Systemd.running Systemd.networkd
& JoeySites.scrollBox
& alias "scroll.joeyh.name"
@@ -436,10 +439,12 @@ openidProvider = standardStableDockerContainer "openid-provider"
"openid.kitenet.net:8081"
-- Exhibit: kite's 90's website.
-ancientKitenet :: Docker.Container
-ancientKitenet = standardStableDockerContainer "ancient-kitenet"
+ancientKitenet :: Systemd.Container
+ancientKitenet = standardStableContainer "ancient-kitenet"
& alias "ancient.kitenet.net"
- & Docker.publish "1994:80"
+ & Systemd.privateNetwork
+ & Systemd.running Systemd.networkd
+ & Systemd.publish (Port 80 ->- Port 1994)
& Apt.serviceInstalledRunning "apache2"
& Git.cloned (User "root") "git://kitenet-net.branchable.com/" "/var/www/html"
(Just "remotes/origin/old-kitenet.net")