summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-04-10 11:02:29 -0400
committerJoey Hess2014-04-10 11:02:29 -0400
commit222e2fe8a4cc555840ce7e2f5f9015a21f325d37 (patch)
treea4144ad7aa1d4b08247d8de6043ce9cb3f9087ab
parent7a0074454bbae2506c102a57add9af17a32907cc (diff)
propellor spin
-rw-r--r--Propellor/Property.hs4
-rw-r--r--Propellor/Property/Scheduled.hs1
-rw-r--r--config-joey.hs17
3 files changed, 20 insertions, 2 deletions
diff --git a/Propellor/Property.hs b/Propellor/Property.hs
index c2a8972e..ca492e33 100644
--- a/Propellor/Property.hs
+++ b/Propellor/Property.hs
@@ -3,6 +3,7 @@ module Propellor.Property where
import System.Directory
import Control.Monad
import Data.Monoid
+import Control.Monad.IfElse
import Propellor.Types
import Propellor.Engine
@@ -54,7 +55,8 @@ flagFile property flagfile = Property (propertyDesc property) $
go False = do
r <- ensureProperty property
when (r == MadeChange) $
- writeFile flagfile ""
+ unlessM (doesFileExist flagfile) $
+ writeFile flagfile ""
return r
--- | Whenever a change has to be made for a Property, causes a hook
diff --git a/Propellor/Property/Scheduled.hs b/Propellor/Property/Scheduled.hs
index bef2a297..827c648c 100644
--- a/Propellor/Property/Scheduled.hs
+++ b/Propellor/Property/Scheduled.hs
@@ -21,7 +21,6 @@ import qualified Data.Map as M
period :: Property -> Recurrance -> Property
period prop recurrance = Property desc $ do
lasttime <- getLastChecked (propertyDesc prop)
- print lasttime
nexttime <- fmap startTime <$> nextTime schedule lasttime
t <- localNow
if Just t >= nexttime
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