ifolder/www-apps/ifolder-server/files/ifolder-3.7-web-setup.diff

42 lines
2.1 KiB
Diff
Raw Normal View History

diff -uNr simias.orig/src/server/setup/iFolderWebSetup.cs simias/src/server/setup/iFolderWebSetup.cs
--- simias.orig/src/server/setup/iFolderWebSetup.cs 2009-04-06 19:57:18.302251000 +0200
+++ simias/src/server/setup/iFolderWebSetup.cs 2009-04-06 20:01:01.853674639 +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.
@@ -415,7 +418,7 @@
/// </summary>
void SetupModMono()
{
- string path = "/etc/apache2/conf.d/ifolder_web.conf";
+ string path = "/etc/simias/apache/gentoo/ifolder_web.conf";
string datapath = ReadModMonoConfiguration();
string MachineArch = Environment.GetEnvironmentVariable("MACHINE_ARCH");
@@ -447,13 +450,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);
if (logoutUrl.Value != String.Empty || logoutUrl.Value.Trim () != "" )