community: Add communities alias

[chef.git] / cookbooks / community / recipes / default.rb

diff --git a/cookbooks/community/recipes/default.rb b/cookbooks/community/recipes/default.rb
index b70a1412dbd3df233abb36aa2b935e42d526882a..467f67ba3e6020c02658303c098afe9c4ed14b24 100644 (file)
--- a/cookbooks/community/recipes/default.rb
+++ b/cookbooks/community/recipes/default.rb
@@ -25,11 +25,6 @@ include_recipe "geoipupdate"
 passwords = data_bag_item("community", "passwords")
 license_keys = data_bag_item("geoipupdate", "license-keys")
 
 passwords = data_bag_item("community", "passwords")
 license_keys = data_bag_item("geoipupdate", "license-keys")
 

-ssl_certificate "community.openstreetmap.org" do
-  domains ["community.openstreetmap.org", "community.osm.org"]
-  notifies :run, "execute[discourse_container_web_only_rebuild]"
-end
-

 directory "/srv/community.openstreetmap.org" do
   owner "root"
   group "root"
 directory "/srv/community.openstreetmap.org" do
   owner "root"
   group "root"


@@ -51,6 +46,7 @@ git "/srv/community.openstreetmap.org/docker" do
   group "root"
   notifies :run, "execute[discourse_container_data_rebuild]"
   notifies :run, "execute[discourse_container_web_only_rebuild]"
   group "root"
   notifies :run, "execute[discourse_container_data_rebuild]"
   notifies :run, "execute[discourse_container_web_only_rebuild]"

+  notifies :run, "execute[discourse_container_mail_receiver_rebuild]"

 end
 
 template "/srv/community.openstreetmap.org/docker/containers/data.yml" do
 end
 
 template "/srv/community.openstreetmap.org/docker/containers/data.yml" do


@@ -58,7 +54,7 @@ template "/srv/community.openstreetmap.org/docker/containers/data.yml" do
   owner "root"
   group "root"
   mode "644"
   owner "root"
   group "root"
   mode "644"

-  variables :license_keys => license_keys, :passwords => passwords
+  variables :passwords => passwords

   notifies :run, "execute[discourse_container_data_rebuild]"
 end
 
   notifies :run, "execute[discourse_container_data_rebuild]"
 end
 


@@ -71,6 +67,15 @@ template "/srv/community.openstreetmap.org/docker/containers/web_only.yml" do
   notifies :run, "execute[discourse_container_web_only_rebuild]"
 end
 
   notifies :run, "execute[discourse_container_web_only_rebuild]"
 end
 

+template "/srv/community.openstreetmap.org/docker/containers/mail-receiver.yml" do
+  source "mail-receiver.yml.erb"
+  owner "root"
+  group "root"
+  mode "644"
+  variables :passwords => passwords
+  notifies :run, "execute[discourse_container_mail_receiver_rebuild]"
+end
+

 execute "discourse_container_data_rebuild" do
   action :nothing
   command "./launcher rebuild data"
 execute "discourse_container_data_rebuild" do
   action :nothing
   command "./launcher rebuild data"


@@ -79,6 +84,11 @@ execute "discourse_container_data_rebuild" do
   group "root"
 end
 
   group "root"
 end
 

+ssl_certificate "community.openstreetmap.org" do
+  domains ["community.openstreetmap.org", "community.osm.org", "communities.openstreetmap.org", "communities.osm.org"]
+  notifies :run, "execute[discourse_container_web_only_rebuild]"
+end
+

 execute "discourse_container_web_only_rebuild" do
   action :nothing
   command "./launcher rebuild web_only"
 execute "discourse_container_web_only_rebuild" do
   action :nothing
   command "./launcher rebuild web_only"


@@ -87,8 +97,24 @@ execute "discourse_container_web_only_rebuild" do
   group "root"
 end
 
   group "root"
 end
 

-## FIXME
-# Backup the backups
-# Maybe use /srv/community.openstreetmap.org/shared/web-only/backups/
-# Or https://github.com/discourse/discourse_docker/blob/8b0ae9b4da2f48d62d7a88035018dba403918325/templates/postgres.template.yml#L240
-#    and tar of the shared web uploads
+execute "discourse_container_mail_receiver_rebuild" do
+  action :nothing
+  command "./launcher rebuild mail-receiver"
+  cwd "/srv/community.openstreetmap.org/docker/"
+  user "root"
+  group "root"
+end
+
+## FIXME https://github.com/discourse/discourse_docker/pull/611
+template "/etc/cron.daily/community-backup" do
+  source "backup.cron.erb"
+  owner "root"
+  group "root"
+  mode "750"
+end
+
+node.default[:prometheus][:exporters][443] = {
+  :name => "community",
+  :address => "#{node[:prometheus][:address]}:443",
+  :sni => "community.openstreetmap.org"
+}