Use backport of cgi-mapserver

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

diff --git a/cookbooks/community/recipes/default.rb b/cookbooks/community/recipes/default.rb
index 08f316d689e4fe2fd72d950aa3d855d398fc9464..000a57a7e00cac990e9ebafa1c9e4aba3ec37deb 100644 (file)
--- a/cookbooks/community/recipes/default.rb
+++ b/cookbooks/community/recipes/default.rb
@@ -25,6 +25,10 @@ include_recipe "ssl"
 passwords = data_bag_item("community", "passwords")
 license_keys = data_bag_item("geoipupdate", "license-keys") unless kitchen?
 
 passwords = data_bag_item("community", "passwords")
 license_keys = data_bag_item("geoipupdate", "license-keys") unless kitchen?
 

+prometheus_servers = search(:node, "recipes:prometheus\\:\\:server").map do |server|
+  server.ipaddresses(:role => :external)
+end.flatten
+

 # Disable any default installed apache2 service. Web server is embedded within the discourse docker container
 service "apache2" do
   action [:disable, :stop]
 # Disable any default installed apache2 service. Web server is embedded within the discourse docker container
 service "apache2" do
   action [:disable, :stop]


@@ -42,16 +46,30 @@ directory "/srv/community.openstreetmap.org/shared" do
   mode "755"
 end
 
   mode "755"
 end
 

+directory "/srv/community.openstreetmap.org/files" do
+  owner "community"
+  group "community"
+  mode "755"
+end
+
+template "/srv/community.openstreetmap.org/files/update-feeds.atom" do
+  source "update-feeds.atom.erb"
+  owner "community"
+  group "community"
+  mode "644"
+end
+

 git "/srv/community.openstreetmap.org/docker" do
   action :sync
   repository "https://github.com/discourse/discourse_docker.git"
 git "/srv/community.openstreetmap.org/docker" do
   action :sync
   repository "https://github.com/discourse/discourse_docker.git"

+  # Revision pin not possible as launch wrapper automatically updates git repo.

   revision "main"
   depth 1
   user "root"
   group "root"
   revision "main"
   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 +78,11 @@ 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
+
+resolvers = node[:networking][:nameservers].map do |resolver|
+  resolver =~ /:/ ? "[#{resolver}]" : resolver

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


@@ -68,8 +90,17 @@ template "/srv/community.openstreetmap.org/docker/containers/web_only.yml" do
   owner "root"
   group "root"
   mode "640"
   owner "root"
   group "root"
   mode "640"

-  variables :license_keys => license_keys, :passwords => passwords
-  notifies :run, "execute[discourse_container_web_only_bootstrap]"
+  variables :license_keys => license_keys, :passwords => passwords,
+            :prometheus_servers => prometheus_servers, :resolvers => resolvers
+  notifies :run, "notify_group[discourse_container_new_web_only]"
+end
+
+template "/srv/community.openstreetmap.org/files/policyd-spf.conf" do
+  source "policyd-spf.conf.erb"
+  owner "community"
+  group "community"
+  mode "644"
+  notifies :run, "notify_group[discourse_container_new_mail_receiver]"

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

 end
 
 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", "forum.openstreetmap.org", "forum.osm.org"]
+  notifies :run, "notify_group[discourse_container_new_web_only]"
+  notifies :run, "notify_group[discourse_container_new_mail_receiver]"

 end
 
 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
 
 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
   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 +174,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 +193,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"