diff options
| author | Linus Nordberg <linus@nordberg.se> | 2014-06-04 16:13:24 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@nordberg.se> | 2014-06-04 16:13:24 +0200 |
| commit | a59474f202b8115a8bff58101b1b9847551764ce (patch) | |
| tree | 76bf9726418f5e7d19c77108ec9692a1cff2f24d | |
| parent | 30ed55ac2dc3355c397a67e770382eb51d66a43e (diff) | |
| parent | 6f3ddccfbb6faa5eb134646216f4094a268f72a5 (diff) | |
Merge remote-tracking branch 'remotes/devp/master'
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | httpd_props.conf | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..2efdd34 --- /dev/null +++ b/Makefile @@ -0,0 +1,4 @@ +build all: + erl -make +clean: + -rm ebin/*.beam diff --git a/httpd_props.conf b/httpd_props.conf index aa1daf0..09b9338 100644 --- a/httpd_props.conf +++ b/httpd_props.conf @@ -16,5 +16,6 @@ {socket_type, {essl, % See ssl(3erl) for SSL options. [{certfile, "ctls/webroot/certs/webcert.pem"}, - {keyfile, "ctls/webroot/keys/webkey.pem"}]}} + {keyfile, "ctls/webroot/keys/webkey.pem"}, + {cacertfile, "ctls/webroot/certs/webcert.pem"}]}} ]. |