Change ctls -> catlfish.

9 files changed, 31 insertions, 29 deletions

diff --git a/README.md b/README.md
index e9fe990..13cb679 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# ctls
+# catlfish
 
-ctls is a Certificate Transparency log server (RFC 6962).
+catlfish is a Certificate Transparency log server (RFC 6962).
 
 # Compile
 
@@ -15,8 +15,8 @@ jiffie for JSON encoding and decoding.
 
 # Start
 
-NOTE: Kludge ahead! ctls will turn into a proper OTP application at
-some point in the future.
+NOTE: Kludge ahead! catlfish will turn into a proper OTP application
+at some point in the future.
 
 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
@@ -34,4 +34,5 @@ To enable a crazy amount of tracing information from inets, do
 
 # To do
 
-- Stop using inets httpd mod_esi and make ctls a proper application.
+- Stop using inets httpd mod_esi and make catlfish a proper
+  application.
diff --git a/ctls.config b/catlfish.config
index c453492..cda8789 100644
--- a/ctls.config
+++ b/catlfish.config
@@ -1,6 +1,6 @@
-%% ctls configuration file (-*- erlang -*-)
+%% catlfish configuration file (-*- erlang -*-)
 %% Start like this:
-%% $ erl -boot start_sasl -config ctls -run inets
+%% $ erl -boot start_sasl -config catlfish -run inets
 [{sasl,
   [{sasl_error_logger, false},
    {errlog_type, error},
diff --git a/doc/design.txt b/doc/design.txt
index 4f7ad85..472a270 100644
--- a/doc/design.txt
+++ b/doc/design.txt
@@ -1,6 +1,6 @@
-ctls design (in Emacs -*- org -*- mode)
+catlfish design (in Emacs -*- org -*- mode)
 
-This document describes the design of ctls, an implementation of a
+This document describes the design of catlfish, an implementation of a
 Certificate Transparency (RFC6962) log server.
 
 We have
diff --git a/ebin/catlfish.app b/ebin/catlfish.app
new file mode 100644
index 0000000..33d7050
--- /dev/null
+++ b/ebin/catlfish.app
@@ -0,0 +1,10 @@
+%% Application resource file for catlfish (in -*- erlang -*- mode).
+%% Point out the proper configuration file (-config catlfish) when
+%% starting beam.
+{application, catlfish,
+ [{description, "catlfish -- Certificate Transparency Log Server"},
+  {vsn, "0.0.1"},
+  {modules, [v1]},
+  {applications, [kernel, stdlib, plop, inets]}]}.
+%%  {registered, [catlfish]}]}.
+%%  {mod, {catlfish, ["test/eckey.pem", "test/eckey-public.pem"]}}]}.
diff --git a/ebin/ctls.app b/ebin/ctls.app
deleted file mode 100644
index eeaaf11..0000000
--- a/ebin/ctls.app
+++ /dev/null
@@ -1,9 +0,0 @@
-%% Application resource file for ctls (in -*- erlang -*- mode).
-%% Point out the proper configuration file (-config ctls) when starting beam.
-{application, ctls,
- [{description, "ctls -- Certificate Transparency Log Server"},
-  {vsn, "0.0.1"},
-  {modules, [v1]},
-  {applications, [kernel, stdlib, plop, inets]}]}.
-%%  {registered, [ctls]}]}.
-%%  {mod, {ctls, ["test/eckey.pem", "test/eckey-public.pem"]}}]}.
diff --git a/httpd_props.conf b/httpd_props.conf
index 09b9338..967c082 100644
--- a/httpd_props.conf
+++ b/httpd_props.conf
@@ -2,8 +2,8 @@
  {port, 8080},
  {bind_address, {127, 0, 0, 1}},
  {server_name, "flimsy"},
- {server_root, "ctls/webroot"},
- {document_root, "ctls/webroot/docroot"},
+ {server_root, "catlfish/webroot"},
+ {document_root, "catlfish/webroot/docroot"},
  {modules, [mod_alias, mod_auth, mod_esi, mod_get, mod_head,
             mod_log, mod_disk_log]},
  %%{re_write, {"^/ct/v1/(.*)$", "/ct/v1/https_server/\\1"}},
@@ -15,7 +15,7 @@
  {transfer_log, "log/transfer"},
  {socket_type,
   {essl,                              % See ssl(3erl) for SSL options.
-   [{certfile, "ctls/webroot/certs/webcert.pem"},
-    {keyfile, "ctls/webroot/keys/webkey.pem"},
-    {cacertfile, "ctls/webroot/certs/webcert.pem"}]}}
+   [{certfile, "catlfish/webroot/certs/webcert.pem"},
+    {keyfile, "catlfish/webroot/keys/webkey.pem"},
+    {cacertfile, "catlfish/webroot/certs/webcert.pem"}]}}
 ].
diff --git a/src/ctls.erl b/src/catlfish.erl
index 9c4c9b4..015d8b4 100644
--- a/src/ctls.erl
+++ b/src/catlfish.erl
@@ -4,9 +4,9 @@
 %% of subdirectories need to be added to the Erlang path
 %% (code:add_pathz/1). This can be done in an ~/.erlang file.
 
--module('ctls').
+-module('catlfish').
 -export([start/0]).
 
 start() ->
-    io:format("Starting ctls~n"),
+    io:format("Starting catlfish~n"),
     https_server:start().
diff --git a/src/https_server.erl b/src/https_server.erl
index ccbc2e7..47b4465 100644
--- a/src/https_server.erl
+++ b/src/https_server.erl
@@ -9,7 +9,7 @@ start() ->
     end,
     %% TODO: put this in httpd_props.conf and use that at erlang
     %% start. inets:start(httpd, {proplist_file, "httpd_props.conf"}).
-    ServerRoot = "/home/linus/usr/src/ct/ctls/webroot",
+    ServerRoot = "/home/linus/usr/src/ct/catlfish/webroot",
     {ok, Pid} =
         inets:start(httpd, 
                     [{port, 8080},
diff --git a/test/ctls_test.erl b/test/catlfish_test.erl
index bd477de..5782984 100644
--- a/test/ctls_test.erl
+++ b/test/catlfish_test.erl
@@ -1,8 +1,8 @@
--module(ctls_test).
+-module(catlfish_test).
 -include_lib("eunit/include/eunit.hrl").
 
-%% Requires that ctls is running (or, at the moment, that v1 has been
-%% installed as an mod_esi module -- use https_server:start()).
+%% Requires that catlfish is running (or, at the moment, that v1 has
+%% been installed as an mod_esi module -- use https_server:start()).
 
 -define(URL, "https://flimsytest:8080/ct/v1/add_chain").