From 4685b165737634878a996f894b10e0ee4995d7f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Thu, 19 Sep 2019 15:56:49 +0200 Subject: [PATCH 1/5] Add kosmos.chat to the list of Kosmos XMPP domains with a TLS cert --- site-cookbooks/kosmos-ejabberd/recipes/letsencrypt.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site-cookbooks/kosmos-ejabberd/recipes/letsencrypt.rb b/site-cookbooks/kosmos-ejabberd/recipes/letsencrypt.rb index d4cbd00..bfff01b 100644 --- a/site-cookbooks/kosmos-ejabberd/recipes/letsencrypt.rb +++ b/site-cookbooks/kosmos-ejabberd/recipes/letsencrypt.rb @@ -57,7 +57,7 @@ end # Generate a Let's Encrypt cert (only if no cert has been generated before). # The systemd timer will take care of renewing execute "letsencrypt cert for kosmos xmpp" do - command "/usr/bin/certbot certonly --manual --preferred-challenges dns --manual-public-ip-logging-ok --agree-tos --manual-auth-hook \"/root/gandi_dns_certbot_hook.sh auth\" --manual-cleanup-hook \"/root/gandi_dns_certbot_hook.sh cleanup\" --deploy-hook \"/etc/letsencrypt/renewal-hooks/post/ejabberd\" --email ops@kosmos.org -d kosmos.org -d chat.kosmos.org -d xmpp.kosmos.org -n" + command "/usr/bin/certbot certonly --manual --preferred-challenges dns --manual-public-ip-logging-ok --agree-tos --manual-auth-hook \"/root/gandi_dns_certbot_hook.sh auth\" --manual-cleanup-hook \"/root/gandi_dns_certbot_hook.sh cleanup\" --deploy-hook \"/etc/letsencrypt/renewal-hooks/post/ejabberd\" --email ops@kosmos.org -d kosmos.org -d xmpp.kosmos.org -d chat.kosmos.org -d kosmos.chat -n" not_if do File.exist?("/etc/letsencrypt/live/kosmos.org/fullchain.pem") end From 544f4b78f4d11126ccb4bc76645e41ed363e031a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Thu, 19 Sep 2019 15:57:54 +0200 Subject: [PATCH 2/5] Change the MUC domain for the kosmos.org XMPP server to kosmos.chat --- site-cookbooks/kosmos-ejabberd/metadata.rb | 2 +- site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/site-cookbooks/kosmos-ejabberd/metadata.rb b/site-cookbooks/kosmos-ejabberd/metadata.rb index 07cb5a2..7085d35 100644 --- a/site-cookbooks/kosmos-ejabberd/metadata.rb +++ b/site-cookbooks/kosmos-ejabberd/metadata.rb @@ -4,7 +4,7 @@ maintainer_email 'ops@kosmos.org' license 'MIT' description 'Installs/Configures kosmos-ejabberd' long_description 'Installs/Configures kosmos-ejabberd' -version '0.1.1' +version '0.1.2' chef_version '>= 12.14' if respond_to?(:chef_version) # The `issues_url` points to the location where issues for this cookbook are diff --git a/site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb b/site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb index 775ddba..7f66eaf 100644 --- a/site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb +++ b/site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb @@ -275,7 +275,7 @@ append_host_config: "kosmos.org": modules: mod_muc: - host: "chat.@HOST@" + host: "kosmos.chat" access: - allow access_admin: From f49dd5e6d42ae1ee5ff0bad32640240b14a3f674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Thu, 19 Sep 2019 15:58:53 +0200 Subject: [PATCH 3/5] Switch the MUC host for kosmos.org to kosmos.chat --- site-cookbooks/kosmos-hubot/attributes/default.rb | 8 ++++---- site-cookbooks/kosmos-hubot/metadata.rb | 2 +- site-cookbooks/kosmos-hubot/recipes/wormhole.rb | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/site-cookbooks/kosmos-hubot/attributes/default.rb b/site-cookbooks/kosmos-hubot/attributes/default.rb index 01f5e11..9fbaeeb 100644 --- a/site-cookbooks/kosmos-hubot/attributes/default.rb +++ b/site-cookbooks/kosmos-hubot/attributes/default.rb @@ -15,9 +15,9 @@ node.default['hal8000_xmpp']['hubot_scripts'] = [ ] node.default['hal8000_xmpp']['rooms'] = [ - 'kosmos@chat.kosmos.org', - 'kosmos-dev@chat.kosmos.org', - 'kredits@chat.kosmos.org', + 'kosmos@kosmos.chat', + 'kosmos-dev@kosmos.chat', + 'kredits@kosmos.chat', ] node.default['hal8000_xmpp']['auth_admins'] = [] @@ -25,7 +25,7 @@ node.default['hal8000_xmpp']['auth_admins'] = [] node.default['hal8000_xmpp']['kredits']['ipfs_host'] = 'localhost' node.default['hal8000_xmpp']['kredits']['ipfs_port'] = '5001' node.default['hal8000_xmpp']['kredits']['ipfs_protocol'] = 'http' -node.default['hal8000_xmpp']['kredits']['room'] = 'kredits@chat.kosmos.org' +node.default['hal8000_xmpp']['kredits']['room'] = 'kredits@kosmos.chat' node.default['hal8000_xmpp']['kredits']['provider_url'] = 'https://rinkeby.infura.io/v3/c5e74367261d475ab935e2f0e726482f' node.default['hal8000_xmpp']['kredits']['network_id'] = '4' node.default['hal8000_xmpp']['kredits']['wallet_path'] = 'wallet.json' diff --git a/site-cookbooks/kosmos-hubot/metadata.rb b/site-cookbooks/kosmos-hubot/metadata.rb index 6458988..d606c40 100644 --- a/site-cookbooks/kosmos-hubot/metadata.rb +++ b/site-cookbooks/kosmos-hubot/metadata.rb @@ -4,7 +4,7 @@ maintainer_email 'mail@kosmos.org' license 'MIT' description 'Configures Kosmos chat bots' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '0.1.1' +version '0.1.2' depends 'kosmos-nodejs' depends 'kosmos-redis' diff --git a/site-cookbooks/kosmos-hubot/recipes/wormhole.rb b/site-cookbooks/kosmos-hubot/recipes/wormhole.rb index e1b527d..b64254d 100644 --- a/site-cookbooks/kosmos-hubot/recipes/wormhole.rb +++ b/site-cookbooks/kosmos-hubot/recipes/wormhole.rb @@ -84,7 +84,7 @@ application app_path do "HUBOT_WORMHOLE_XMPP_PASSWORD" => data_bag['xmpp_password'], "HUBOT_WORMHOLE_XMPP_HOST" => "xmpp.kosmos.org", "HUBOT_WORMHOLE_XMPP_PORT" => "5222", - "HUBOT_WORMHOLE_XMPP_ROOMS" => "kosmos@chat.kosmos.org,kosmos-dev@chat.kosmos.org,kosmos-random@chat.kosmos.org" + "HUBOT_WORMHOLE_XMPP_ROOMS" => "kosmos@kosmos.chat,kosmos-dev@kosmos.chat,kosmos-random@kosmos.chat" } ) notifies :run, "execute[systemctl daemon-reload]", :delayed From cd9a7dd3dc09ffa84c7b2162f2b7edae27c73113 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Thu, 19 Sep 2019 16:00:01 +0200 Subject: [PATCH 4/5] Use the new kosmos.chat MUC domain on the maintenance page --- site-cookbooks/kosmos-nginx/files/default/maintenance.html | 2 +- site-cookbooks/kosmos-nginx/metadata.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/site-cookbooks/kosmos-nginx/files/default/maintenance.html b/site-cookbooks/kosmos-nginx/files/default/maintenance.html index 1ef576c..0dff156 100644 --- a/site-cookbooks/kosmos-nginx/files/default/maintenance.html +++ b/site-cookbooks/kosmos-nginx/files/default/maintenance.html @@ -31,7 +31,7 @@ diff --git a/site-cookbooks/kosmos-nginx/metadata.rb b/site-cookbooks/kosmos-nginx/metadata.rb index 1767e52..de338cd 100644 --- a/site-cookbooks/kosmos-nginx/metadata.rb +++ b/site-cookbooks/kosmos-nginx/metadata.rb @@ -4,7 +4,7 @@ maintainer_email 'mail@kosmos.org' license 'MIT' description 'Installs/Configures kosmos-nginx' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '0.3.0' +version '0.3.1' depends 'nginx' depends 'firewall' From 9d68d3c4da3be020f4c8c528ca6bea5a2c3b0df1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Thu, 19 Sep 2019 16:02:41 +0200 Subject: [PATCH 5/5] Link to the new ops Mastodon account --- site-cookbooks/kosmos-nginx/files/default/maintenance.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site-cookbooks/kosmos-nginx/files/default/maintenance.html b/site-cookbooks/kosmos-nginx/files/default/maintenance.html index 0dff156..da2e94e 100644 --- a/site-cookbooks/kosmos-nginx/files/default/maintenance.html +++ b/site-cookbooks/kosmos-nginx/files/default/maintenance.html @@ -32,7 +32,7 @@