community: add workaround method to add custom feed

diff --git a/cookbooks/community/templates/default/web_only.yml.erb b/cookbooks/community/templates/default/web_only.yml.erb
index b87e8d3d593fe624c956dab8a9b4e04197a9e34f..564d8da5f600012637ac3abe4eabf61527a33e42 100644 (file)
--- a/cookbooks/community/templates/default/web_only.yml.erb
+++ b/cookbooks/community/templates/default/web_only.yml.erb
@@ -81,9 +81,9 @@ volumes:
   - volume:
       host: /etc/ssl/private/community.openstreetmap.org.key
       guest: /shared/ssl/ssl.key
   - volume:
       host: /etc/ssl/private/community.openstreetmap.org.key
       guest: /shared/ssl/ssl.key

-  # - volume:
-  #     host: /srv/community.openstreetmap.org/files/update-feeds.atom
-  #     guest: /var/www/discourse/public/update-feeds.atom
+  - volume:
+      host: /srv/community.openstreetmap.org/files/update-feeds.atom
+      guest: /shared/feeds/update-feeds.atom

 
 ## Plugins go here
 ## see https://meta.discourse.org/t/19157 for details
 
 ## Plugins go here
 ## see https://meta.discourse.org/t/19157 for details


@@ -98,6 +98,11 @@ hooks:
           - 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
           - sudo -H -E -u discourse git clone --depth 1 https://github.com/discourse/discourse-translator.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
           - sudo -H -E -u discourse git clone --depth 1 https://github.com/discourse/discourse-translator.git

+    - exec:
+        # Needs to be copied in else builtin git cleanup fails
+        cd: $home
+        cmd:
+          - sudo -H -E -u discourse cp /shared/feeds/update-feeds.atom public/update-feeds.atom

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