community: use notify_group to DRY rebuild logic

diff --git a/cookbooks/community/recipes/default.rb b/cookbooks/community/recipes/default.rb
index 08f316d689e4fe2fd72d950aa3d855d398fc9464..c317b177b410a245095f93d5de1b7b14622d0ef8 100644 (file)
--- a/cookbooks/community/recipes/default.rb
+++ b/cookbooks/community/recipes/default.rb
@@ -49,9 +49,9 @@ git "/srv/community.openstreetmap.org/docker" do
   depth 1
   user "root"
   group "root"
   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
 end
 
 template "/srv/community.openstreetmap.org/docker/containers/data.yml" do


@@ -60,7 +60,7 @@ template "/srv/community.openstreetmap.org/docker/containers/data.yml" do
   group "root"
   mode "640"
   variables :passwords => passwords
   group "root"
   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
 end
 
 template "/srv/community.openstreetmap.org/docker/containers/web_only.yml" do


@@ -69,7 +69,7 @@ template "/srv/community.openstreetmap.org/docker/containers/web_only.yml" do
   group "root"
   mode "640"
   variables :license_keys => license_keys, :passwords => passwords
   group "root"
   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
 end
 
 template "/srv/community.openstreetmap.org/docker/containers/mail-receiver.yml" do


@@ -78,38 +78,63 @@ template "/srv/community.openstreetmap.org/docker/containers/mail-receiver.yml"
   group "root"
   mode "640"
   variables :passwords => passwords
   group "root"
   mode "640"
   variables :passwords => passwords

-  notifies :run, "execute[discourse_container_mail_receiver_rebuild]"
-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"
+  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"]
 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]"
+  notifies :run, "notify_group[discourse_container_new_web_only]"
+  notifies :run, "notify_group[discourse_container_new_mail_receiver]"

 end
 
 end
 

-execute "discourse_container_data_start" do
+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
+
+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
   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
 
   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"
 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
 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"
   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
 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"
   command "./launcher start web_only"
   cwd "/srv/community.openstreetmap.org/docker/"
   user "root"
   group "root"

-  notifies :run, "execute[discourse_container_data_start]", :before

 end
 
 end
 

-# Destroy Bootstap Start
+# Rebuild: Stop Destroy Bootstap Start

 execute "discourse_container_mail_receiver_rebuild" do
   action :nothing
   command "./launcher rebuild mail-receiver"
 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
 
   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"
 template "/etc/cron.daily/community-backup" do
   source "backup.cron.erb"
   owner "root"

diff --git a/cookbooks/community/templates/default/web_only.yml.erb b/cookbooks/community/templates/default/web_only.yml.erb
index 39ef1407ccce3b38dcb9a9e5fbf10f6d51e899ff..becaf3b24b921c92e59155c4fc833cf78d9b2a31 100644 (file)
--- a/cookbooks/community/templates/default/web_only.yml.erb
+++ b/cookbooks/community/templates/default/web_only.yml.erb
@@ -26,7 +26,6 @@ env:
   LC_ALL: en_US.UTF-8
   LANG: en_US.UTF-8
   LANGUAGE: en_US.UTF-8
   LC_ALL: en_US.UTF-8
   LANG: en_US.UTF-8
   LANGUAGE: en_US.UTF-8

-  EMBER_CLI_PROD_ASSETS: 1

   DISCOURSE_FORCE_HTTPS: true
 
   ## How many concurrent web requests are supported? Depends on memory and CPU cores.
   DISCOURSE_FORCE_HTTPS: true
 
   ## How many concurrent web requests are supported? Depends on memory and CPU cores.