62 lines
2.9 KiB
Diff
62 lines
2.9 KiB
Diff
|
diff -uNr ifolder3-enterprise.orig/src/server/setup/iFolderAdminSetup.cs ifolder3-enterprise/src/server/setup/iFolderAdminSetup.cs
|
||
|
|
--- ifolder3-enterprise.orig/src/server/setup/iFolderAdminSetup.cs 2009-12-05 18:47:48.574532375 +0100
|
||
|
|
+++ ifolder3-enterprise/src/server/setup/iFolderAdminSetup.cs 2009-12-05 18:55:04.228283615 +0100
|
||
|
|
@@ -99,12 +99,12 @@
|
||
|
|
/// <summary>
|
||
|
|
/// Apache User.
|
||
|
|
/// </summary>
|
||
|
|
- 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");
|
||
|
|
|
||
|
|
/// <summary>
|
||
|
|
/// Apache Group.
|
||
|
|
/// </summary>
|
||
|
|
- 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");
|
||
|
|
|
||
|
|
/// <summary>
|
||
|
|
/// 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 @@
|
||
|
|
/// </summary>
|
||
|
|
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 @@
|
||
|
|
/// </summary>
|
||
|
|
void SetupModMono()
|
||
|
|
{
|
||
|
|
- string path = "/etc/apache2/conf.d/ifolder_admin.conf";
|
||
|
|
+ string path = "/etc/simias/apache/gentoo/ifolder_admin.conf";
|
||
|
|
string datapath = ReadModMonoConfiguration();
|
||
|
|
|
||
|
|
|
||
|
|
@@ -434,6 +434,7 @@
|
||
|
|
{
|
||
|
|
sslPrefix = "#";
|
||
|
|
}
|
||
|
|
+ /*
|
||
|
|
if( iFolderMonoPath != null )
|
||
|
|
writer.WriteLine( "Include {0}{1}", iFolderMonoPath, "/etc/apache2/conf.d//mod_mono.conf" );
|
||
|
|
else
|
||
|
|
@@ -445,6 +446,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);
|
||
|
|
|