community: Update discourse to v2.8.4

[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..b70599f59f01b421c1205ce1746e7ff7c7ba4b55 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:
 
 # 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.4

 
 env:
   LC_ALL: en_US.UTF-8
 
 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_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: ''
 
   ## 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: /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
   - 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
 
 ## Plugins go here
 ## see https://meta.discourse.org/t/19157 for details


@@ -87,42 +88,24 @@ hooks:
     - exec:
         cd: $home/plugins
         cmd:
     - exec:
         cd: $home/plugins
         cmd:

-          - git clone --depth 1 https://github.com/discourse/docker_manager.git

           - git clone --depth 1 https://github.com/discourse/discourse-oauth2-basic.git
           - 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
           - git clone --depth 1 https://github.com/discourse/discourse-oauth2-basic.git
           - 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

+          - git clone --depth 1 https://github.com/discourse/discourse-prometheus.git
+          - git clone --depth 1 https://github.com/discourse/discourse-translator.git
+    - exec:
+        cd: $home
+        cmd:
+          - git fetch --depth=1 origin tag v2.8.4 --no-tags
+          - git checkout v2.8.4

   after_ssl:
   after_ssl:

-    - file:
-        path: "/etc/nginx/letsencrypt.conf"
-        contents: |
-          user www-data;
-          worker_processes auto;
-          daemon on;
-
-          events {
-            worker_connections 768;
-            # multi_accept on;
-          }
-
-          http {
-            sendfile on;
-            tcp_nopush on;
-            tcp_nodelay on;
-            keepalive_timeout 65;
-            types_hash_max_size 2048;
-
-            access_log /var/log/nginx/access.letsencrypt.log;
-            error_log /var/log/nginx/error.letsencrypt.log;
-
-            server {
-              listen 80;
-              listen [::]:80;
-
-              rewrite ^/\.well-known/acme-challenge/(.*)$ http://acme.openstreetmap.org/.well-known/acme-challenge/$1 permanent;
-
-            }
-          }
+    - replace:
+        filename: "/etc/nginx/conf.d/discourse.conf"
+        from: /listen 80;/
+        to: |
+          listen 80;
+          rewrite ^/\.well-known/acme-challenge/(.*)$ http://acme.openstreetmap.org/.well-known/acme-challenge/$1 permanent;

 
     - replace:
         filename: "/etc/nginx/conf.d/discourse.conf"
 
     - replace:
         filename: "/etc/nginx/conf.d/discourse.conf"