Merge branch 'master' of /home/linus/repo/ctls

Conflicts:
	src/v1.erl

2 files changed, 4 insertions, 4 deletions

diff --git a/README b/README
index e55f165..5e96842 100644
--- a/README
+++ b/README
@@ -20,8 +20,8 @@ Start
   installed, i.e. has a database. See plop/README. Also, you might
   want to code:add_pathz("path/to/plop/ebin").
 
-  1> inets:start(), https_server:start().
+  1> inets:start(httpd, [{proplist_file, "httpd_props.conf"}]).
 
 To do
 
-  Make it a proper application.
+  Stop using inets httpd mod_ets and make it a proper application.
diff --git a/src/v1.erl b/src/v1.erl
index c7624db..57458bb 100644
--- a/src/v1.erl
+++ b/src/v1.erl
@@ -3,7 +3,7 @@
  get_sth_consistency/3, get_proof_by_hash/3, get_entries/3,
  get_roots/3, get_entry_and_proof/3]).
 -export([hello/3]).
--include("/home/linus/usr/src/ct/plop/include/plop.hrl").
+-include("$CTROOT/plop/include/plop.hrl").
 -define(PROTOCOL_VERSION, 1).
 
 %% Public functions.
@@ -36,7 +36,7 @@ get_sth(SessionID, _Env, _Input) ->
     R = [{tree_size, Treesize},
          {timestamp, Timestamp},
          {sha256_root_hash, base64:encode(Roothash)},
-         {tree_head_signature, base64:encode(Signature)}],
+         {tree_head_signature, Signature}],
     deliver(SessionID, jiffy:encode({R})).
 
 get_sth_consistency(SessionID, _Env, _Input) ->