[mb-commits] r11047 - in mb_server/branches/TemplateToolkit/lib: . MusicBrainz/Server

[root at musicbrainz.org]

Author: robert
Date: 2009-01-14 00:36:46 +0000 (Wed, 14 Jan 2009)
New Revision: 11047

Modified:
   mb_server/branches/TemplateToolkit/lib/DBDefs.pm.default
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/WikiTransclusion.pm
Log:
Fixed the paths for WikiDocs to work. In order to get WikiDocs showing for a RT_STANDALONE machine, do this:

    cd <mb_server-tt>/root/static/wikidocs
    curl http://musicbrainz.org/generated/wikitrans-index > index.txt

After this, the documentation index should be loadable.


Modified: mb_server/branches/TemplateToolkit/lib/DBDefs.pm.default
===================================================================
--- mb_server/branches/TemplateToolkit/lib/DBDefs.pm.default	2009-01-14 00:21:36 UTC (rev 11046)
+++ mb_server/branches/TemplateToolkit/lib/DBDefs.pm.default	2009-01-14 00:36:46 UTC (rev 11047)
@@ -132,10 +132,9 @@
 ################################################################################
 # Documentation Server Settings
 ################################################################################
-sub WIKIDOC_SERVER	 { "wikidocs.musicbrainz.org" }
 sub WIKITRANS_SERVER	 { "wiki.musicbrainz.org" }
-sub WIKITRANS_INDEX_FILE { MB_SERVER_ROOT() . "/htdocs/generated/wikitrans-index" }
-sub WIKITRANS_INDEX_URL  { "http://musicbrainz.org/generated/wikitrans-index" }
+sub WIKITRANS_INDEX_FILE { MB_SERVER_ROOT() . "/root/static/wikidocs/index.txt" }
+sub WIKITRANS_INDEX_URL  { "http://musicbrainz.org/static/wikidocs/index.txt" }
 
 ################################################################################
 # Cache Settings

Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/WikiTransclusion.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/WikiTransclusion.pm	2009-01-14 00:21:36 UTC (rev 11046)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/WikiTransclusion.pm	2009-01-14 00:36:46 UTC (rev 11047)
@@ -111,7 +111,7 @@
     my $index;
 
     # Get index from cache, if we have it
-    if (1) #!($index = MusicBrainz::Server::Cache->get(WIKIDOCS_INDEX)))
+    if (!($index = MusicBrainz::Server::Cache->get(WIKIDOCS_INDEX)))
     {
         if (&DBDefs::REPLICATION_TYPE == RT_SLAVE)
         {