X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1297de4eac0f30da215b909e653515be4e02b14b..083dea407581aea5e3bada02a5cd32f83632eb88:/cookbooks/community/recipes/default.rb

diff --git a/cookbooks/community/recipes/default.rb b/cookbooks/community/recipes/default.rb
index f3888c61a..1bedda290 100644
--- a/cookbooks/community/recipes/default.rb
+++ b/cookbooks/community/recipes/default.rb
@@ -45,71 +45,96 @@ end
 git "/srv/community.openstreetmap.org/docker" do
   action :sync
   repository "https://github.com/discourse/discourse_docker.git"
-  revision "main"
+  revision "e6cb71cd55cfad1c64b0a4b40676cbcaedbc918f"
   depth 1
   user "root"
   group "root"
-  notifies :run, "execute[discourse_container_data_rebuild]"
-  notifies :run, "execute[discourse_container_web_only_bootstrap]"
-  notifies :run, "execute[discourse_container_mail_receiver_rebuild]"
+  notifies :run, "notify_group[discourse_container_new_data]"
+  notifies :run, "notify_group[discourse_container_new_web_only]"
+  notifies :run, "notify_group[discourse_container_new_mail_receiver]"
 end
 
 template "/srv/community.openstreetmap.org/docker/containers/data.yml" do
   source "data.yml.erb"
   owner "root"
   group "root"
-  mode "644"
+  mode "640"
   variables :passwords => passwords
-  notifies :run, "execute[discourse_container_data_rebuild]"
+  notifies :run, "notify_group[discourse_container_new_data]"
 end
 
 template "/srv/community.openstreetmap.org/docker/containers/web_only.yml" do
   source "web_only.yml.erb"
   owner "root"
   group "root"
-  mode "644"
+  mode "640"
   variables :license_keys => license_keys, :passwords => passwords
-  notifies :run, "execute[discourse_container_web_only_bootstrap]"
+  notifies :run, "notify_group[discourse_container_new_web_only]"
 end
 
 template "/srv/community.openstreetmap.org/docker/containers/mail-receiver.yml" do
   source "mail-receiver.yml.erb"
   owner "root"
   group "root"
-  mode "644"
+  mode "640"
   variables :passwords => passwords
-  notifies :run, "execute[discourse_container_mail_receiver_rebuild]"
+  notifies :run, "notify_group[discourse_container_new_mail_receiver]"
 end
 
-# Destroy Bootstap Start
-execute "discourse_container_data_rebuild" do
-  action :nothing
-  command "./launcher rebuild data"
-  cwd "/srv/community.openstreetmap.org/docker/"
-  user "root"
-  group "root"
+ssl_certificate "community.openstreetmap.org" do
+  domains ["community.openstreetmap.org", "community.osm.org", "communities.openstreetmap.org", "communities.osm.org", "c.openstreetmap.org", "c.osm.org"]
+  notifies :run, "notify_group[discourse_container_new_web_only]"
+  notifies :run, "notify_group[discourse_container_new_mail_receiver]"
 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_bootstrap]"
+notify_group "discourse_container_new_web_only" do
+  notifies :run, "execute[discourse_container_data_start]", :immediately # noop if site up
+  notifies :run, "execute[discourse_container_web_only_bootstrap]", :immediately # site up but runs in parallel. Slow
+  notifies :run, "execute[discourse_container_web_only_destroy]", :immediately # site down
+  notifies :run, "execute[discourse_container_data_rebuild]", :immediately # site down
+  notifies :run, "execute[discourse_container_web_only_start]", :immediately # site restore
 end
 
-execute "discourse_container_data_start" do
+notify_group "discourse_container_new_data" do
+  notifies :run, "execute[discourse_container_web_only_destroy]", :immediately # site down
+  notifies :run, "execute[discourse_container_data_rebuild]", :immediately # site down
+  notifies :run, "execute[discourse_container_web_only_start]", :immediately # site restore
+end
+
+notify_group "discourse_container_new_mail_receiver" do
+  notifies :run, "execute[discourse_container_mail_receiver_rebuild]", :immediately
+end
+
+# Attempt at a failsafe to ensure all containers are running
+notify_group "discourse_container_ensure_all_running" do
   action :run
+  notifies :run, "execute[discourse_container_data_start]", :delayed
+  notifies :run, "execute[discourse_container_web_only_start]", :delayed
+  notifies :run, "execute[discourse_container_mail_receiver_start]", :delayed
+end
+
+execute "discourse_container_data_start" do
+  action :nothing
   command "./launcher start data"
   cwd "/srv/community.openstreetmap.org/docker/"
   user "root"
   group "root"
 end
 
+execute "discourse_container_data_rebuild" do
+  action :nothing
+  command "./launcher rebuild data"
+  cwd "/srv/community.openstreetmap.org/docker/"
+  user "root"
+  group "root"
+end
+
 execute "discourse_container_web_only_bootstrap" do
   action :nothing
   command "./launcher bootstrap web_only"
   cwd "/srv/community.openstreetmap.org/docker/"
   user "root"
   group "root"
-  notifies :run, "execute[discourse_container_web_only_destroy]", :immediately
 end
 
 execute "discourse_container_web_only_destroy" do
@@ -118,19 +143,17 @@ execute "discourse_container_web_only_destroy" do
   cwd "/srv/community.openstreetmap.org/docker/"
   user "root"
   group "root"
-  notifies :run, "execute[discourse_container_web_only_start]", :immediately
 end
 
 execute "discourse_container_web_only_start" do
-  action :run
+  action :nothing
   command "./launcher start web_only"
   cwd "/srv/community.openstreetmap.org/docker/"
   user "root"
   group "root"
-  notifies :run, "execute[discourse_container_data_start]", :before
 end
 
-# Destroy Bootstap Start
+# Rebuild: Stop Destroy Bootstap Start
 execute "discourse_container_mail_receiver_rebuild" do
   action :nothing
   command "./launcher rebuild mail-receiver"
@@ -139,6 +162,14 @@ execute "discourse_container_mail_receiver_rebuild" do
   group "root"
 end
 
+execute "discourse_container_mail_receiver_start" do
+  action :nothing
+  command "./launcher start mail-receiver"
+  cwd "/srv/community.openstreetmap.org/docker/"
+  user "root"
+  group "root"
+end
+
 template "/etc/cron.daily/community-backup" do
   source "backup.cron.erb"
   owner "root"