community: fix certificate paths

[chef.git] / cookbooks / community / templates / default / web_only.yml.erb

diff --git a/cookbooks/community/templates/default/web_only.yml.erb b/cookbooks/community/templates/default/web_only.yml.erb
index a3f47dbbef353c9fe6614c631851252c0e4e2527..ca1b7a8f5daa916eb5d813801a632e3a9d543155 100644 (file)
--- a/cookbooks/community/templates/default/web_only.yml.erb
+++ b/cookbooks/community/templates/default/web_only.yml.erb
@@ -19,8 +19,9 @@ links:
 # any extra arguments for Docker?
 # docker_args:
 
-params:
-  version: v2.8.1
+# Workaround bug: https://github.com/discourse/discourse_docker/pull/505
+# params:
+#  version: v2.8.1
 
 env:
   LC_ALL: en_US.UTF-8
@@ -53,7 +54,7 @@ env:
   DISCOURSE_SMTP_PASSWORD:
   # DISCOURSE_SMTP_ENABLE_START_TLS: true           # (optional, default true)
   DISCOURSE_SMTP_DOMAIN: community.openstreetmap.org
-  DISCOURSE_NOTIFICATION_EMAIL: noreply@community.openstreetmap.org
+  DISCOURSE_NOTIFICATION_EMAIL: community@noreply.openstreetmap.org
 
   ## TODO: configure connectivity to the databases
   DISCOURSE_DB_SOCKET: ''
@@ -75,10 +76,10 @@ volumes:
       guest: /var/log
   - volume:
       host: /etc/ssl/certs/community.openstreetmap.org.pem
-      guest: /shared/ssl/ssl.crt;
+      guest: /shared/ssl/ssl.crt
   - volume:
       host: /etc/ssl/private/community.openstreetmap.org.key
-      guest: /shared/ssl/ssl.key;;
+      guest: /shared/ssl/ssl.key
 
 ## Plugins go here
 ## see https://meta.discourse.org/t/19157 for details
@@ -92,6 +93,11 @@ hooks:
           - git clone --depth 1 https://github.com/discourse/discourse-solved.git
           - git clone --depth 1 https://github.com/discourse/discourse-canned-replies.git
           - git clone --depth 1 https://github.com/discourse/discourse-reactions.git
+    - exec:
+        cd: $home
+        cmd:
+          - git fetch --depth=1 origin tag v2.8.1 --no-tags
+          - git checkout v2.8.1
   after_ssl:
     - file:
         path: "/etc/nginx/letsencrypt.conf"