diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-07-13 13:34:57 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-07-13 13:34:57 -0400 |
| commit | 44399c31269affb06c06dff96f923911ca2218b4 (patch) | |
| tree | b71fbbf71c9d1f27a4639f4ec667ae9e047b28bf | |
| parent | f33a1090b4347679602d6f75c281654ae46435b9 (diff) | |
| parent | 8600d11c63087e1f1d7485d42345933c06e93445 (diff) | |
Merge branch 'joeyconfig'
| -rw-r--r-- | joeyconfig.hs | 2 | ||||
| -rw-r--r-- | propellor.cabal | 2 | ||||
| l--------- | src/propellor-config.hs (renamed from src/config.hs) | 0 |
3 files changed, 1 insertions, 3 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs index b039c558..2b7806b0 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -4,7 +4,6 @@ module Main where import Propellor import Propellor.Property.Scheduled -import Propellor.Property.Bootstrap import qualified Propellor.Property.File as File import qualified Propellor.Property.Apt as Apt import qualified Propellor.Property.Network as Network @@ -80,7 +79,6 @@ testvm = host "testvm.kitenet.net" $ props darkstar :: Host darkstar = host "darkstar.kitenet.net" $ props - & bootstrapWith (Robustly Stack) & osDebian Unstable X86_64 & ipv6 "2001:4830:1600:187::2" & Aiccu.hasConfig "T18376" "JHZ2-SIXXS" diff --git a/propellor.cabal b/propellor.cabal index 7d082807..e48c43f6 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -55,7 +55,7 @@ Executable propellor Executable propellor-config Default-Language: Haskell98 - Main-Is: config.hs + Main-Is: propellor-config.hs GHC-Options: -threaded -Wall -fno-warn-tabs -O0 if impl(ghc >= 8.0) GHC-Options: -fno-warn-redundant-constraints diff --git a/src/config.hs b/src/propellor-config.hs index e3af968e..e3af968e 120000 --- a/src/config.hs +++ b/src/propellor-config.hs |