cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update

This commit is contained in:
Joey Hess 2014-04-04 01:12:09 -04:00
parent eb8dcfd995
commit ccc8290712
6 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config-joeyh.hs → Propellor/Config/Joey.hs
View File

@ -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.GitAnnexBuilder as GitAnnexBuilder
import qualified Propellor.Property.SiteSpecific.JoeySites as JoeySites import qualified Propellor.Property.SiteSpecific.JoeySites as JoeySites
import Data.List import Data.List
-- Only imported to make sure it continues to build.
import qualified ConfigSimple as Simple
main :: IO () main :: IO ()
main = defaultMain [host, Docker.containerProperties container] main = defaultMain [host, Docker.containerProperties container]
@ -75,12 +77,9 @@ container _host name
| otherwise = Nothing | otherwise = Nothing
-- | Docker images I prefer to use. -- | 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 -> Docker.Image
image (System (Debian Unstable) "amd64") = "joeyh/debian-unstable" image (System (Debian Unstable) arch) = "joeyh/debian-unstable-" ++ arch
image (System (Debian Unstable) "i386") = "joeyh/debian-unstable-i386" image _ = "debian-stable-official" -- does not currently exist!
image _ = "debian"
-- This is my standard system setup -- This is my standard system setup
standardSystem :: DebianSuite -> [Property] -> Maybe [Property] standardSystem :: DebianSuite -> [Property] -> Maybe [Property]

0
config-simple.hs → Propellor/Config/Simple.hs
View File

2
TODO
View File

@ -12,3 +12,5 @@
says they are unchanged even when they changed and triggered a says they are unchanged even when they changed and triggered a
reprovision. reprovision.
* Should properties be a tree rather than a list? * 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.

2
config.hs
View File

@ -1 +1 @@
config-joeyh.hs Propellor/Config/Joey.hs

8
debian/changelog vendored
View File

@ -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 * 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 * 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 propellor (0.2.1) unstable; urgency=medium

6
propellor.cabal
View File

@ -1,5 +1,5 @@
Name: propellor Name: propellor
Version: 0.2.1 Version: 0.2.2
Cabal-Version: >= 1.6 Cabal-Version: >= 1.6
License: GPL License: GPL
Maintainer: Joey Hess <joey@kitenet.net> Maintainer: Joey Hess <joey@kitenet.net>
@ -14,8 +14,6 @@ Extra-Source-Files:
README.md README.md
TODO TODO
CHANGELOG CHANGELOG
config-simple.hs
config-joeyh.hs
Makefile Makefile
debian/changelog debian/changelog
debian/README.Debian debian/README.Debian
@ -64,6 +62,8 @@ Library
Exposed-Modules: Exposed-Modules:
Propellor Propellor
Propellor.Config.Simple
Propellor.Config.Joey
Propellor.Property Propellor.Property
Propellor.Property.Apt Propellor.Property.Apt
Propellor.Property.Cmd Propellor.Property.Cmd