From 22fd403eeb314f2f04ad709af6d447c397062c1a Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Mon, 8 Sep 2014 18:25:08 +0200
Subject: [PATCH] cherokee: enable SSL/HTTPS support

https://jira.digi.com/browse/DEL-1214

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 .../cherokee/cherokee_1.2.98.bbappend         |  4 +-
 .../cherokee/files/cherokee.conf              |  6 +++
 .../cherokee/files/cherokee.pem               | 45 +++++++++++++++++++
 3 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 meta-digi-dey/recipes-connectivity/cherokee/files/cherokee.pem

diff --git a/meta-digi-dey/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend b/meta-digi-dey/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend
index d1e0efdc5..d2eeb111e 100644
--- a/meta-digi-dey/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend
+++ b/meta-digi-dey/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend
@@ -4,13 +4,15 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
 SRC_URI += " \
 	file://cherokee.conf \
+	file://cherokee.pem \
 	file://digi.gif \
 	file://index.html \
 	"
 
 do_install_append() {
+	install -d ${D}${sysconfdir}/cherokee/ssl ${D}/srv/www
 	install -m 0644 ${WORKDIR}/cherokee.conf ${D}${sysconfdir}/cherokee/
-	install -d ${D}/srv/www
+	install -m 0644 ${WORKDIR}/cherokee.pem ${D}${sysconfdir}/cherokee/ssl/
 	install -m 0644 ${WORKDIR}/index.html ${D}/srv/www/
 	install -m 0644 ${WORKDIR}/digi.gif ${D}/srv/www/
 }
diff --git a/meta-digi-dey/recipes-connectivity/cherokee/files/cherokee.conf b/meta-digi-dey/recipes-connectivity/cherokee/files/cherokee.conf
index 36046a1c2..5b9b12c7d 100644
--- a/meta-digi-dey/recipes-connectivity/cherokee/files/cherokee.conf
+++ b/meta-digi-dey/recipes-connectivity/cherokee/files/cherokee.conf
@@ -1,12 +1,16 @@
 config!version = 001002098
 server!bind!1!port = 80
+server!bind!2!port = 443
+server!bind!2!tls = 1
 server!iocache = 0
+server!ipv6 = 1
 server!keepalive = 1
 server!keepalive_max_requests = 500
 server!panic_action = /usr/bin/cherokee-panic
 server!pid_file = /var/run/cherokee.pid
 server!server_tokens = full
 server!timeout = 15
+server!tls = libssl
 vserver!1!directory_index = index.html
 vserver!1!document_root = /srv/www
 vserver!1!error_writer!filename = /var/log/cherokee.error
@@ -36,6 +40,8 @@ vserver!1!rule!2!match!directory = /icons
 vserver!1!rule!1!handler = common
 vserver!1!rule!1!handler!iocache = 1
 vserver!1!rule!1!match = default
+vserver!1!ssl_certificate_file = /etc/cherokee/ssl/cherokee.pem
+vserver!1!ssl_certificate_key_file = /etc/cherokee/ssl/cherokee.pem
 icons!default = page_white.png
 icons!directory = folder.png
 icons!file!bomb.png = core
diff --git a/meta-digi-dey/recipes-connectivity/cherokee/files/cherokee.pem b/meta-digi-dey/recipes-connectivity/cherokee/files/cherokee.pem
new file mode 100644
index 000000000..597efca01
--- /dev/null
+++ b/meta-digi-dey/recipes-connectivity/cherokee/files/cherokee.pem
@@ -0,0 +1,45 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAzsN/A17YfOq9zDIs3OaVbQozI1UoXtCBmSncrnQ1XtwhhVJR
+TTrOdEtpZOuF9kxCpEF+3hOLiWuEfZJ7PLfBLNUveRpl6N7T6daLPe74QVxeCSO+
+AkqHt4ayTWyUyq/UaFM/Wh9TwRUnCg0MkfMdXpIhZar79wexlcCWWh5kteh38vwe
+NFgYqe5bIyBU3sBRJ3Qzr17gsy9WF1AsUVIqIDRhziI4WcgZBam00rYtW5qAxZkG
+qYxotLfDecitL/HpxunCu/dQQ5HFvlc8mL6+4TeKsz8OGYmA0FfPLAcBMxhSDMq9
+gVRwxooguIWjpPvTJ9xTs5NdS2It+3IVCR0OsQIDAQABAoIBAFGW2Vb2JU1dwBmE
+rylYIBzQCo/lubF4a7uJxlhc6PaOvPeEHSrxiqhfXa6CNfGT9DQm2C4/3i8S60w1
+8kVqaWMMmNgb75zt2QeMLpP46aO5FC5dGUyEJnvoPhHJSAmXSqUEPJqOhBlMBIS1
+04EAQ1WfKmiZCSZYtd3XCj1zguA4rw5z/AIi5QtAOCtzPkdK4s9slVzIchApIdbJ
+KzGpQpOS56YbjiZA5z5mUFWEiDD2e2jtcQ3UlfX3K8yTjz+5CXozcDDYLlesOeYb
+Qi69GytUpiz3AnnxjGPj2J3vbs+y6qRlmgkYUaWNbz0qUc4W4XfVnU/4XO2g7gci
+JajFEPUCgYEA6M6vVlHDxD5bIC3bgrWlULxo+aHdISEkcXM1X7eo4wl2f6kQ97Tl
+FBJAMVbMuMYCpEsYADOnok/kSj6Nf/wqfp+zjlTkWOqjBxrcmXC9lpz+Gqrf1X/v
+bkpsfuxO15nWDVf32S0hmn1+wl4HMQVtIkR0/Z7qBWZSpAGLm6Y+zZ8CgYEA41yd
+iGvAelUNV1UEvKyc8h7tC+3pL28WRGVGccckm6DrDPfTm8HPthJuKzc0Kqc09z3Y
+DFZ/Ukg58PQLGTaWZXf/ueientnh2bWSsHDb3k5h8xSa+jn07DqqARaRhN3pYZa3
+4gkKkfaTDCA2aZddMzFRhvJYOK7dWqNe6IszIa8CgYEAhbdBCilIcg0GtgLg08CV
+RTwSZ19K7V5l2iu7+lA41r52q3hl4ICsGs0oxa3/RBmnJspi7Kq+nAGbM/GdwGcL
+2VLNBPFJfrC2Fryc/By/KCTf5l1C1xP2Z7ijfHsqBbe8NEnUd47ugBeYmPb81nEx
+b782Gv4NmDBfQwgIMcxYwi0CgYBZOme4ulD3sZlixMLvKO8PNoPhQqVZMEeU4Aod
+bQI48ZZNqJUrc4yI8AK8gxW+B5EJ1wOLFAczy5Sxs5UHeBzeBZIe6+QUg33XayL+
+i8w+GpTmSRfpTAWLEBrYAntpoY2N9xCDbPjw/8wF3j58giLZjGlqhIGK/VVx1NvS
+d47BkQKBgHY5uNQuVCMIYQxD0+GTzK82qUHegjYq8ZUqSfHgdfN3IjYU4NUPQdR8
+is9TMrq83r7Eu1YTYfHIwhbyjJ8UBOzinwOQROeO9DiLSnWamJTKWCeFOW4TV1On
+vz7GBu8M8S7o34PdzrIZ4YkvAVM2KkqVthiO9QxP1COqkrY0Mklz
+-----END RSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIC1jCCAb4CAQEwDQYJKoZIhvcNAQELBQAwMTELMAkGA1UEBhMCVVMxIjAgBgNV
+BAMMGUNoZXJva2VlIFRlc3QgQ2VydGlmaWNhdGUwHhcNMTQwOTA4MTQ0MDI5WhcN
+MTkwNzI0MTQ0MDI5WjAxMQswCQYDVQQGEwJVUzEiMCAGA1UEAwwZQ2hlcm9rZWUg
+VGVzdCBDZXJ0aWZpY2F0ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AM7DfwNe2HzqvcwyLNzmlW0KMyNVKF7QgZkp3K50NV7cIYVSUU06znRLaWTrhfZM
+QqRBft4Ti4lrhH2Sezy3wSzVL3kaZeje0+nWiz3u+EFcXgkjvgJKh7eGsk1slMqv
+1GhTP1ofU8EVJwoNDJHzHV6SIWWq+/cHsZXAlloeZLXod/L8HjRYGKnuWyMgVN7A
+USd0M69e4LMvVhdQLFFSKiA0Yc4iOFnIGQWptNK2LVuagMWZBqmMaLS3w3nIrS/x
+6cbpwrv3UEORxb5XPJi+vuE3irM/DhmJgNBXzywHATMYUgzKvYFUcMaKILiFo6T7
+0yfcU7OTXUtiLftyFQkdDrECAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAM6Fqym0q
+WUTkZdS0PvuOfI6HX2SHtPSlnJbDQTFnfteUnq54qG5RM7orBE4kyk9NMO90m4Vm
+9Iw7wEuUTButcz+OlU1clBdwxbIjT+BG7/XJ4chTVmF3pvRXdOi0xluckSqjm3Tn
+/W2qQUIchU0MzoqrbzWcHyOV9ibkk1tLrxrZnkxs9pOqOtjVc798R3k5Ebk/2Z+L
+jp+fi/3QXdpzTgd/nSLwSvArb19+fNcvbBH8F+Nr7ZehLwYBuaoLww45shDytHQM
+ViRWztYJ/bdA2SgaGoqeoZy5jkQHQWRa8yruoySHFfqUcKxWqK2LD5ESPRXeTM4O
+FKRcM1HjbZu/IQ==
+-----END CERTIFICATE-----