Add email handling and fixes

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

diff --git a/cookbooks/community/recipes/default.rb b/cookbooks/community/recipes/default.rb
index b70a1412dbd3df233abb36aa2b935e42d526882a..35dec91564189e9dd2f27a0f86342afc206c672f 100644 (file)
--- a/cookbooks/community/recipes/default.rb
+++ b/cookbooks/community/recipes/default.rb
@@ -51,6 +51,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 +59,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 +72,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"


@@ -87,6 +97,14 @@ execute "discourse_container_web_only_rebuild" do
   group "root"
 end
 
   group "root"
 end
 

+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
 # Backup the backups
 # Maybe use /srv/community.openstreetmap.org/shared/web-only/backups/
 ## FIXME
 # Backup the backups
 # Maybe use /srv/community.openstreetmap.org/shared/web-only/backups/