diff -uNr simias.orig/src/server/setup/iFolderAdminSetup.cs simias/src/server/setup/iFolderAdminSetup.cs --- simias.orig/src/server/setup/iFolderAdminSetup.cs 2009-04-20 07:50:52.102027111 +0200 +++ simias/src/server/setup/iFolderAdminSetup.cs 2009-04-20 08:05:06.621986960 +0200 @@ -99,12 +99,12 @@ /// /// Apache User. /// - public Option apacheUser = new Option("apache-user", "Apache User", "Apache User to use for providing permissions", false, "wwwrun"); + public Option apacheUser = new Option("apache-user", "Apache User", "Apache User to use for providing permissions", false, "apache"); /// /// Apache Group. /// - public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group to use for providing permissions", false, "www"); + public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group to use for providing permissions", false, "apache"); /// /// The port to connect on. @@ -150,7 +150,7 @@ string MachineArch = Environment.GetEnvironmentVariable("OS_ARCH"); webPath =( MachineArch == null )? Path.GetFullPath("../lib/simias/admin"): Path.GetFullPath("../lib64/simias/admin"); // uid.conf - string path = Path.GetFullPath("/etc/apache2/uid.conf"); + string path = Path.GetFullPath("/etc/apache2/httpd.conf"); TextReader reader = (TextReader)File.OpenText(path); @@ -365,7 +365,7 @@ /// string ReadModMonoConfiguration() { - string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" ); + string path = Path.GetFullPath( "/etc/simias/apache/gentoo/ifolder_admin.conf" ); string dataPath = null; if ( path == null || File.Exists( path ) == false ) return null; @@ -400,7 +400,7 @@ /// void SetupModMono() { - string path = "/etc/apache2/conf.d/ifolder_admin.conf"; + string path = "/etc/simias/apache/gentoo/ifolder_admin.conf"; string datapath = ReadModMonoConfiguration(); string MachineArch = Environment.GetEnvironmentVariable("MACHINE_ARCH"); @@ -434,17 +434,6 @@ { sslPrefix = "#"; } - 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, webPath); writer.WriteLine("AddMonoApplications {0} \"/{0}:{1}\"", alias, webPath);