f7526328cb
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@1641 6952d904-891a-0410-993b-d76249ca496b
42 lines
2.0 KiB
Diff
42 lines
2.0 KiB
Diff
diff -uNr simias.orig/src/server/setup/iFolderAdminSetup.cs simias/src/server/setup/iFolderAdminSetup.cs
|
|
--- simias.orig/src/server/setup/iFolderAdminSetup.cs 2009-04-06 19:49:34.819204306 +0200
|
|
+++ simias/src/server/setup/iFolderAdminSetup.cs 2009-04-06 19:54:51.990381096 +0200
|
|
@@ -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.
|
|
@@ -400,7 +403,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();
|
|
|
|
string MachineArch = Environment.GetEnvironmentVariable("MACHINE_ARCH");
|
|
@@ -432,13 +435,6 @@
|
|
{
|
|
sslPrefix = "#";
|
|
}
|
|
- string mod_mono_path = "/etc/apache2/mod_mono.conf";
|
|
- 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}", mod_mono_path );
|
|
- writer.WriteLine();
|
|
writer.WriteLine("Alias /{0} \"{1}\"", alias, webPath);
|
|
writer.WriteLine("AddMonoApplications {0} \"/{0}:{1}\"", alias, webPath);
|
|
|