summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
l---------config.hs2
-rw-r--r--doc/forum/secret-project_and_Module___8216__Graphics.UI.Threepenny__8217___does_not_export___8216__loadFile__8217__./comment_7_cf7efafc0ee96d5cecf452ebe49015d5._comment9
-rw-r--r--doc/forum/secret-project_and_Module___8216__Graphics.UI.Threepenny__8217___does_not_export___8216__loadFile__8217__./comment_8_66bab35f7eb78584e1adf93b4b8dccb4._comment12
-rw-r--r--doc/forum/secret-project_deliverable.mdwn27
-rw-r--r--doc/forum/secret-project_deliverable/comment_1_49f421da4a94d9267ca5e75679a4c92c._comment9
-rw-r--r--doc/forum/secret-project_deliverable/comment_2_a3faea076e7477d5ce4fcb03a38d74a7._comment11
-rw-r--r--privdata/relocate1
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs2
8 files changed, 70 insertions, 3 deletions
diff --git a/config.hs b/config.hs
index 97d90636..ec313725 120000
--- a/config.hs
+++ b/config.hs
@@ -1 +1 @@
-joeyconfig.hs \ No newline at end of file
+config-simple.hs \ No newline at end of file
diff --git a/doc/forum/secret-project_and_Module___8216__Graphics.UI.Threepenny__8217___does_not_export___8216__loadFile__8217__./comment_7_cf7efafc0ee96d5cecf452ebe49015d5._comment b/doc/forum/secret-project_and_Module___8216__Graphics.UI.Threepenny__8217___does_not_export___8216__loadFile__8217__./comment_7_cf7efafc0ee96d5cecf452ebe49015d5._comment
new file mode 100644
index 00000000..3f140c2e
--- /dev/null
+++ b/doc/forum/secret-project_and_Module___8216__Graphics.UI.Threepenny__8217___does_not_export___8216__loadFile__8217__./comment_7_cf7efafc0ee96d5cecf452ebe49015d5._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 7"""
+ date="2017-12-29T16:26:41Z"
+ content="""
+Asked the stack developers and found a stack.yaml that
+I think worked with both versions of stack. At least both can build with
+it, have not tried running secret-project again.
+"""]]
diff --git a/doc/forum/secret-project_and_Module___8216__Graphics.UI.Threepenny__8217___does_not_export___8216__loadFile__8217__./comment_8_66bab35f7eb78584e1adf93b4b8dccb4._comment b/doc/forum/secret-project_and_Module___8216__Graphics.UI.Threepenny__8217___does_not_export___8216__loadFile__8217__./comment_8_66bab35f7eb78584e1adf93b4b8dccb4._comment
new file mode 100644
index 00000000..a5c37aac
--- /dev/null
+++ b/doc/forum/secret-project_and_Module___8216__Graphics.UI.Threepenny__8217___does_not_export___8216__loadFile__8217__./comment_8_66bab35f7eb78584e1adf93b4b8dccb4._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="stappers@eb96885816da287c29f6f699999434d532149234"
+ nickname="stappers"
+ avatar="http://cdn.libravatar.org/avatar/bf33450acf6fc2a17a8b4e6fc7749c65"
+ subject="Clean build"
+ date="2017-12-29T17:41:02Z"
+ content="""
+Yes, with the updated `stack.yaml` I do get a clean build upon `stack build`.
+
+Yeah
+
+"""]]
diff --git a/doc/forum/secret-project_deliverable.mdwn b/doc/forum/secret-project_deliverable.mdwn
new file mode 100644
index 00000000..b1fcab54
--- /dev/null
+++ b/doc/forum/secret-project_deliverable.mdwn
@@ -0,0 +1,27 @@
+Hi,
+
+The secret-project README says to do `stack build`.
+
+Doing that gives me a clean compile.
+
+
+But what deliverable should I have now?
+
+
+Snippet from `secret-project.cabal`:
+
+ Executable propellor-config
+ Main-Is: config.hs
+
+But I don't have a `propellor-config`.
+
+Running `propellor` gives compile errors.
+So that doesn't seem the next step for getting any deliverable.
+
+For what should I be looking??
+
+
+Cheers
+
+Geert Stappers
+
diff --git a/doc/forum/secret-project_deliverable/comment_1_49f421da4a94d9267ca5e75679a4c92c._comment b/doc/forum/secret-project_deliverable/comment_1_49f421da4a94d9267ca5e75679a4c92c._comment
new file mode 100644
index 00000000..9f8c8a90
--- /dev/null
+++ b/doc/forum/secret-project_deliverable/comment_1_49f421da4a94d9267ca5e75679a4c92c._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2017-12-29T19:49:02Z"
+ content="""
+I've added some hints to the README, of course it's been a while since I
+ran it and I only ran it a couple times. The content of the config.hs is
+really more important than the gory details of how to run it, in my opinion.
+"""]]
diff --git a/doc/forum/secret-project_deliverable/comment_2_a3faea076e7477d5ce4fcb03a38d74a7._comment b/doc/forum/secret-project_deliverable/comment_2_a3faea076e7477d5ce4fcb03a38d74a7._comment
new file mode 100644
index 00000000..24738e49
--- /dev/null
+++ b/doc/forum/secret-project_deliverable/comment_2_a3faea076e7477d5ce4fcb03a38d74a7._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="stappers@eb96885816da287c29f6f699999434d532149234"
+ nickname="stappers"
+ avatar="http://cdn.libravatar.org/avatar/bf33450acf6fc2a17a8b4e6fc7749c65"
+ subject="almost there"
+ date="2017-12-29T21:09:04Z"
+ content="""
+thanks
+
+got another error that I probaly can fix my self
+"""]]
diff --git a/privdata/relocate b/privdata/relocate
deleted file mode 100644
index 271692d8..00000000
--- a/privdata/relocate
+++ /dev/null
@@ -1 +0,0 @@
-.joeyconfig
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 06417e6f..9385493c 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -1049,7 +1049,7 @@ laptopSoftware = Apt.installed
, "mairix", "offlineimap", "mutt"
, "nmap"
, "udevil", "pmount"
- , "arbtt", "hledger"
+ , "arbtt", "hledger", "bc"
, "apache2", "ikiwiki", "libhighlight-perl"
, "pal"
, "yeahconsole", "xkbset", "xinput"