From 57fa2c0e08a83297782419730a4b3de65cb25d40 Mon Sep 17 00:00:00 2001 From: mithrandi@311efa1b2b5c4999c2edae7da06fb825899e8a82 Date: Mon, 7 Mar 2016 20:10:39 +0000 Subject: Added a comment --- ...ent_2_db91010cbf80ca36c734c27340e634a2._comment | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 doc/todo/detect_and_use___96__GHC__95__PACKAGE__95__PATH__96__/comment_2_db91010cbf80ca36c734c27340e634a2._comment (limited to 'doc') diff --git a/doc/todo/detect_and_use___96__GHC__95__PACKAGE__95__PATH__96__/comment_2_db91010cbf80ca36c734c27340e634a2._comment b/doc/todo/detect_and_use___96__GHC__95__PACKAGE__95__PATH__96__/comment_2_db91010cbf80ca36c734c27340e634a2._comment new file mode 100644 index 00000000..38d0ba90 --- /dev/null +++ b/doc/todo/detect_and_use___96__GHC__95__PACKAGE__95__PATH__96__/comment_2_db91010cbf80ca36c734c27340e634a2._comment @@ -0,0 +1,30 @@ +[[!comment format=mdwn + username="mithrandi@311efa1b2b5c4999c2edae7da06fb825899e8a82" + nickname="mithrandi" + subject="comment 2" + date="2016-03-07T20:10:39Z" + 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 \"$@\" + +"""]] -- cgit v1.2.3 From 90965e34489bc7d4bf9d6425c722d6bd82f04b7a Mon Sep 17 00:00:00 2001 From: mithrandi@311efa1b2b5c4999c2edae7da06fb825899e8a82 Date: Mon, 7 Mar 2016 20:11:11 +0000 Subject: removed --- ...ent_2_db91010cbf80ca36c734c27340e634a2._comment | 30 ---------------------- 1 file changed, 30 deletions(-) delete mode 100644 doc/todo/detect_and_use___96__GHC__95__PACKAGE__95__PATH__96__/comment_2_db91010cbf80ca36c734c27340e634a2._comment (limited to 'doc') diff --git a/doc/todo/detect_and_use___96__GHC__95__PACKAGE__95__PATH__96__/comment_2_db91010cbf80ca36c734c27340e634a2._comment b/doc/todo/detect_and_use___96__GHC__95__PACKAGE__95__PATH__96__/comment_2_db91010cbf80ca36c734c27340e634a2._comment deleted file mode 100644 index 38d0ba90..00000000 --- a/doc/todo/detect_and_use___96__GHC__95__PACKAGE__95__PATH__96__/comment_2_db91010cbf80ca36c734c27340e634a2._comment +++ /dev/null @@ -1,30 +0,0 @@ -[[!comment format=mdwn - username="mithrandi@311efa1b2b5c4999c2edae7da06fb825899e8a82" - nickname="mithrandi" - subject="comment 2" - date="2016-03-07T20:10:39Z" - 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 \"$@\" - -"""]] -- cgit v1.2.3 From fe00952cab03ae65420cd8a3d2e0d9b258599d58 Mon Sep 17 00:00:00 2001 From: mithrandi@311efa1b2b5c4999c2edae7da06fb825899e8a82 Date: Mon, 7 Mar 2016 20:11:28 +0000 Subject: Added a comment --- ...ent_2_c111d137cbaa72b4e6a4c7df3ce2063c._comment | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 doc/todo/detect_and_use___96__GHC__95__PACKAGE__95__PATH__96__/comment_2_c111d137cbaa72b4e6a4c7df3ce2063c._comment (limited to 'doc') 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 \"$@\" +``` +"""]] -- cgit v1.2.3 From a4fee0c09c0000f8e798ee40e7083602198db600 Mon Sep 17 00:00:00 2001 From: mithrandi@311efa1b2b5c4999c2edae7da06fb825899e8a82 Date: Mon, 7 Mar 2016 20:13:25 +0000 Subject: Added a comment --- .../comment_9_b66bfe7d8414639adc66874d7e94cabf._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/Weird_SSH_issue/comment_9_b66bfe7d8414639adc66874d7e94cabf._comment (limited to 'doc') 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. +"""]] -- cgit v1.2.3