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 */