Merge pull request 'Send wiki notifications to new info chatroom (instead of main Kosmos room)' (#224) from chore/hubot_mediawiki_notifications into master

Reviewed-on: #224
This commit is contained in:
Greg 2020-10-21 11:43:26 +00:00
commit 0f5f84dba2
3 changed files with 4 additions and 3 deletions

View File

@ -18,6 +18,7 @@ node.default['hal8000_xmpp']['rooms'] = [
'kosmos@kosmos.chat',
'kosmos-dev@kosmos.chat',
'kredits@kosmos.chat',
'info@kosmos.chat'
]
node.default['hal8000_xmpp']['auth_admins'] = []

View File

@ -1,4 +1,4 @@
node.default["mediawiki"]["url"] = "https://wiki.kosmos.org/"
node.default["mediawiki"]["hubot_base_url"] = "http://barnard.kosmos.org:8080"
node.default["mediawiki"]["hubot_room"] = "#kosmos"
node.default["mediawiki"]["hubot_base_url"] = "https://hal8000.chat.kosmos.org"
node.default["mediawiki"]["hubot_room"] = "info@kosmos.chat"
node.default["mediawiki"]["ldap_enabled"] = true

View File

@ -119,7 +119,7 @@ ark "MediawikiHubot" do
action :cherry_pick
end
hubot_credentials = Chef::EncryptedDataBagItem.load('credentials', 'hal8000_freenode')
hubot_credentials = Chef::EncryptedDataBagItem.load('credentials', 'hal8000_xmpp')
webhook_token = hubot_credentials['webhook_token']
template "#{node['mediawiki']['webdir']}/extensions/MediawikiHubot/DefaultConfig.php" do