]> git.openstreetmap.org Git - chef.git/blobdiff - cookbooks/community/templates/default/web_only.yml.erb
Revert "community: Add discourse-post-voting plugin"
[chef.git] / cookbooks / community / templates / default / web_only.yml.erb
index 0b7d0ecf6b9fb9bafa82948ce7f7909d17b25493..9db551e24a4584c4b3a23ea50eeba726827f879d 100644 (file)
@@ -1,5 +1,6 @@
 templates:
   - "templates/web.template.yml"
+  - "templates/web.ipv6.template.yml"
   - "templates/web.ssl.template.yml"
 
 ## which TCP/IP ports should this container expose?
@@ -18,7 +19,7 @@ links:
 # any extra arguments for Docker?
 # docker_args:
 
-# Latest Version v3.0.2
+# Latest Version v3.0.6
 params:
   version: stable
 
@@ -98,14 +99,13 @@ hooks:
     - exec:
         cd: $home/plugins
         cmd:
-          - sudo -H -E -u discourse git clone --depth 1 https://github.com/discourse/discourse-oauth2-basic.git
-          - sudo -H -E -u discourse git clone --depth 1 https://github.com/discourse/discourse-solved.git
-          - sudo -H -E -u discourse git clone --depth 1 https://github.com/discourse/discourse-canned-replies.git
-          - sudo -H -E -u discourse git clone --depth 1 https://github.com/discourse/discourse-reactions.git
-          - sudo -H -E -u discourse git clone --depth 1 https://github.com/discourse/discourse-prometheus.git
-          # FIXME revert to upstream once PR has been merged: https://github.com/discourse/discourse-translator/pull/103
-          - sudo -H -E -u discourse git clone --depth 1 --branch serbian-digraphic-fix https://github.com/Firefishy/discourse-translator.git
-          - sudo -H -E -u discourse git clone --depth 1 https://github.com/discourse/discourse-saved-searches.git
+          - sudo -H -E -u discourse git clone --depth 1 --branch main https://github.com/discourse/discourse-oauth2-basic.git
+          - sudo -H -E -u discourse git clone --depth 1 --branch main https://github.com/discourse/discourse-solved.git
+          - sudo -H -E -u discourse git clone --depth 1 --branch main https://github.com/discourse/discourse-canned-replies.git
+          - sudo -H -E -u discourse git clone --depth 1 --branch main https://github.com/discourse/discourse-reactions.git
+          - sudo -H -E -u discourse git clone --depth 1 --branch main https://github.com/discourse/discourse-prometheus.git
+          - sudo -H -E -u discourse git clone --depth 1 --branch main https://github.com/discourse/discourse-translator.git
+          - sudo -H -E -u discourse git clone --depth 1 --branch main https://github.com/discourse/discourse-saved-searches.git
     - exec:
         # Needs to be copied in else builtin git cleanup fails
         cd: $home
@@ -124,7 +124,7 @@ hooks:
         filename: "/etc/nginx/conf.d/discourse.conf"
         from: /add_header.+/
         to: |
-          add_header Strict-Transport-Security 'max-age=31536000; preload';
+          add_header Strict-Transport-Security 'max-age=63072000' always;
           ssl_stapling on;
           resolver <%= node[:networking][:nameservers].join(" ") %>;
           resolver_timeout 5s;