Merge pull request webmachine#68 from basho/skel-priv-dir

App skeleton priv dir
basho · May 1, 2012 · 8b2a7d5 · 8b2a7d5
2 parents 656aa69 + 53ee824
commit 8b2a7d5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 deps/*
 *.beam
+.eunit/*
diff --git a/priv/templates/src/wmskel_sup.erl b/priv/templates/src/wmskel_sup.erl
@@ -42,9 +42,9 @@ upgrade() ->
 %% @doc supervisor callback.
 init([]) ->
     Ip = case os:getenv("WEBMACHINE_IP") of false -> "0.0.0.0"; Any -> Any end,
-    {ok, Dispatch} = file:consult(filename:join(
-                         [filename:dirname(code:which(?MODULE)),
-                          "..", "priv", "dispatch.conf"])),
+    {ok, App} = application:get_application(?MODULE),
+    {ok, Dispatch} = file:consult(filename:join([code:priv_dir(App),
+                                                 "dispatch.conf"])),
     WebConfig = [
                  {ip, Ip},
                  {port, 8000},