Add mp3 support to Foundation wiki site

diff --git a/cookbooks/foundation/recipes/wiki.rb b/cookbooks/foundation/recipes/wiki.rb
index 4385bb607657ff9957655436e2536f378774329d..b89bfe192686786e3fbe0b9133a9f9b18b18ca8b 100644 (file)
--- a/cookbooks/foundation/recipes/wiki.rb
+++ b/cookbooks/foundation/recipes/wiki.rb
@@ -39,6 +39,7 @@ mediawiki_site "wiki.osmfoundation.org" do
   private_accounts true
   recaptcha_public_key "6LflIQATAAAAAMXyDWpba-FgipVzE-aGF4HIR59N"
   recaptcha_private_key passwords["wiki"]["recaptcha"]
   private_accounts true
   recaptcha_public_key "6LflIQATAAAAAMXyDWpba-FgipVzE-aGF4HIR59N"
   recaptcha_private_key passwords["wiki"]["recaptcha"]

+  extra_file_extensions ["mp3"]

 end
 
 mediawiki_skin "osmf" do
 end
 
 mediawiki_skin "osmf" do

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index fa97814f0a26abaccd7e3d2f1adf836762ae3091..32916d2bcee38fc452fc08eb7da428ec86b8d69a 100644 (file)
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -46,6 +46,7 @@ attribute :private_accounts, :kind_of => [TrueClass, FalseClass], :default => fa
 attribute :private, :kind_of => [TrueClass, FalseClass], :default => false
 attribute :recaptcha_public_key, :kind_of => String
 attribute :recaptcha_private_key, :kind_of => String
 attribute :private, :kind_of => [TrueClass, FalseClass], :default => false
 attribute :recaptcha_public_key, :kind_of => String
 attribute :recaptcha_private_key, :kind_of => String

+attribute :extra_file_extensions, :kind_of => [String, Array]

 attribute :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true
 
 def after_created
 attribute :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true
 
 def after_created


@@ -74,6 +75,7 @@ def mediawiki_params
     :site_notice => site_notice,
     :site_readonly => site_readonly,
     :ssl_enabled => ssl_enabled,
     :site_notice => site_notice,
     :site_readonly => site_readonly,
     :ssl_enabled => ssl_enabled,

+    :extra_file_extensions  => extra_file_extensions,

     :private_accounts => private_accounts,
     :private => private
   }
     :private_accounts => private_accounts,
     :private => private
   }

diff --git a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
index b460c98d0fdb0a626a47291b89856fb94fca7aee..4d0ed1e58465806c6fb03b6a2aa364868fdc5289 100644 (file)
--- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
+++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
@@ -95,6 +95,9 @@ $wgFileExtensions[] = 'pdf';
 $wgFileExtensions[] = 'odt';
 $wgFileExtensions[] = 'odp';
 $wgFileExtensions[] = 'svg';
 $wgFileExtensions[] = 'odt';
 $wgFileExtensions[] = 'odp';
 $wgFileExtensions[] = 'svg';

+<% @mediawiki[:extra_file_extensions].each do |mw_extra_file_extension| -%>
+       $wgFileExtensions[] = '<%= mw_extra_file_extension %>';
+<% end -%>

 
 $wgSVGConverters = array( 'rsvg' => '/usr/bin/rsvg-convert -w $width -h $height -o $output $input');
 $wgSVGConverter = 'rsvg';
 
 $wgSVGConverters = array( 'rsvg' => '/usr/bin/rsvg-convert -w $width -h $height -o $output $input');
 $wgSVGConverter = 'rsvg';