3 files changed, 27 insertions, 13 deletions
diff --git a/deployment/wikis/manifests/init.pp b/deployment/wikis/manifests/init.pp
index 901c5953..c34b06d5 100644
--- a/deployment/wikis/manifests/init.pp
+++ b/deployment/wikis/manifests/init.pp
@@ -9,22 +9,22 @@ class wikis {
         vhost          => false,
     }
 
-    subversion::snapshot { $wikis_templates:
-        source => "svn://svn.$::domain/svn/web/templates/mediawiki"
+    git::snapshot { $wikis_templates:
+        source => "git://git.${::domain}/web/templates/mediawiki"
     }
 
-    $wiki_languages = [ 'en','de' ]
+    $wiki_languages = [ 'en','de', 'fr' ]
     mediawiki::instance { $wiki_languages:
         title         => 'Mageia wiki',
         wiki_settings => template('wikis/wiki_settings'),
-        skinsdir      => "$wikis_templates/skins",
+        skinsdir      => "${wikis_templates}/skins",
     }
 
-    apache::vhost::redirect_ssl { "wiki.$::domain": }
+    apache::vhost::redirect_ssl { "wiki.${::domain}": }
 
-    apache::vhost::base { "ssl_wiki.$::domain":
+    apache::vhost::base { "ssl_wiki.${::domain}":
         use_ssl => true,
-        vhost   => "wiki.$::domain",
+        vhost   => "wiki.${::domain}",
         content => template('wikis/wiki_vhost.conf'),
     }
 }
diff --git a/deployment/wikis/templates/wiki_settings b/deployment/wikis/templates/wiki_settings
index d2c1b199..ec6e647d 100644
--- a/deployment/wikis/templates/wiki_settings
+++ b/deployment/wikis/templates/wiki_settings
@@ -7,12 +7,13 @@ $wgGroupPermissions['*']['createpage'] = false;
 $wgGroupPermissions['*']['writeapi'] = false;
 $wgGroupPermissions['*']['createaccount'] = false;
 $wgGroupPermissions['user']['edit'] = true;
+$wgGroupPermissions['*']['autocreateaccount'] = true;
 
 $wgScriptPath = "/mw-$wgLanguageCode";
 $wgArticlePath = "/$wgLanguageCode/$1";
 $wgUsePathInfo = true;
 $wgStylePath = "$wgScriptPath/skins";
-$wgStyleDirectory = '<%= wikis_templates %>/skins';
+$wgStyleDirectory = '<%= @wikis_templates %>/skins';
 $wgLogo = "";
 $wgDefaultSkin = 'vector';
 $wgFavicon = '/mw-en/skins/cavendish/favicon.png';
@@ -31,3 +32,15 @@ $wgExtraNamespaces[NS_QA_PROCEDURE] = 'QA_procedure';
 $wgExtraNamespaces[NS_QA_PROCEDURE_TALK] = 'QA_procedure_Talk';
 $wgContentNamespaces[] = NS_QA_PROCEDURE;
 $wgNamespacesToBeSearchedDefault[NS_QA_PROCEDURE] = true;
+
+wfLoadExtension('Nuke');
+wfLoadExtension('SpamBlacklist');
+wfLoadExtension('TitleBlacklist');
+$wgTitleBlacklistSources = array(
+  array(
+    'type' => 'localpage',
+    'src'  => 'MediaWiki:Titleblacklist'
+  )
+);
+
+# $wgReadOnly = 'This wiki is currently read-only';
diff --git a/deployment/wikis/templates/wiki_vhost.conf b/deployment/wikis/templates/wiki_vhost.conf
index e8e4fd6d..4e1355bc 100644
--- a/deployment/wikis/templates/wiki_vhost.conf
+++ b/deployment/wikis/templates/wiki_vhost.conf
@@ -1,18 +1,19 @@
-<Directory <%= wikis_root %>>
+<Directory <%= @wikis_root %>>
   Options +FollowSymLinks
 </Directory>
 
 RewriteEngine On
 RewriteRule ^/?$ /en/ [R]
 
+Alias /robots.txt <%= @wikis_root %>/robots.txt
+
 <%- for lang in wiki_languages -%>
 
-<Directory <%= wikis_root %>/<%= lang %>/images>
+<Directory <%= @wikis_root %>/<%= lang %>/images>
   SetHandler default-handler
 </Directory>
 
-Alias /<%= lang %> <%= wikis_root %>/<%= lang %>/index.php
-Alias /mw-<%= lang %> <%= wikis_root %>/<%= lang %>
+Alias /<%= lang %> <%= @wikis_root %>/<%= lang %>/index.php
+Alias /mw-<%= lang %> <%= @wikis_root %>/<%= lang %>
 
 <%- end -%>
-