63 lines
3.0 KiB
Diff
63 lines
3.0 KiB
Diff
|
diff -uNr simias.orig/src/server/setup/iFolderWebSetup.cs simias/src/server/setup/iFolderWebSetup.cs
|
||
|
|
--- simias.orig/src/server/setup/iFolderWebSetup.cs 2009-04-20 08:09:10.061712198 +0200
|
||
|
|
+++ simias/src/server/setup/iFolderWebSetup.cs 2009-04-20 08:12:20.265928077 +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.
|
||
|
|
@@ -150,7 +150,7 @@
|
||
|
|
string MachineArch = Environment.GetEnvironmentVariable("OS_ARCH");
|
||
|
|
webPath = (MachineArch == null) ? Path.GetFullPath("../lib/simias/webaccess"): Path.GetFullPath("../lib64/simias/webaccess");
|
||
|
|
// uid.conf
|
||
|
|
- string path = Path.GetFullPath("/etc/apache2/uid.conf");
|
||
|
|
+ string path = Path.GetFullPath("/etc/apache2/httpd.conf");
|
||
|
|
|
||
|
|
TextReader reader = (TextReader)File.OpenText(path);
|
||
|
|
|
||
|
|
@@ -379,7 +379,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;
|
||
|
|
@@ -415,7 +415,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");
|
||
|
|
@@ -449,16 +449,6 @@
|
||
|
|
{
|
||
|
|
sslPrefix = "#";
|
||
|
|
}
|
||
|
|
- if( Mono2TreePath != null )
|
||
|
|
- writer.WriteLine( "Include {0}", Path.GetFullPath( Path.Combine(Mono2TreePath, "bin/mod_mono.conf")) );
|
||
|
|
- else
|
||
|
|
- {
|
||
|
|
- 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}", "/etc/apache2/mod_mono.conf" );
|
||
|
|
- }
|
||
|
|
writer.WriteLine();
|
||
|
|
writer.WriteLine("Alias /{0} \"{1}\"", alias, webPath);
|
||
|
|
writer.WriteLine("AddMonoApplications {0} \"/{0}:{1}\"", alias, webPath);
|