From bdac95b2187f551dda053d547b842a655ba61a28 Mon Sep 17 00:00:00 2001
From: Josh Huckabee <joshhuckabee@gmail.com>
Date: Tue, 25 Jun 2013 07:44:49 -0700
Subject: [PATCH] Fix dev server TLS config.

Change-Id: I630b7381d72ce4538de489db69e6d8300afb65ce
---
 config/dev-server-config.json |  4 ++--
 config/dev-tls-config.json    | 14 --------------
 config/dev-tls.crt            | 12 ------------
 config/dev-tls.key            | 11 -----------
 4 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100644 config/dev-tls-config.json
 delete mode 100644 config/dev-tls.crt
 delete mode 100644 config/dev-tls.key

diff --git a/config/dev-server-config.json b/config/dev-server-config.json
index 9739ab850..88c16224f 100644
--- a/config/dev-server-config.json
+++ b/config/dev-server-config.json
@@ -3,8 +3,8 @@
   "baseURL": ["_env", "${CAMLI_BASEURL}"],
   "auth": ["_env", "${CAMLI_AUTH}"],
   "https": ["_env", "${CAMLI_TLS}", false],
-  "TLSCertFile": "config/selfgen_cert.pem",
-  "TLSKeyFile": "config/selfgen_key.pem",
+  "TLSCertFile": "config/selfgen_pem.crt",
+  "TLSKeyFile": "config/selfgen_pem.key",
   "prefixes": {
      "/": {
          "handler": "root",
diff --git a/config/dev-tls-config.json b/config/dev-tls-config.json
deleted file mode 100644
index 31e1f4759..000000000
--- a/config/dev-tls-config.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{ "_for-emacs": "-*- mode: js2;-*-",
-  "handlerConfig": true,
-  "baseURL": ["_env", "http://localhost:${CAMLI_PORT}"],
-  "password": ["_env", "${CAMLI_PASSWORD}"],
-  "prefixes": {
-    "/": {
-         "handler": "storage-filesystem",
-         "handlerArgs": {
-            "path": ["_env", "${CAMLI_ROOT}"]
-      }
-    }
-  }
-}
-
diff --git a/config/dev-tls.crt b/config/dev-tls.crt
deleted file mode 100644
index 8df293dcf..000000000
--- a/config/dev-tls.crt
+++ /dev/null
@@ -1,12 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBwTCCASugAwIBAgIBADALBgkqhkiG9w0BAQUwADAeFw0xMTAzMzEyMDI1MDda
-Fw00OTEyMzEyMzU5NTlaMAAwggCdMAsGCSqGSIb3DQEBAQOCAIwAMIIAhwKCAIB6
-oy4iT42G6qk+GGn5VL5JlnJT6ZG5cqaMNFaNGlIxNb6CPUZLKq2sM3gRaimsktIw
-nNAcNwQGHpe1tZo+J/Pl04JTt71Y/TTAxy7OX27aZf1Rpt0SjdZ7vTPnFDPNsHGe
-KBKvPt55l2+YKjkZmV7eRevsVbpkNvNGB+T5d4Ge/wIBA6NPME0wDgYDVR0PAQH/
-BAQDAgCgMA0GA1UdDgQGBAQBAgMEMA8GA1UdIwQIMAaABAECAwQwGwYDVR0RBBQw
-EoIJMTI3LjAuMC4xggVbOjoxXTALBgkqhkiG9w0BAQUDggCBAHC3gbdvc44vs+wD
-g2kONiENnx8WKc0UTGg/TOXS3gaRb+CUIQtHWja65l8rAfclEovjHgZ7gx8brO0W
-JuC6p3MUAKsgOssIrrRIx2rpnfcmFVMzguCmrMNVmKUAalw18Yp0F72xYAIitVQl
-kJrLdIhBajcJRYu/YGltHQRaXuVt
------END CERTIFICATE-----
diff --git a/config/dev-tls.key b/config/dev-tls.key
deleted file mode 100644
index 41e66058d..000000000
--- a/config/dev-tls.key
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIBkgIBAQKCAIB6oy4iT42G6qk+GGn5VL5JlnJT6ZG5cqaMNFaNGlIxNb6CPUZL
-Kq2sM3gRaimsktIwnNAcNwQGHpe1tZo+J/Pl04JTt71Y/TTAxy7OX27aZf1Rpt0S
-jdZ7vTPnFDPNsHGeKBKvPt55l2+YKjkZmV7eRevsVbpkNvNGB+T5d4Ge/wIBAwKC
-AIBRwh7Bil5Z8cYpZZv7jdQxDvbim7Z7ocRdeDmzZuF2I9RW04QyHHPIIlALnBvI
-YeF1veASz1gEFGUjzmbUGqKYSbCoTzXoev+F4bmbRxcX9sOmtslqvhMSHRSzA5NH
-aDVI3Hn4wvBVD8gePu8ACWqvPGbCiql11OKCMfjlPn2uuwJAx/24/F5DjXZ6hQQ7
-HxScOxKrpx5WnA9r1wZTltOTZkhRRzuLc21WJeE3M15QUdWi3zZxCKRFoth65HEs
-jy9YHQJAnPueRI44tz79b5QqVbeaOMUr7ZCb1Kp0uo6G+ANPLdlfliAupwij2eIz
-mHRJOWk0jBtXfRft1McH2H51CpXAyw==
------END RSA PRIVATE KEY-----