Merge ~pwlars/revcache/+git/revcache-charm:juju1-support into ~canonical-hw-cert/revcache/+git/revcache-charm:master

[Paul Larson]

I think this finally does what I want. I've tested it locally with some fake keys, and confirmed that it puts the files in the right location and uses the correct vhost template with ssl support for nginx *only* when specifying the certificates and ssl key in either the config or in an artifact. This allows us to support both juju1 and juju2 in the same charm!

[Paul Larson (pwlars)]

Wrong target, that should look a little more sane now :)

review: Needs Resubmitting

[Paul Larson (pwlars)]

I've tried this locally, but would like to try deploying it in the production environment. It's not actually going to affect any production runs right now, so self-approving since it won't break anything (yet) :)

review: Approve

diff --git a/config.yaml b/config.yaml
index ad24364..1e4601f 100644
--- a/config.yaml
+++ b/config.yaml
@@ -7,3 +7,15 @@ options:
     type: string
     description: git branch for revcache
     default: "start"
+  config-ssl-certificate:
+    type: string
+    description: base64 encoded ssl certificate file
+    default: ""
+  config-ssl-chain:
+    type: string
+    description: base64 encoded ssl chain file
+    default: ""
+  config-ssl-key:
+    type: string
+    description: base64 encoded ssl key file
+    default: ""
diff --git a/playbooks/revcache.yaml b/playbooks/revcache.yaml
index c540ff3..3ec76fe 100644
--- a/playbooks/revcache.yaml
+++ b/playbooks/revcache.yaml
@@ -85,6 +85,25 @@
       tags:
         - install
 
+    - name: Get SSL Certificate File (from config for juju1)
+      shell: echo -n "{{ config_ssl_certificate | b64decode }}" > /etc/ssl/certs/revcache.crt
+      when: config_ssl_certificate != ""
+      tags:
+        - config-changed
+
+    - name: Get SSL Chain File (from config for juju1)
+      shell: echo -n "{{ config_ssl_chain | b64decode }}" >> /etc/ssl/certs/revcache.crt
+      when: config_ssl_chain != ""
+      tags:
+        - config-changed
+
+    - name: Get SSL Key File (from config for juju1)
+      shell: echo -n "{{ config_ssl_key | b64decode }}" >> /etc/ssl/private/revcache.key
+      when: config_ssl_key != ""
+      tags:
+        - config-changed
+
+
     - name: Get SSL Certificate File
       shell: resource-get ssl_certificate || echo -n ""
       register: ssl_certificate
@@ -118,8 +137,8 @@
         - config-changed
 
     - name: Copy nginx site config file
-      when: ssl_key.stdout == "" and 
-            ssl_certificate.stdout == ""
+      when: (ssl_key.stdout == "" and ssl_certificate.stdout == "") and
+            ("{{ config_ssl_key }}" == "" and "{{ config_ssl_certificate }}" == "")
       copy:
         src: "{{ charm_dir }}/templates/revcache-vhost.conf"
         dest: "/etc/nginx/sites-enabled/revcache"
@@ -127,8 +146,8 @@
         - config-changed
 
     - name: Copy nginx site config file
-      when: ssl_key.stdout != "" and 
-            ssl_certificate.stdout != ""
+      when: (ssl_key.stdout != "" and ssl_certificate.stdout != "") or
+            ("{{ config_ssl_key }}" != "" and "{{ config_ssl_certificate }}" != "")
       copy:
         src: "{{ charm_dir }}/templates/revcache-vhost-https.conf"
         dest: "/etc/nginx/sites-enabled/revcache"