ifolder/www-apps/ifolder3-enterprise/files/simias-1.8.3-server-setup-1.diff

62 lines
2.6 KiB
Diff
Raw Normal View History

diff -uNr ifolder3-enterprise.orig/src/server/setup/SimiasServerSetup.cs ifolder3-enterprise/src/server/setup/SimiasServerSetup.cs
--- ifolder3-enterprise.orig/src/server/setup/SimiasServerSetup.cs 2009-12-05 19:06:34.834284498 +0100
+++ ifolder3-enterprise/src/server/setup/SimiasServerSetup.cs 2009-12-05 19:10:10.387283893 +0100
@@ -306,12 +306,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.
@@ -891,7 +891,7 @@
try
{
// uid.conf
- using( TextReader reader = (TextReader)File.OpenText( Path.GetFullPath( "/etc/apache2/uid.conf" ) ) )
+ using( TextReader reader = (TextReader)File.OpenText( Path.GetFullPath( "/etc/apache2/httpd.conf" ) ) )
{
string line;
while( ( line = reader.ReadLine() ) != null )
@@ -2313,7 +2313,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.WriteLine("Configuring {0}...", path);
string ModMonoServer2 = Environment.GetEnvironmentVariable("IFOLDER_MOD_MONO_SERVER2_PATH");
string iFolderMonoPath = Environment.GetEnvironmentVariable("IFOLDER_MONO_PATH");
@@ -2338,6 +2338,7 @@
*/
string alias = "simias10";
+ /*
if( iFolderMonoPath != null )
writer.WriteLine( "Include {0}{1}", iFolderMonoPath, "/etc/apache2/conf.d/mod_mono.conf");
else
@@ -2349,6 +2350,7 @@
writer.WriteLine( "Include {0}", "/etc/apache2/mod_mono.conf" );
}
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);
@@ -2389,7 +2391,7 @@
/// </summary>
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;