diff -uNr simias.orig/src/server/setup/SimiasServerSetup.cs simias/src/server/setup/SimiasServerSetup.cs --- simias.orig/src/server/setup/SimiasServerSetup.cs 2009-04-20 08:15:08.228832251 +0200 +++ simias/src/server/setup/SimiasServerSetup.cs 2009-04-20 08:19:45.906975519 +0200 @@ -307,12 +307,12 @@ /// /// Apache User. /// - public Option apacheUser = new Option("apache-user", "Apache User", "Apache User", false, "wwwrun"); + public Option apacheUser = new Option("apache-user", "Apache User", "Apache User", false, "apache"); /// /// Apache Group. /// - public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group", false, "www"); + public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group", false, "apache"); /// /// Prompt for options. @@ -892,7 +892,7 @@ try { // uid.conf - using( TextReader reader = (TextReader)File.OpenText( Path.GetFullPath( "/etc/apache2/uid.conf" ) ) ) + using( TextReader reader = (TextReader)File.OpenText( Path.GetFullPath( "/etc/apache2/httpd.conf" ) ) ) { string line; while( ( line = reader.ReadLine() ) != null ) @@ -2288,7 +2288,7 @@ /// void SetupModMono() { - string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" ); + string path = Path.GetFullPath( "/etc/simias/apache/gentoo/simias.conf" ); Console.Write("Configuring {0}...", path); string Mono2TreePath = Environment.GetEnvironmentVariable("LOCAL_MONO_RUNTIME_PATH"); @@ -2312,17 +2312,6 @@ */ string alias = "simias10"; - if( Mono2TreePath != null ) - writer.WriteLine( "Include {0}", Path.GetFullPath( Path.Combine(Mono2TreePath, "bin/mod_mono.conf")) ); - else - { - string mod_mono2_path = "/etc/apache2/conf.d/mod_mono.conf"; - if( File.Exists( mod_mono2_path )) - writer.WriteLine( "Include {0}", mod_mono2_path ); - else - writer.WriteLine( "Include {0}", "/etc/apache2/mod_mono.conf" ); - } - writer.WriteLine(); writer.WriteLine("Alias /{0} \"{1}\"", alias, SimiasSetup.webdir); writer.WriteLine("AddMonoApplications {0} \"/{0}:{1}\"", alias, SimiasSetup.webdir); writer.WriteLine("MonoSetEnv {0} \"SimiasRunAsServer=true;SimiasDataDir={1}\"", alias, this.storePath);