Merge branch 'master' into joeyconfig

2 files changed, 39 insertions, 0 deletions

diff --git a/doc/forum/Weird_SSH_issue/comment_9_b66bfe7d8414639adc66874d7e94cabf._comment b/doc/forum/Weird_SSH_issue/comment_9_b66bfe7d8414639adc66874d7e94cabf._comment
new file mode 100644
index 00000000..f81a809f
--- /dev/null
+++ b/doc/forum/Weird_SSH_issue/comment_9_b66bfe7d8414639adc66874d7e94cabf._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="mithrandi@311efa1b2b5c4999c2edae7da06fb825899e8a82"
+ nickname="mithrandi"
+ subject="comment 9"
+ date="2016-03-07T20:13:25Z"
+ content="""
+I didn't quite find a way to reliably reproduce the issue, but I can confirm that as expected, I haven't run into it again after merging your fix.
+"""]]
diff --git a/doc/todo/detect_and_use___96__GHC__95__PACKAGE__95__PATH__96__/comment_2_c111d137cbaa72b4e6a4c7df3ce2063c._comment b/doc/todo/detect_and_use___96__GHC__95__PACKAGE__95__PATH__96__/comment_2_c111d137cbaa72b4e6a4c7df3ce2063c._comment
new file mode 100644
index 00000000..21791330
--- /dev/null
+++ b/doc/todo/detect_and_use___96__GHC__95__PACKAGE__95__PATH__96__/comment_2_c111d137cbaa72b4e6a4c7df3ce2063c._comment
@@ -0,0 +1,31 @@
+[[!comment format=mdwn
+ username="mithrandi@311efa1b2b5c4999c2edae7da06fb825899e8a82"
+ nickname="mithrandi"
+ subject="comment 2"
+ date="2016-03-07T20:11:28Z"
+ content="""
+I got Propellor to work with stack by applying this patch (to disable the auto-building):
+
+```
+diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs
+index 5dbc583..b83bb91 100644
+--- a/src/Propellor/CmdLine.hs
++++ b/src/Propellor/CmdLine.hs
+@@ -119,7 +119,7 @@ defaultMain hostlist = withConcurrentOutput $ do
+                fetchFirst (onlyprocess (update Nothing))
+        go _ (Update (Just h)) = update (Just h)
+        go _ Merge = mergeSpin
+-       go cr cmdline@(Spin hs mrelay) = buildFirst cr cmdline $ do
++       go _ cmdline@(Spin hs mrelay) = buildFirst NoRebuild cmdline $ do
+                unless (isJust mrelay) commitSpin
+                forM_ hs $ \hn -> withhost hn $ spin mrelay hn
+        go cr (Run hn) = fetchFirst $
+```
+
+I then replaced the \"propellor\" binary/symlink with this little wrapper:
+
+```
+#!/bin/sh
+stack build && exec stack exec -- propellor-config \"$@\"
+```
+"""]]