[evolvis-commits] r6935: Evolvis FR [#946] – nightly XML dumps of gf-plugin-mediawiki↵
mirabilos at evolvis.org
mirabilos at evolvis.org
Tue Sep 7 19:04:54 CEST 2010
Author: mirabilos
Date: 2010-09-07 19:04:54 +0200 (Tue, 07 Sep 2010)
New Revision: 6935
Added:
trunk/gforge_base/evolvisforge/gforge/plugins/mediawiki/cronjobs/dump-wikis.sh
Modified:
trunk/gforge_base/evolvisforge/gforge/common/include/utils.php
trunk/gforge_base/evolvisforge/gforge/cron.d/plugin-mediawiki
trunk/gforge_base/evolvisforge/gforge/debian/changelog
trunk/gforge_base/evolvisforge/gforge/dirs/plugin-mediawiki
trunk/gforge_base/evolvisforge/gforge/etc/templates/httpd.vhost.maindir.inc
trunk/gforge_base/evolvisforge/gforge/plugins/mediawiki/etc/httpd.d/03mediawiki
trunk/gforge_base/evolvisforge/gforge/plugins/mediawiki/www/plugin_admin.php
Log:
Evolvis FR [#946] – nightly XML dumps of gf-plugin-mediawiki
Modified: trunk/gforge_base/evolvisforge/gforge/common/include/utils.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/common/include/utils.php 2010-09-07 17:04:52 UTC (rev 6934)
+++ trunk/gforge_base/evolvisforge/gforge/common/include/utils.php 2010-09-07 17:04:54 UTC (rev 6935)
@@ -445,7 +445,7 @@
}
/**
- * util_make_links() - Turn URL's into HREF's.
+ * util_make_links() - Turn URLs into HREFs.
*
* @param string The URL
* @returns The HREF'ed URL
Modified: trunk/gforge_base/evolvisforge/gforge/cron.d/plugin-mediawiki
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/cron.d/plugin-mediawiki 2010-09-07 17:04:52 UTC (rev 6934)
+++ trunk/gforge_base/evolvisforge/gforge/cron.d/plugin-mediawiki 2010-09-07 17:04:54 UTC (rev 6935)
@@ -4,3 +4,6 @@
# Create new wikis four times an hour
*/15 * * * * root [ -x /usr/share/gforge/plugins/mediawiki/cronjobs/create-wikis.sh ] && /usr/share/gforge/plugins/mediawiki/cronjobs/create-wikis.sh
+
+# Create wiki XML dumps every night
+55 1 * * * root [ -x /usr/share/gforge/plugins/mediawiki/cronjobs/dump-wikis.sh ] && /usr/share/gforge/plugins/mediawiki/cronjobs/dump-wikis.sh
Modified: trunk/gforge_base/evolvisforge/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/debian/changelog 2010-09-07 17:04:52 UTC (rev 6934)
+++ trunk/gforge_base/evolvisforge/gforge/debian/changelog 2010-09-07 17:04:54 UTC (rev 6935)
@@ -26,11 +26,13 @@
* Add optional backtraces to the pink-popup error handler
* Correct <base> URI in dumps and $wgServer
* Let plugins/mediawiki/bin/mw-wrapper.php be a superuser/admin
+ * Add nightly XML dumps for all groups’ wikis, downloadable via
+ either a direct link or referenced from MW Plugin Admin page
[ Alain Peyrat ]
* Switch default search type from OR to AND
- -- Thorsten Glaser <tg at mirbsd.de> Tue, 07 Sep 2010 12:23:34 +0200
+ -- Thorsten Glaser <t.glaser at tarent.de> Tue, 07 Sep 2010 12:30:02 +0200
gforge (4.8.3+evolvis24) unstable; urgency=low
Modified: trunk/gforge_base/evolvisforge/gforge/dirs/plugin-mediawiki
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/dirs/plugin-mediawiki 2010-09-07 17:04:52 UTC (rev 6934)
+++ trunk/gforge_base/evolvisforge/gforge/dirs/plugin-mediawiki 2010-09-07 17:04:54 UTC (rev 6935)
@@ -1,10 +1,11 @@
etc/gforge/plugins/mediawiki
etc/mediawiki-extensions/extensions-available
+usr/share/gforge/etc/httpd.d
usr/share/gforge/plugins/mediawiki/bin
usr/share/gforge/plugins/mediawiki/common
usr/share/gforge/plugins/mediawiki/cronjobs
usr/share/gforge/www/plugins/mediawiki
-usr/share/gforge/etc/httpd.d
usr/share/mediawiki/skins
usr/share/mediawiki/skins/fusionforge
+var/lib/gforge/plugins/mediawiki/dumps
var/lib/gforge/plugins/mediawiki/wikidata
Modified: trunk/gforge_base/evolvisforge/gforge/etc/templates/httpd.vhost.maindir.inc
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/etc/templates/httpd.vhost.maindir.inc 2010-09-07 17:04:52 UTC (rev 6934)
+++ trunk/gforge_base/evolvisforge/gforge/etc/templates/httpd.vhost.maindir.inc 2010-09-07 17:04:54 UTC (rev 6935)
@@ -48,6 +48,7 @@
AliasMatch ^/plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/images/(.*) {var_lib_gforge}/plugins/mediawiki/wikidata/$1/images/$2
AliasMatch ^/plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/skins/(.*) /usr/share/mediawiki/skins/$2
AliasMatch ^/plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/extensions/(.*) /var/lib/mediawiki/extensions/$2
+AliasMatch ^/plugins/mediawiki/dumps/(.*)$ /var/lib/gforge/plugins/mediawiki/dumps/$1
Alias /fckeditor/ /usr/share/fckeditor/
<Directory "/usr/share/fckeditor/">
Added: trunk/gforge_base/evolvisforge/gforge/plugins/mediawiki/cronjobs/dump-wikis.sh
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/plugins/mediawiki/cronjobs/dump-wikis.sh (rev 0)
+++ trunk/gforge_base/evolvisforge/gforge/plugins/mediawiki/cronjobs/dump-wikis.sh 2010-09-07 17:04:54 UTC (rev 6935)
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+cd /var/lib/gforge/plugins/mediawiki/wikidata
+for project in *; do
+ test -d "$project/." || continue
+ (php /usr/share/gforge/plugins/mediawiki/bin/mw-wrapper.php \
+ "$project" dumpBackup.php --current --quiet \
+ >../dumps/"$project".xml) 2>&1 | \
+ fgrep -ve 'Cannot modify header information - headers already sent'
+done
Modified: trunk/gforge_base/evolvisforge/gforge/plugins/mediawiki/etc/httpd.d/03mediawiki
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/plugins/mediawiki/etc/httpd.d/03mediawiki 2010-09-07 17:04:52 UTC (rev 6934)
+++ trunk/gforge_base/evolvisforge/gforge/plugins/mediawiki/etc/httpd.d/03mediawiki 2010-09-07 17:04:54 UTC (rev 6935)
@@ -8,6 +8,13 @@
php_admin_value include_path "{sys_custom_path}:{gforge_etc}:{usr_share_gforge}:{usr_share_gforge}/www/include:.:/usr/share/php:/usr/share/pear"
</Directory>
+<Directory {var_lib_gforge}/plugins/mediawiki/dumps>
+ Options -FollowSymLinks +Indexes
+ AllowOverride None
+ order allow,deny
+ allow from all
+</Directory>
+
# some directories must be protected
<DirectoryMatch {var_lib_gforge}/plugins/mediawiki/wikidata/[-a-zA-Z0-9_]*/upload>
Options -FollowSymLinks
Modified: trunk/gforge_base/evolvisforge/gforge/plugins/mediawiki/www/plugin_admin.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/plugins/mediawiki/www/plugin_admin.php 2010-09-07 17:04:52 UTC (rev 6934)
+++ trunk/gforge_base/evolvisforge/gforge/plugins/mediawiki/www/plugin_admin.php 2010-09-07 17:04:54 UTC (rev 6935)
@@ -146,6 +146,12 @@
echo "<h1>MediaWiki Plugin Admin for ".$group->getPublicName()."</h1>\n\n";
+echo "<h2>" . _('Nightly XML dump') . "</h2>\n";
+printf('<p>' .
+ _('<a href="%s">Download</a> the nightly created XML dump (backup) here.') .
+ "</p>\n", util_make_url("/plugins/mediawiki/dumps/" . $group_unix_name .
+ ".xml"));
+
echo "<h2>\$wgLogo</h2>\n";
echo '<div style="border:solid 1px black; margin:3px; padding:3px;">';
if (file_exists($group_logo)) {
More information about the evolvis-commits
mailing list