[evolvis-commits] r18059: wiki pending merges:↵ Thorsten Glaser 2012-01-20 oops. I did not want the debugging code there.↵ Thorsten Glaser 2012-01-20 it’s wikidata/ not projects/ and chmod/mkdir wants octal numbers↵ Thorsten Glaser 2012-01-20 replace the old-style sys_mw_wgPolyglotLanguages↵ Thorsten Glaser 2012-01-20 improve comment↵ Thorsten Glaser 2012-01-20 include extensions earlier

mirabilos at evolvis.org mirabilos at evolvis.org
Fri Jan 20 18:11:02 CET 2012


Author: mirabilos
Date: 2012-01-20 18:11:02 +0100 (Fri, 20 Jan 2012)
New Revision: 18059

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/common/MediaWikiPlugin.class.php
   trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/cronjobs/create-wikis.php
   trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/etc/httpd.d/61plugin-mediawiki
   trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/etc/mediawiki.ini
   trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/www/LocalSettings.php
Log:
wiki pending merges:
  Thorsten Glaser 2012-01-20 oops. I did not want the debugging code there.
    Thorsten Glaser 2012-01-20 it’s wikidata/ not projects/ and chmod/mkdir wants octal numbers
    Thorsten Glaser 2012-01-20 replace the old-style sys_mw_wgPolyglotLanguages
    Thorsten Glaser 2012-01-20 improve comment
    Thorsten Glaser 2012-01-20 include extensions earlier


Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/common/MediaWikiPlugin.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/common/MediaWikiPlugin.class.php	2012-01-20 17:10:58 UTC (rev 18058)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/common/MediaWikiPlugin.class.php	2012-01-20 17:11:02 UTC (rev 18059)
@@ -24,7 +24,7 @@
 forge_define_config_item('src_path','mediawiki', "/usr/share/mediawiki");
 
 forge_define_config_item('mwdata_path', 'mediawiki', '$core/data_path/plugins/mediawiki');
-forge_define_config_item('projects_path', 'mediawiki', '$mediawiki/mwdata_path/projects');
+forge_define_config_item('projects_path', 'mediawiki', '$mediawiki/mwdata_path/wikidata');
 forge_define_config_item('master_path', 'mediawiki', '$mediawiki/mwdata_path/master');
 
 forge_define_config_item('enable_uploads', 'mediawiki', false);

Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/cronjobs/create-wikis.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/cronjobs/create-wikis.php	2012-01-20 17:10:58 UTC (rev 18058)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/cronjobs/create-wikis.php	2012-01-20 17:11:02 UTC (rev 18059)
@@ -62,19 +62,19 @@
 	if (is_dir($project_dir)) {
 		cron_debug("  Project dir $project_dir exists, so I assumen the project already exists.");
 		if(!is_dir("$project_dir/cache")) {
-			mkdir("$project_dir/cache", 2775, true);
+			mkdir("$project_dir/cache", 02775, true);
 			chgrp("$project_dir/cache", "www-data");
 		}
 		if(!is_dir("$project_dir/cache/rss")) {
-			mkdir("$project_dir/cache/rss", 2775, true);
+			mkdir("$project_dir/cache/rss", 02775, true);
 			chgrp("$project_dir/cache/rss", "www-data");
 		}
 	} else {
 		cron_debug("  Creating project dir $project_dir.");
 		mkdir($project_dir, 0775, true);
-		mkdir("$project_dir/cache", 2775, true);
+		mkdir("$project_dir/cache", 02775, true);
 		chgrp("$project_dir/cache", "www-data");
-		mkdir("$project_dir/cache/rss", 2775, true);
+		mkdir("$project_dir/cache/rss", 02775, true);
 		chgrp("$project_dir/cache/rss", "www-data");
 
 		// Create the DB

Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/etc/httpd.d/61plugin-mediawiki
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/etc/httpd.d/61plugin-mediawiki	2012-01-20 17:10:58 UTC (rev 18058)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/etc/httpd.d/61plugin-mediawiki	2012-01-20 17:11:02 UTC (rev 18059)
@@ -2,7 +2,7 @@
 RedirectMatch 301 ^({sys_urlprefix}plugins/mediawiki/wiki/[-a-zA-Z0-9_]*)/*$ $1/index.php
 AliasMatch ^{sys_urlprefix}plugins/mediawiki/wiki/[-a-zA-Z0-9_]*/api.php {usr_share_gforge}/www/plugins/mediawiki/api.php
 AliasMatch ^{sys_urlprefix}plugins/mediawiki/wiki/[-a-zA-Z0-9_]*/index.php {usr_share_gforge}/www/plugins/mediawiki/index.php
-AliasMatch ^{sys_urlprefix}plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/images/(.*) {var_lib_gforge}/plugins/mediawiki/projects/$1/images/$2
+AliasMatch ^{sys_urlprefix}plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/images/(.*) {var_lib_gforge}/plugins/mediawiki/wikidata/$1/images/$2
 AliasMatch ^{sys_urlprefix}plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/skins/(.*) /usr/share/gforge/www/plugins/mediawiki/skins/$2
 AliasMatch ^{sys_urlprefix}plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/extensions/(.*) /var/lib/mediawiki/extensions/$2
 AliasMatch ^{sys_urlprefix}plugins/mediawiki/dumps/(.*)$ {var_lib_gforge}/plugins/mediawiki/dumps/$1
@@ -23,7 +23,7 @@
 </Directory>
 
 # some directories must be protected
-<DirectoryMatch {var_lib_gforge}/plugins/mediawiki/projects/[-a-zA-Z0-9_]*/images>
+<DirectoryMatch {var_lib_gforge}/plugins/mediawiki/wikidata/[-a-zA-Z0-9_]*/images>
         Options -FollowSymLinks
         AllowOverride None
 </DirectoryMatch>

Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/etc/mediawiki.ini
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/etc/mediawiki.ini	2012-01-20 17:10:58 UTC (rev 18058)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/etc/mediawiki.ini	2012-01-20 17:11:02 UTC (rev 18059)
@@ -12,7 +12,7 @@
 
 ; Mediawiki projects dir. 
 ; All projects using the plugin have a subdirectory in this directory.
-projects_path = "$mediawiki/mwdata_path/projects"
+projects_path = "$mediawiki/mwdata_path/wikidata"
 
 ; Mediawiki master dir.
 ; This is where all the links to the mediawiki source code are stored.

Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/www/LocalSettings.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/www/LocalSettings.php	2012-01-20 17:10:58 UTC (rev 18058)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/www/LocalSettings.php	2012-01-20 17:11:02 UTC (rev 18059)
@@ -124,7 +124,7 @@
 $wgLocalInterwiki   = $wgSitename;
 $wgShowExceptionDetails = true ;
 
-//$wgLanguageCode = strtolower(forge_get_config('default_country_code'));
+/* this is required, as we ship a special MessagesEn.php file into MW */
 $wgLanguageCode = "en";
 $wgDefaultSkin = 'fusionforge';
 //$wgStyleDirectory = '/usr/share/mediawiki/skins';
@@ -298,6 +298,11 @@
 	}
 }
 
+// debian style system-wide mediawiki extensions
+if (is_file("/etc/mediawiki-extensions/extensions.php")) {
+	include("/etc/mediawiki-extensions/extensions.php");
+}
+
 function NoLinkOnMainPage(&$personal_urls) {
 	unset($personal_urls['anonlogin']);
 	unset($personal_urls['anontalk']);
@@ -397,14 +402,16 @@
 
 // drive the LanguageSelector and Polyglot extensions
 $wgLanguageSelectorLocation = LANGUAGE_SELECTOR_MANUAL;
-$wgPolyglotLanguages = explode(" ", $sys_mw_wgPolyglotLanguages);
+//$wgPolyglotLanguages = explode(" ", $sys_mw_wgPolyglotLanguages);
+$wgPolyglotLanguages = array('en', 'de');	// for now
 
 // drive the RSS_Reader extension
 $egCacheDir = "$project_dir/cache/rss";
 $egCache = file_exists($egCacheDir . "/.");
 
-if (file_exists("$wgUploadDirectory/.wgLogo.png"))
+if (file_exists("$wgUploadDirectory/.wgLogo.png")) {
 	$wgLogo = "$wgScriptPath/images/.wgLogo.png";
+}
 
 if (file_exists("$project_dir/private") &&
     file_get_contents($project_dir . "/private") !== "0\n") {
@@ -416,11 +423,6 @@
 	include(forge_get_config('config_path')."/plugins/mediawiki/LocalSettings.php");
 }
 
-// debian style system-wide mediawiki extensions
-if (is_file("/etc/mediawiki-extensions/extensions.php")) {
-        include( "/etc/mediawiki-extensions/extensions.php" );
-}
-
 // forge global settings
 if (is_file("$gconfig_dir/ForgeSettings.php")) {
 	include ("$gconfig_dir/ForgeSettings.php") ;



More information about the evolvis-commits mailing list