diff -uNr ifolder3-enterprise.orig/src/server/setup/iFolderWebSetup.cs ifolder3-enterprise/src/server/setup/iFolderWebSetup.cs --- ifolder3-enterprise.orig/src/server/setup/iFolderWebSetup.cs 2009-12-05 18:59:49.630531925 +0100 +++ ifolder3-enterprise/src/server/setup/iFolderWebSetup.cs 2009-12-05 19:01:02.821283510 +0100 @@ -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/webaccess"): Path.GetFullPath("../lib64/simias/webaccess"); // uid.conf - string path = Path.GetFullPath("/etc/apache2/uid.conf"); + string path = Path.GetFullPath("/etc/apache2/httpd.conf"); TextReader reader = (TextReader)File.OpenText(path); @@ -379,7 +379,7 @@ /// string ReadModMonoConfiguration() { - string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" ); + string path = Path.GetFullPath( "/etc/simias/apache/gentoo/simias.conf" ); string dataPath = null; if ( path == null || File.Exists( path ) == false ) return null; @@ -415,7 +415,7 @@ /// void SetupModMono() { - string path = "/etc/apache2/conf.d/ifolder_web.conf"; + string path = "/etc/simias/apache/gentoo/ifolder_web.conf"; string datapath = ReadModMonoConfiguration(); @@ -449,6 +449,7 @@ { sslPrefix = "#"; } + /* if( iFolderMonoPath != null ) writer.WriteLine( "Include {0}{1}", iFolderMonoPath, "/etc/apache2/conf.d/mod_mono.conf" ); else @@ -460,6 +461,7 @@ 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); //if (logoutUrl.Value != String.Empty || logoutUrl.Value.Trim () != "" )