-- cgit v1.2.3 -- cgit v1.2.3 -- cgit v1.2.3 From e964183cb5ca3f4d65a04c36afa28dd03f85824d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 13 Jul 2017 13:26:48 -0400 Subject: propellor spin --- joeyconfig.hs | 2 -- 1 file changed, 2 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" -- cgit v1.2.3 -- cgit v1.2.3 From 8600d11c63087e1f1d7485d42345933c06e93445 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 13 Jul 2017 13:32:25 -0400 Subject: rename src/config.hs This works around an infelicity in stack; it complains when there are both a toplevel config.hs and a src/config.hs, despite that being fine with cabal. --- propellor.cabal | 2 +- src/config.hs | 1 - src/propellor-config.hs | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 120000 src/config.hs create mode 120000 src/propellor-config.hs 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/config.hs deleted file mode 120000 index e3af968e..00000000 --- a/src/config.hs +++ /dev/null @@ -1 +0,0 @@ -../config.hs \ No newline at end of file diff --git a/src/propellor-config.hs b/src/propellor-config.hs new file mode 120000 index 00000000..e3af968e --- /dev/null +++ b/src/propellor-config.hs @@ -0,0 +1 @@ +../config.hs \ No newline at end of file -- cgit v1.2.3