head 1.2; access; symbols OPENPKG_E1_MP:1.1 OPENPKG_E1_MP_HEAD:1.1; locks; strict; comment @# @; 1.2 date 2007.01.26.18.38.55; author rse; state Exp; branches; next 1.1; commitid MXKn0Y5KICVYZ24s; 1.1 date 2006.12.22.15.51.14; author rse; state Exp; branches; next ; commitid LwConaVEU1QccxZr; desc @@ 1.2 log @upgrading package: mediawiki 1.8.3 -> 1.9.1 @ text @Index: config/index.php --- config/index.php.orig 2007-01-24 09:32:59 +0100 +++ config/index.php 2007-01-26 19:37:13 +0100 @@@@ -62,7 +62,7 @@@@ $ourdb['postgres']['havedriver'] = 0; $ourdb['postgres']['compile'] = 'pgsql'; $ourdb['postgres']['bgcolor'] = '#aaccff'; -$ourdb['postgres']['rootuser'] = 'postgres'; +$ourdb['postgres']['rootuser'] = 'postgresql'; ?> @@@@ -422,6 +422,7 @@@@ $conf->diff3 = false; $diff3locations = array_merge( array( + "@@l_prefix@@/bin", "/usr/bin", "/usr/local/bin", "/opt/csw/bin", @@@@ -445,7 +446,7 @@@@ print "
  • GNU diff3 not found.
    • "; $conf->ImageMagick = false; -$imcheck = array( "/usr/bin", "/opt/csw/bin", "/usr/local/bin", "/sw/bin", "/opt/local/bin" ); +$imcheck = array( "@@l_prefix@@/bin", "/usr/bin", "/opt/csw/bin", "/usr/local/bin", "/sw/bin", "/opt/local/bin" ); foreach( $imcheck as $dir ) { $im = "$dir/convert"; if( file_exists( $im ) ) { @@@@ -496,15 +497,15 @@@@ DBserver = importPost( "DBserver", "localhost" ); - $conf->DBname = importPost( "DBname", "wikidb" ); - $conf->DBuser = importPost( "DBuser", "wikiuser" ); - $conf->DBpassword = importPost( "DBpassword" ); - $conf->DBpassword2 = importPost( "DBpassword2" ); + $conf->DBname = importPost( "DBname", "@@l_db_name@@" ); + $conf->DBuser = importPost( "DBuser", "@@l_db_user@@" ); + $conf->DBpassword = importPost( "DBpassword", "@@l_db_pass@@" ); + $conf->DBpassword2 = importPost( "DBpassword2", "@@l_db_pass@@" ); $conf->SysopName = importPost( "SysopName", "WikiSysop" ); $conf->SysopPass = importPost( "SysopPass" ); $conf->SysopPass2 = importPost( "SysopPass2" ); - $conf->RootUser = importPost( "RootUser", "root" ); - $conf->RootPW = importPost( "RootPW", "" ); + $conf->RootUser = importPost( "RootUser", "@@l_db_suser@@" ); + $conf->RootPW = importPost( "RootPW", "@@l_db_spass@@" ); $useRoot = importCheck( 'useroot', false ); ## MySQL specific: @@@@ -561,8 +562,8 @@@@ $conf->RightsIcon = importRequest( "RightsIcon", "" ); } -$conf->Shm = importRequest( "Shm", "none" ); -$conf->MCServers = importRequest( "MCServers" ); +$conf->Shm = importRequest( "Shm", "memcached" ); +$conf->MCServers = importRequest( "MCServers", "127.0.0.1:11211" ); /* Test memcached servers */ @ 1.1 log @new package: mediawiki 1.8.2 (Wikipedia Wiki Engine) @ text @d2 2 a3 2 --- config/index.php.orig 2006-10-14 02:06:36 +0200 +++ config/index.php 2006-12-21 14:18:20 +0100 d13 1 a13 3 @@@@ -431,7 +431,7 @@@@ } d15 7 a21 6 -$diff3locations = array( "/usr/bin", "/usr/local/bin", "/opt/csw/bin", "/usr/gnu/bin", "/usr/sfw/bin" ) + explode( $sep, getenv( "PATH" ) ); +$diff3locations = array( "@@l_prefix@@/bin", "/usr/bin", "/usr/local/bin", "/opt/csw/bin", "/usr/gnu/bin", "/usr/sfw/bin" ) + explode( $sep, getenv( "PATH" ) ); $diff3names = array( "gdiff3", "diff3", "diff3.exe" ); $diff3versioninfo = array( '$1 --version 2>&1', 'diff3 (GNU diffutils)' ); @@@@ -449,7 +449,7 @@@@ d30 1 a30 1 @@@@ -493,15 +493,15 @@@@ d46 1 a46 1 - $conf->RootPW = importPost( "RootPW", "-" ); d49 1 d52 1 a52 2 $conf->DBprefix = importPost( "DBprefix" ); @@@@ -554,8 +554,8 @@@@ @