split configuration in two, include new templates

diff --git a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
index f3c127e5af2663e0d31d388c67650fa3f8c91bb9..035ae0acc3e70311392f01f4f32b1341aa3045af 100644 (file)
--- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
+++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
@@ -230,13 +230,6 @@ $wgGroupPermissions['*']['createaccount'] = false;
 $wgUploadPath = "$wgScriptPath/img_auth.php";
 <% end -%>
 
 $wgUploadPath = "$wgScriptPath/img_auth.php";
 <% end -%>
 

-<% if not(@mediawiki[:private_accounts]) and not(@mediawiki[:private_site]) -%>
-# user group "confirmed" with identical rights as "autoconfirmed", but assigned manually by sysops
-$wgGroupPermissions['confirmed'] = $wgGroupPermissions['autoconfirmed'];
-$wgAddGroups['sysop'][] = 'confirmed';
-$wgRemoveGroups['sysop'][] = 'confirmed';
-<% end -%>
-

 # Allow Subpages on Main Namespace
 $wgNamespacesWithSubpages[NS_MAIN] = true;
 
 # Allow Subpages on Main Namespace
 $wgNamespacesWithSubpages[NS_MAIN] = true;
 


@@ -273,10 +266,6 @@ $wgAllowExternalImagesFrom = array( 'http://tile.openstreetmap.org/', 'https://t
 
 $wgNoFollowDomainExceptions = array( 'www.openstreetmap.org', 'josm.openstreetmap.de', 'taginfo.openstreetmap.org', 'blog.openstreetmap.org', 'wiki.osmfoundation.org' );
 
 
 $wgNoFollowDomainExceptions = array( 'www.openstreetmap.org', 'josm.openstreetmap.de', 'taginfo.openstreetmap.org', 'blog.openstreetmap.org', 'wiki.osmfoundation.org' );
 

-# FIXME - move to specific
-# defines which links of the sidebar are translatable 
-$wgForceUIMsgAsContentMsg = array( 'mainpage-url', 'mapfeatures-url', 'contributors-url', 'helppage', 'blogs-url', 'shop-url', 'sitesupport-url' );
-

 # FIXME - move to specific
 $wgAllowUserJs = TRUE;
 $wgAllowUserCss = TRUE;
 # FIXME - move to specific
 $wgAllowUserJs = TRUE;
 $wgAllowUserCss = TRUE;

diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index 72af19cb80ef3fe16f17a10e70660f8515ba2d5e..04b7c74c6307ffc2fbd4f52b1291e2e8eaf0c28d 100644 (file)
--- a/cookbooks/wiki/recipes/default.rb
+++ b/cookbooks/wiki/recipes/default.rb
@@ -60,6 +60,13 @@ mediawiki_site "wiki.openstreetmap.org" do
   # site_readonly "MAINTENANCE: WIKI READ-ONLY UNTIL Monday 16 May 2016 - 11:00am UTC/GMT."
 end
 
   # site_readonly "MAINTENANCE: WIKI READ-ONLY UNTIL Monday 16 May 2016 - 11:00am UTC/GMT."
 end
 

+template "/srv/wiki.openstreetmap.org/00_before_extensions.php" do
+  source "before_extensions.php.erb"
+  owner node[:mediawiki][:user]
+  group node[:mediawiki][:group]
+  mode "600"
+end
+

 mediawiki_extension "CodeEditor" do
   site "wiki.openstreetmap.org"
 end
 mediawiki_extension "CodeEditor" do
   site "wiki.openstreetmap.org"
 end


@@ -134,6 +141,13 @@ directory "/srv/wiki.openstreetmap.org/dump" do
   mode "0775"
 end
 
   mode "0775"
 end
 

+template "/srv/wiki.openstreetmap.org/99_after_extensions.php" do
+  source "after_extensions.php.erb"
+  owner node[:mediawiki][:user]
+  group node[:mediawiki][:group]
+  mode "600"
+end
+

 cron_d "wiki-dump" do
   minute "0"
   hour "2"
 cron_d "wiki-dump" do
   minute "0"
   hour "2"

diff --git a/cookbooks/wiki/templates/default/after_extensions.php.erb b/cookbooks/wiki/templates/default/after_extensions.php.erb
new file mode 100644 (file)
index 0000000..190b407
--- /dev/null
+++ b/cookbooks/wiki/templates/default/after_extensions.php.erb
@@ -0,0 +1,14 @@
+<?php
+# DO NOT EDIT - This file is being maintained by Chef
+
+# Protect against web entry
+if ( !defined( 'MEDIAWIKI' ) ) {
+       exit;
+}
+
+# configuration loaded after the extensions
+
+# user group "confirmed" with identical rights as "autoconfirmed", but assigned manually by sysops
+$wgGroupPermissions['confirmed'] = $wgGroupPermissions['autoconfirmed'];
+$wgAddGroups['sysop'][] = 'confirmed';
+$wgRemoveGroups['sysop'][] = 'confirmed';

diff --git a/cookbooks/wiki/templates/default/LocalSettings.php.erb b/cookbooks/wiki/templates/default/before_extensions.php.erb
similarity index 92%
rename from cookbooks/wiki/templates/default/LocalSettings.php.erb
rename to cookbooks/wiki/templates/default/before_extensions.php.erb
index bcef00d0e4b5ac06993b30c5b95c1f4aba3cae4c..6159c9a04d79588b910d85820367596dfe1b21b9 100644 (file)
--- a/cookbooks/wiki/templates/default/LocalSettings.php.erb
+++ b/cookbooks/wiki/templates/default/before_extensions.php.erb
@@ -6,6 +6,8 @@ if ( !defined( 'MEDIAWIKI' ) ) {
        exit;
 }
 
        exit;
 }
 

+# configuration loaded before the extensions
+

 # DE
 define('NS_LANG_DE', 200);
 $wgExtraNamespaces[NS_LANG_DE] = 'DE';
 # DE
 define('NS_LANG_DE', 200);
 $wgExtraNamespaces[NS_LANG_DE] = 'DE';


@@ -88,3 +90,6 @@ $wgNamespacesToBeSearchedDefault[NS_LANG_NL] = TRUE;
 $wgNamespacesToBeSearchedDefault[NS_LANG_RU] = TRUE;
 $wgNamespacesToBeSearchedDefault[NS_LANG_JA] = TRUE;
 $wgNamespacesToBeSearchedDefault[NS_PROPOSAL] = TRUE;
 $wgNamespacesToBeSearchedDefault[NS_LANG_RU] = TRUE;
 $wgNamespacesToBeSearchedDefault[NS_LANG_JA] = TRUE;
 $wgNamespacesToBeSearchedDefault[NS_PROPOSAL] = TRUE;

+
+# defines which links of the sidebar are translatable 
+$wgForceUIMsgAsContentMsg = array( 'mainpage-url', 'mapfeatures-url', 'contributors-url', 'helppage', 'blogs-url', 'shop-url', 'sitesupport-url' );