From 00156d1b7740c4177fc29bd10d75ea4e0e59cc6e Mon Sep 17 00:00:00 2001 From: Magnus Ahltorp Date: Fri, 24 Oct 2014 04:37:18 +0200 Subject: Use mochiweb for v1 API Conflicts: catlfish.config src/v1.erl --- catlfish.config | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'catlfish.config') diff --git a/catlfish.config b/catlfish.config index c8fcb73..75d00fa 100644 --- a/catlfish.config +++ b/catlfish.config @@ -7,11 +7,15 @@ {error_logger_mf_dir, "log"}, {error_logger_mf_maxbytes, 10485760}, % 10 MB {error_logger_mf_maxfiles, 10}]}, - {inets, - [{services, - [{httpd, [{proplist_file, "httpd_props.conf"}]}]}]}, {catlfish, - [{known_roots_path, "known_roots"}]}, + [{known_roots_path, "known_roots"}, + {https_servers, + [{"127.0.0.1", 8080, v1} + ]}, + {https_certfile, "catlfish/webroot/certs/webcert.pem"}, + {https_keyfile, "catlfish/webroot/keys/webkey.pem"}, + {https_cacertfile, "catlfish/webroot/certs/webcert.pem"} + ]}, {plop, [{entry_root_path, "db/certentries/"}, {index_path, "db/index"}, -- cgit v1.1