From 222e2fe8a4cc555840ce7e2f5f9015a21f325d37 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 10 Apr 2014 11:02:29 -0400 Subject: propellor spin --- config-joey.hs | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'config-joey.hs') diff --git a/config-joey.hs b/config-joey.hs index d07e12b5..f8ac5e5e 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -42,6 +42,7 @@ host hostname@"clam.kitenet.net" = Just $ withSystemd $ props & JoeySites.oldUseNetshellBox & Docker.docked container hostname "openid-provider" `requires` Apt.installed ["ntp"] + & Docker.docked container hostname "ancient.kitenet.net" & Docker.configured & Docker.garbageCollected `period` Daily -- Orca is the main git-annex build box. @@ -69,6 +70,9 @@ host hostname@"diatom.kitenet.net" = Just $ props & Git.daemonRunning "/srv/git" & File.ownerGroup "/srv/git" "joey" "joey" -- git repos restore (how?) + -- family annex needs family members to have accounts, + -- ssh host key etc.. finesse? + -- (also should upgrade git-annex-shell for it..) -- kgb installation and setup -- ssh keys for branchable and github repo hooks -- gitweb @@ -103,6 +107,19 @@ container _parenthost name "openid.kitenet.net:8081" ] + | name == "ancient.kitenet.net" = Just $ standardContainer Stable "amd64" + [ Docker.publish "1994:80" + , Docker.inside $ props + & Apt.serviceInstalledRunning "apache2" + & Apt.installed ["git"] + & scriptProperty + [ "cd /var/" + , "rm -rf www" + , "git clone git://git.kitenet.net/git/kitewiki www" + , "git checkout remotes/origin/old-kitenet.net" + ] `flagFile` "/var/www/blastfromthepast.html" + ] + -- armel builder has a companion container that run amd64 and -- runs the build first to get TH splices. They share a home -- directory, and need to have the same versions of all haskell -- cgit v1.2.3