Merge branch 'feature/99-kosmos_chat_muc' of kosmos/chef into master

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

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

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:

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'

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'

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

site-cookbooks/kosmos-nginx/files/default/maintenance.html

@@ -31,8 +31,8 @@
       <nav>
         <ul>
           <li><a href="https://kosmos.org">kosmos.org</a></li>
-          <li><a href="xmpp://kosmos@chat.kosmos.org?join">XMPP chatroom</a></li>
-          <li><a href="https://kosmos.social/@kosmos">Fediverse</a></li>
+          <li><a href="xmpp://kosmos@kosmos.chat?join">XMPP chatroom</a></li>
+          <li><a href="https://kosmos.social/@ops">Fediverse</a></li>
         </ul>
       </nav>
     </main>

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'