diff --git a/site-cookbooks/kosmos-mediawiki/attributes/default.rb b/site-cookbooks/kosmos-mediawiki/attributes/default.rb new file mode 100644 index 0000000..eae4ea2 --- /dev/null +++ b/site-cookbooks/kosmos-mediawiki/attributes/default.rb @@ -0,0 +1,3 @@ +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" diff --git a/site-cookbooks/kosmos-mediawiki/recipes/default.rb b/site-cookbooks/kosmos-mediawiki/recipes/default.rb index 9503785..e07f7a5 100644 --- a/site-cookbooks/kosmos-mediawiki/recipes/default.rb +++ b/site-cookbooks/kosmos-mediawiki/recipes/default.rb @@ -140,14 +140,14 @@ ark "MediawikiHubot" do action :cherry_pick end -hal8000_freenode_data_bag_item = Chef::EncryptedDataBagItem.load('credentials', 'hal8000_freenode') -webhook_token = hal8000_freenode_data_bag_item['webhook_token'] +hubot_credentials = Chef::EncryptedDataBagItem.load('credentials', 'hal8000_freenode') +webhook_token = hubot_credentials['webhook_token'] template "#{node['mediawiki']['webdir']}/extensions/MediawikiHubot/DefaultConfig.php" do source "MediawikiHubot/DefaultConfig.php.erb" - variables webhook_url: "http://localhost:8080/incoming/#{webhook_token}", - room_name: "#kosmos", - wiki_url: "https://wiki.kosmos.org/" + variables webhook_url: "#{node['mediawiki']['hubot_base_url']}/incoming/#{webhook_token}", + room_name: node['mediawiki']['hubot_room'], + wiki_url: node['mediawiki']['url'] end ruby_block "configuration" do diff --git a/site-cookbooks/kosmos-mediawiki/templates/default/MediawikiHubot/DefaultConfig.php.erb b/site-cookbooks/kosmos-mediawiki/templates/default/MediawikiHubot/DefaultConfig.php.erb index 6fbf899..31fe233 100644 --- a/site-cookbooks/kosmos-mediawiki/templates/default/MediawikiHubot/DefaultConfig.php.erb +++ b/site-cookbooks/kosmos-mediawiki/templates/default/MediawikiHubot/DefaultConfig.php.erb @@ -54,4 +54,6 @@ if (!isset($hpc_attached)) die(); $wgHubotMovedArticle = true; // Article edited $wgHubotEditedArticle = true; + // Article edited, minor change + $wgHubotEditedArticleMinorChange = false; ?>