From 3da46705ba36d18c9dc59e52d9a2c8d84aa5f9a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Fri, 6 May 2016 16:40:37 +0200 Subject: [PATCH] Add base URL to Mediawiki Hubot extension Fixes #5 --- site-cookbooks/kosmos-mediawiki/recipes/default.rb | 3 ++- .../templates/default/MediawikiHubot/DefaultConfig.php.erb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/site-cookbooks/kosmos-mediawiki/recipes/default.rb b/site-cookbooks/kosmos-mediawiki/recipes/default.rb index c09f8d8..bdfb163 100644 --- a/site-cookbooks/kosmos-mediawiki/recipes/default.rb +++ b/site-cookbooks/kosmos-mediawiki/recipes/default.rb @@ -112,7 +112,8 @@ webhook_token = hal8000_freenode_data_bag_item['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" + room_name: "#kosmos", + wiki_url: "https://wiki.kosmos.org/" 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 1ab51f9..6fbf899 100644 --- a/site-cookbooks/kosmos-mediawiki/templates/default/MediawikiHubot/DefaultConfig.php.erb +++ b/site-cookbooks/kosmos-mediawiki/templates/default/MediawikiHubot/DefaultConfig.php.erb @@ -27,7 +27,7 @@ if (!isset($hpc_attached)) die(); ################## // REQUIRED // URL of your MediaWiki installation incl. the trailing /. - $wgWikiUrl = ""; + $wgWikiUrl = "<%= @wiki_url %>"; // Wiki script name. Leave this to default one if you do not have URL rewriting enabled. $wgWikiUrlEnding = "index.php?title="; // OPTIONAL