Updating simplenode template so that it works with refactored overlay support; fixes bugs 347 and 348

--HG--
extra : rebase_source : b8eaa05914a99a7f67fdc83f1e07a92bdcad5dfd

2 files changed, 14 insertions, 12 deletions

diff --git a/priv/templates/simplenode.reltool.config b/priv/templates/simplenode.reltool.config
index c409660..c804137 100644
--- a/priv/templates/simplenode.reltool.config
+++ b/priv/templates/simplenode.reltool.config
@@ -15,14 +15,16 @@
        {profile, embedded},
        {excl_sys_filters, ["^bin/.*",
                            "^erts.*/bin/(dialyzer|typer)"]},
-       {app, riak, [{incl_cond, include}]},
        {app, sasl, [{incl_cond, include}]}
       ]}.
 
-{rebar, [
-         {empty_dirs, [
-                       "log/sasl"
-                      ]},
+{target_dir, "{{nodeid}}"}.
 
-         {overlay, "overlay"}
-         ]}.
+{overlay, [
+           {mkdir, "log/sasl"},
+           {copy, "files/erl", "\{\{erts_vsn\}\}/bin/erl"},
+           {copy, "files/nodetool", "\{\{erts_vsn\}\}/bin/nodetool"},
+           {copy, "files/{{nodeid}}", "bin/{{nodeid}}"},
+           {copy, "files/app.config", "etc/app.config"},
+           {copy, "files/vm.args", "etc/vm.args"}
+           ]}.
diff --git a/priv/templates/simplenode.template b/priv/templates/simplenode.template
index 0f69a45..e73f3e4 100644
--- a/priv/templates/simplenode.template
+++ b/priv/templates/simplenode.template
@@ -1,7 +1,7 @@
 {variables, [{nodeid, "mynode"}]}.
 {template, "simplenode.reltool.config", "reltool.config"}.
-{file, "simplenode.erl.script", "overlay/erts-vsn/bin/erl"}.
-{file, "simplenode.nodetool", "overlay/erts-vsn/bin/nodetool"}.
-{file, "simplenode.runner", "overlay/bin/{{nodeid}}"}.
-{file, "simplenode.app.config", "overlay/etc/app.config"}.
-{template, "simplenode.vm.args", "overlay/etc/vm.args"}.
+{file, "simplenode.erl.script", "files/erl"}.
+{file, "simplenode.nodetool", "files/nodetool"}.
+{file, "simplenode.runner", "files/{{nodeid}}"}.
+{file, "simplenode.app.config", "files/app.config"}.
+{template, "simplenode.vm.args", "files/vm.args"}.