Merge pull request #10 from fancycade/master

Mostly config updates
novaframework · Aug 6, 2021 · d19c6c7 · d19c6c7
2 parents c790bd3 + 7f7bb53
commit d19c6c7
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 17 deletions.
diff --git a/priv/templates/nova.template b/priv/templates/nova.template
@@ -5,18 +5,19 @@
 
 {dir, "{{name}}"}.
 {dir, "{{name}}/priv"}.
+{dir, "{{name}}/priv/assets"}.
 {dir, "{{name}}/config"}.
 {dir, "{{name}}/src/controllers"}.
 {dir, "{{name}}/src/views"}.
 
-{template, "nova/dev_sys.config", "{{name}}/config/dev_sys.config"}.
-{template, "nova/prod_sys.config", "{{name}}/config/prod_sys.config"}.
+{template, "nova/dev_sys.config.src", "{{name}}/config/dev_sys.config.src"}.
+{template, "nova/prod_sys.config.src", "{{name}}/config/prod_sys.config.src"}.
 {template, "nova/routes.erl", "{{name}}/priv/{{name}}.routes.erl"}.
 {template, "nova/app.src", "{{name}}/src/{{name}}.app.src"}.
 {template, "nova/app.erl", "{{name}}/src/{{name}}_app.erl"}.
 {template, "nova/sup.erl", "{{name}}/src/{{name}}_sup.erl"}.
 {template, "nova/controller.erl", "{{name}}/src/controllers/{{name}}_main_controller.erl"}.
 {template, "nova/rebar.config", "{{name}}/rebar.config"}.
-{template, "nova/vm.args", "{{name}}/config/vm.args"}.
+{template, "nova/vm.args.src", "{{name}}/config/vm.args.src"}.
 
 {file, "nova/controller.dtl", "{{name}}/src/views/{{name}}_main.dtl"}.
diff --git a/priv/templates/nova/dev_sys.config → priv/templates/nova/dev_sys.config.src b/priv/templates/nova/dev_sys.config → priv/templates/nova/dev_sys.config.src
diff --git a/priv/templates/nova/prod_sys.config → priv/templates/nova/prod_sys.config.src b/priv/templates/nova/prod_sys.config → priv/templates/nova/prod_sys.config.src
diff --git a/priv/templates/nova/rebar.config b/priv/templates/nova/rebar.config
@@ -2,7 +2,7 @@
 
 {erl_opts, [debug_info]}.
 {src_dirs, ["src", "src/controllers"]}.
-{shell, [{config, "./config/dev_sys.config"}]}.
+{shell, [{config, "./config/dev_sys.config.src"}]}.
 
 {erlydtl_opts, [{doc_root, "src/views"},
                 {recursive, true},
@@ -19,21 +19,18 @@
 
 %% Release profiles
 %% To create a release just run
-%% rebar3 release -n {{name}}-prod
-{relx, [{release, {"{{name}}-dev", "0.1.0"},
-         [{{name}}],
-         [{dev_mode, true},
-          {include_erts, false},
-          {sys_config, "./config/dev_sys.config"},
-          {extended_start_script, true}]},
-        {release, {"{{name}}-prod", "0.1.0"},
-         [{{name}}],
-         [{dev_mode, false},
-          {include_erts, true},
-          {sys_config, "./config/prod_sys.config"},
-          {extended_start_script, true}]}
+%% rebar3 as prod release
+{relx, [{release, {{{name}}, "0.1.0"},
+         [{{name}},
+          sasl]},
+        {mode, dev},
+        {sys_config_src, "./config/dev_sys.config.src"},
+        {vm_args_src, "./config/vm.args.src"}
        ]}.
 
+{profiles, [{prod, [{relx,
+                     [{mode, prod},
+                      {sys_config_src, "./config/prod_sys.config.src"}]}]}]}.
 
 %% Plugins for rebar3
 {plugins, [

diff --git a/priv/templates/nova/vm.args → priv/templates/nova/vm.args.src b/priv/templates/nova/vm.args → priv/templates/nova/vm.args.src