diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-10-10 12:55:07 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-10-10 12:55:07 -0400 |
| commit | b3a5cb70dc04843a5b841f987bd60b8689edb58b (patch) | |
| tree | 6ac84fc8337c272b92497db7cf162de7821edf25 | |
| parent | e011925ed89687df29c3a3a53a12357e8a5d42b1 (diff) | |
propellor spin
| -rw-r--r-- | config-joey.hs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/config-joey.hs b/config-joey.hs index 3b0b9e8c..f1f87a27 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -326,13 +326,11 @@ elephant = standardSystem "elephant.kitenet.net" Unstable "amd64" -- & 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 + ! Systemd.nspawned ancientKitenet & JoeySites.scrollBox & alias "scroll.joeyh.name" @@ -442,13 +440,13 @@ openidProvider = standardStableDockerContainer "openid-provider" ancientKitenet :: Systemd.Container ancientKitenet = standardStableContainer "ancient-kitenet" & alias "ancient.kitenet.net" + & Git.cloned (User "root") "git://kitenet-net.branchable.com/" "/var/www/html" + (Just "remotes/origin/old-kitenet.net") & Apache.installed + & Apache.virtualHost "ancient.kitenet.net" (Port 1994) "/var/www/html" & Apache.siteDisabled "000-default" & "/etc/apache2/ports.conf" `File.hasContent` ["Listen 1994"] `onChange` Apache.reloaded - & Git.cloned (User "root") "git://kitenet-net.branchable.com/" "/var/www/html" - (Just "remotes/origin/old-kitenet.net") - & Apache.virtualHost "ancient.kitenet.net" (Port 1994) "/var/www/html" oldusenetShellBox :: Systemd.Container oldusenetShellBox = standardStableContainer "oldusenet-shellbox" |