diff options
author | Joey Hess <joey@kitenet.net> | 2014-04-04 01:12:09 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2014-04-04 01:12:09 -0400 |
commit | ccc82907124ccd2ad4951c2c4946ae20af007530 (patch) | |
tree | 0e34bf5413e514e31a476577585fd1d0df2c632d | |
parent | eb8dcfd99513131f95e067d0480164684793b1e9 (diff) |
update
-rw-r--r-- | Propellor/Config/Joey.hs (renamed from config-joeyh.hs) | 9 | ||||
-rw-r--r-- | Propellor/Config/Simple.hs (renamed from config-simple.hs) | 0 | ||||
-rw-r--r-- | TODO | 2 | ||||
l--------- | config.hs | 2 | ||||
-rw-r--r-- | debian/changelog | 8 | ||||
-rw-r--r-- | propellor.cabal | 6 |
6 files changed, 14 insertions, 13 deletions
diff --git a/config-joeyh.hs b/Propellor/Config/Joey.hs index e4a9dcac..530df9a3 100644 --- a/config-joeyh.hs +++ b/Propellor/Config/Joey.hs @@ -17,6 +17,8 @@ import qualified Propellor.Property.SiteSpecific.GitHome as GitHome import qualified Propellor.Property.SiteSpecific.GitAnnexBuilder as GitAnnexBuilder import qualified Propellor.Property.SiteSpecific.JoeySites as JoeySites import Data.List +-- Only imported to make sure it continues to build. +import qualified ConfigSimple as Simple main :: IO () main = defaultMain [host, Docker.containerProperties container] @@ -75,12 +77,9 @@ container _host name | otherwise = Nothing -- | Docker images I prefer to use. --- Edit as suites you, or delete this function and just put the image names --- above. image :: System -> Docker.Image -image (System (Debian Unstable) "amd64") = "joeyh/debian-unstable" -image (System (Debian Unstable) "i386") = "joeyh/debian-unstable-i386" -image _ = "debian" +image (System (Debian Unstable) arch) = "joeyh/debian-unstable-" ++ arch +image _ = "debian-stable-official" -- does not currently exist! -- This is my standard system setup standardSystem :: DebianSuite -> [Property] -> Maybe [Property] diff --git a/config-simple.hs b/Propellor/Config/Simple.hs index 840bad02..840bad02 100644 --- a/config-simple.hs +++ b/Propellor/Config/Simple.hs @@ -12,3 +12,5 @@ says they are unchanged even when they changed and triggered a reprovision. * Should properties be a tree rather than a list? +* Only make docker garbage collection run once a day or something + to avoid GC after a temp fail. @@ -1 +1 @@ -config-joeyh.hs
\ No newline at end of file +Propellor/Config/Joey.hs
\ No newline at end of file diff --git a/debian/changelog b/debian/changelog index a126e8fb..f4eadd22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -propellor (0.2.2) UNRELEASED; urgency=medium +propellor (0.2.2) unstable; urgency=medium * Now supports provisioning docker containers with architecture/libraries - that do not match the outside host. + that do not match the host. * Fixed a bug that caused file modes to be set to 600 when propellor - modified the file. + modified the file (did not affect newly created files). - -- Joey Hess <joeyh@debian.org> Fri, 04 Apr 2014 00:06:26 -0400 + -- Joey Hess <joeyh@debian.org> Fri, 04 Apr 2014 01:07:32 -0400 propellor (0.2.1) unstable; urgency=medium diff --git a/propellor.cabal b/propellor.cabal index c85a3e77..5d601393 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -1,5 +1,5 @@ Name: propellor -Version: 0.2.1 +Version: 0.2.2 Cabal-Version: >= 1.6 License: GPL Maintainer: Joey Hess <joey@kitenet.net> @@ -14,8 +14,6 @@ Extra-Source-Files: README.md TODO CHANGELOG - config-simple.hs - config-joeyh.hs Makefile debian/changelog debian/README.Debian @@ -64,6 +62,8 @@ Library Exposed-Modules: Propellor + Propellor.Config.Simple + Propellor.Config.Joey Propellor.Property Propellor.Property.Apt Propellor.Property.Cmd |