community: Fix tests and workaround ohai issue on ARM Mac

[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 401a18c5183d7538f2a9a2ca7c0c6eb273ad4a50..f3f58bb6e59c369bc156e6d854d9ef68e686a3fa 100644 (file)
--- a/cookbooks/community/templates/default/web_only.yml.erb
+++ b/cookbooks/community/templates/default/web_only.yml.erb
@@ -21,7 +21,7 @@ links:
 
 # Workaround bug: https://github.com/discourse/discourse_docker/pull/505
 # params:
 
 # Workaround bug: https://github.com/discourse/discourse_docker/pull/505
 # params:

-#  version: v2.8.1
+#  version: v2.8.13 - NOT USED HERE. UPDATE THE EXEC GIT ACTIONS BELOW WITH VERSION

 
 env:
   LC_ALL: en_US.UTF-8
 
 env:
   LC_ALL: en_US.UTF-8


@@ -32,10 +32,11 @@ env:
 
   ## How many concurrent web requests are supported? Depends on memory and CPU cores.
   ## will be set automatically by bootstrap based on detected CPUs, or you can override
 
   ## How many concurrent web requests are supported? Depends on memory and CPU cores.
   ## will be set automatically by bootstrap based on detected CPUs, or you can override

-  UNICORN_WORKERS: 8
+  UNICORN_WORKERS: <%= [2, node.dig('cpu', 'total').to_i, node.dig('cpu', 'cores').to_i].max %>

 
   ## TODO: The domain name this Discourse instance will respond to
   DISCOURSE_HOSTNAME: community.openstreetmap.org
 
   ## TODO: The domain name this Discourse instance will respond to
   DISCOURSE_HOSTNAME: community.openstreetmap.org

+  DISCOURSE_CDN_URL: https://community-cdn.openstreetmap.org

 
   ## Uncomment if you want the container to be started with the same
   ## hostname (-h option) as specified above (default "$hostname-$config")
 
   ## Uncomment if you want the container to be started with the same
   ## hostname (-h option) as specified above (default "$hostname-$config")


@@ -45,14 +46,11 @@ env:
   ## on initial signup example 'user1@example.com,user2@example.com'
   DISCOURSE_DEVELOPER_EMAILS: 'operations@openstreetmap.org'
 
   ## on initial signup example 'user1@example.com,user2@example.com'
   DISCOURSE_DEVELOPER_EMAILS: 'operations@openstreetmap.org'
 

-  ## TODO: The SMTP mail server used to validate new accounts and send notifications
-  # SMTP ADDRESS, username, and password are required
-  # WARNING the char '#' in SMTP password can cause problems!
-  DISCOURSE_SMTP_ADDRESS: mail.openstreetmap.org
-  DISCOURSE_SMTP_PORT: 26
+  DISCOURSE_SMTP_ADDRESS: <%= node[:exim][:smarthost_via].split(":", 2)[0] %>
+  DISCOURSE_SMTP_PORT: <%= node[:exim][:smarthost_via].split(":", 2)[1] || "25" %>
+  DISCOURSE_SMTP_OPENSSL_VERIFY_MODE: none

   DISCOURSE_SMTP_USER_NAME:
   DISCOURSE_SMTP_PASSWORD:
   DISCOURSE_SMTP_USER_NAME:
   DISCOURSE_SMTP_PASSWORD:

-  # DISCOURSE_SMTP_ENABLE_START_TLS: true           # (optional, default true)

   DISCOURSE_SMTP_DOMAIN: community.openstreetmap.org
   DISCOURSE_NOTIFICATION_EMAIL: community@noreply.openstreetmap.org
 
   DISCOURSE_SMTP_DOMAIN: community.openstreetmap.org
   DISCOURSE_NOTIFICATION_EMAIL: community@noreply.openstreetmap.org
 


@@ -65,7 +63,9 @@ env:
 
   ## The maxmind geolocation IP address key for IP address lookup
   ## see https://meta.discourse.org/t/-/137387/23 for details
 
   ## The maxmind geolocation IP address key for IP address lookup
   ## see https://meta.discourse.org/t/-/137387/23 for details

+<% if @license_keys -%>

   DISCOURSE_MAXMIND_LICENSE_KEY: '<%= @license_keys[node[:geoipupdate][:account]] %>'
   DISCOURSE_MAXMIND_LICENSE_KEY: '<%= @license_keys[node[:geoipupdate][:account]] %>'

+<% end -%>

 
 volumes:
   - volume:
 
 volumes:
   - volume:


@@ -76,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


@@ -88,47 +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:
     - exec:
         cd: $home
         cmd:

-          - git fetch --depth=1 origin tag v2.8.1 --no-tags
-          - git checkout v2.8.1
+          - git fetch --depth=1 origin tag v2.8.13 --no-tags
+          - git checkout v2.8.13

   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"