42 lines
1.8 KiB
Diff
42 lines
1.8 KiB
Diff
diff -uNr simias.orig/src/server/setup/SimiasServerSetup.cs simias/src/server/setup/SimiasServerSetup.cs
|
|
--- simias.orig/src/server/setup/SimiasServerSetup.cs 2009-04-06 20:02:53.607688672 +0200
|
|
+++ simias/src/server/setup/SimiasServerSetup.cs 2009-04-06 20:05:04.892943722 +0200
|
|
@@ -307,12 +307,12 @@
|
|
/// <summary>
|
|
/// Apache User.
|
|
/// </summary>
|
|
- public Option apacheUser = new Option("apache-user", "Apache User", "Apache User", false, "wwwrun");
|
|
+ public Option apacheUser = new Option("apache-user", "Apache User", "Apache User", false, "apache");
|
|
|
|
/// <summary>
|
|
/// Apache Group.
|
|
/// </summary>
|
|
- public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group", false, "www");
|
|
+ public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group", false, "apache");
|
|
|
|
/// <summary>
|
|
/// Prompt for options.
|
|
@@ -2288,7 +2291,7 @@
|
|
/// </summary>
|
|
void SetupModMono()
|
|
{
|
|
- string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" );
|
|
+ string path = Path.GetFullPath( "/etc/simias/apache/gentoo/simias.conf" );
|
|
Console.Write("Configuring {0}...", path);
|
|
|
|
if ( apache.Value == true )
|
|
@@ -2312,13 +2315,6 @@
|
|
|
|
string alias = "simias10";
|
|
|
|
- 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, SimiasSetup.webdir);
|
|
writer.WriteLine("AddMonoApplications {0} \"/{0}:{1}\"", alias, SimiasSetup.webdir);
|
|
writer.WriteLine("MonoSetEnv {0} \"SimiasRunAsServer=true;SimiasDataDir={1}\"", alias, this.storePath);
|