Compare commits

..

No commits in common. "0f5f84dba26d7ef52b2ca97cd1d8c09b7286aa72" and "da7ff969373e645a5042d4a2930f02a43e90e568" have entirely different histories.

3 changed files with 3 additions and 4 deletions

View File

@ -18,7 +18,6 @@ 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"] = "https://hal8000.chat.kosmos.org"
node.default["mediawiki"]["hubot_room"] = "info@kosmos.chat"
node.default["mediawiki"]["hubot_base_url"] = "http://barnard.kosmos.org:8080"
node.default["mediawiki"]["hubot_room"] = "#kosmos"
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_xmpp')
hubot_credentials = Chef::EncryptedDataBagItem.load('credentials', 'hal8000_freenode')
webhook_token = hubot_credentials['webhook_token']
template "#{node['mediawiki']['webdir']}/extensions/MediawikiHubot/DefaultConfig.php" do