Merge remote-tracking branch 'refs/remotes/map/releasemanagement3' into master-origin

3 files changed, 9 insertions, 14 deletions

diff --git a/Makefile b/Makefile
index a9f4683..5a13905 100644
--- a/Makefile
+++ b/Makefile
@@ -10,5 +10,6 @@ release:
 		ln -s ../../plop/Mnesia.nonode@nohost .; \
 		ln -s ../../plop/test .)
 	cp httpd_props.conf rel
+	cp catlfish.config rel
 	mkdir rel/catlfish
 	cp -r webroot rel/catlfish
diff --git a/README.md b/README.md
index 13cb679..7b6f625 100644
--- a/README.md
+++ b/README.md
@@ -4,29 +4,25 @@ catlfish is a Certificate Transparency log server (RFC 6962).
 
 # Compile
 
-    $ erl -make
+    $ CTROOT=.. make
+    $ make release
 
 # Requirements
 
-A running plop application, which in turn requires mnesia to be
-running.
+A compiled plop application in ../plop
 
-jiffie for JSON encoding and decoding.
+A compiled https://github.com/davisp/jiffy (for JSON encoding and decoding) in ../jiffy
 
 # Start
 
-NOTE: Kludge ahead! catlfish will turn into a proper OTP application
-at some point in the future.
+Make sure plop has a database. See `plop/README`. Then run catlfish:
 
-Make sure mnesia and plop are running and that plop has been
-installed, i.e. has a database. See `plop/README`. You might also want
-to `code:add_pathz("path/to/plop/ebin")`.
-
-    1> inets:start(httpd, [{proplist_file, "httpd_props.conf"}]).
+    $ (cd rel ; bin/erl -config catlfish)
 
 # Logs and traces
 
-As configured in httpd_props.conf, logs can be found in webroot/log/.
+As configured in httpd_props.conf, logs can be found in
+catlfish/webroot/log in the rel directory.
 
 To enable a crazy amount of tracing information from inets, do
 
diff --git a/src/catlfish_app.erl b/src/catlfish_app.erl
index 9c9bdad..7e26243 100644
--- a/src/catlfish_app.erl
+++ b/src/catlfish_app.erl
@@ -18,8 +18,6 @@ dummy() ->
 
 start(_StartType, _StartArgs) ->
     io:format("starting catlfish~n", []),
-    InetsResult = inets:start(httpd, [{proplist_file, "httpd_props.conf"}]),
-    io:format("catlfish: tried to start inets service: ~p~n", [InetsResult]),
     Pid = spawn(fun () ->
                         dummy()
                 end),