dbp/ifolder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

www-apps/ifolder3-enterprise: Bump even with flaimdb erros

Browse Source 
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@1642 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
2009-12-05 18:19:29 +00:00
parent f7526328cb
commit e69a6b0fc9
10 changed files with 252 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
www-apps/ifolder3-enterprise/files/ifolder-3.8-admin-setup-1.diff Normal file
View File

@@ -0,0 +1,61 @@
diff -uNr ifolder3-enterprise.orig/src/server/setup/iFolderAdminSetup.cs ifolder3-enterprise/src/server/setup/iFolderAdminSetup.cs
--- ifolder3-enterprise.orig/src/server/setup/iFolderAdminSetup.cs 2009-12-05 18:47:48.574532375 +0100
+++ ifolder3-enterprise/src/server/setup/iFolderAdminSetup.cs 2009-12-05 18:55:04.228283615 +0100
@@ -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/admin"): Path.GetFullPath("../lib64/simias/admin");
// uid.conf
- string path = Path.GetFullPath("/etc/apache2/uid.conf");
+ string path = Path.GetFullPath("/etc/apache2/httpd.conf");
TextReader reader = (TextReader)File.OpenText(path);
@@ -365,7 +365,7 @@
/// </summary>
string ReadModMonoConfiguration()
{
- string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" );
+ string path = Path.GetFullPath( "/etc/simias/apache/gentoo/ifolder_admin.conf" );
string dataPath = null;
if ( path == null || File.Exists( path ) == false )
return null;
@@ -400,7 +400,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();
@@ -434,6 +434,7 @@
{
sslPrefix = "#";
}
+ /*
if( iFolderMonoPath != null )
writer.WriteLine( "Include {0}{1}", iFolderMonoPath, "/etc/apache2/conf.d//mod_mono.conf" );
else
@@ -445,6 +446,7 @@
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);

61
www-apps/ifolder3-enterprise/files/ifolder-3.8-web-setup-1.diff Normal file
View File

@@ -0,0 +1,61 @@
diff -uNr ifolder3-enterprise.orig/src/server/setup/iFolderWebSetup.cs ifolder3-enterprise/src/server/setup/iFolderWebSetup.cs
--- ifolder3-enterprise.orig/src/server/setup/iFolderWebSetup.cs 2009-12-05 18:59:49.630531925 +0100
+++ ifolder3-enterprise/src/server/setup/iFolderWebSetup.cs 2009-12-05 19:01:02.821283510 +0100
@@ -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();
@@ -449,6 +449,7 @@
{
sslPrefix = "#";
}
+ /*
if( iFolderMonoPath != null )
writer.WriteLine( "Include {0}{1}", iFolderMonoPath, "/etc/apache2/conf.d/mod_mono.conf" );
else
@@ -460,6 +461,7 @@
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);
//if (logoutUrl.Value != String.Empty || logoutUrl.Value.Trim () != "" )

38
www-apps/ifolder3-enterprise/files/simias-1.8-mono22-4.patch Normal file
View File

@@ -0,0 +1,38 @@
diff -uNr simias.orig/configure.in simias/configure.in
--- simias.orig/configure.in 2009-07-25 01:01:14.788228670 +0200
+++ simias/configure.in 2009-07-25 01:03:19.218740035 +0200
@@ -32,15 +32,15 @@
linux*)
SIMIAS_OS='linux'
if test "$runasclient" = "TRUE"; then
- AC_CHECK_PROG(CSC, mcs, mcs)
- AC_CHECK_PROG(WSDL, wsdl1, wsdl1,wsdl)
+ AC_CHECK_PROG(CSC, gmcs, gmcs)
+ AC_CHECK_PROG(WSDL, wsdl2, wsdl2,wsdl)
else
AC_CHECK_PROG(WSDL, wsdl, wsdl,wsdl)
if pkg-config --atleast-version=2.4 mono > /dev/null 2>&1
then
AC_CHECK_PROG(CSC, gmcs, gmcs)
else
- AC_CHECK_PROG(CSC, mcs, mcs)
+ AC_CHECK_PROG(CSC, gmcs, gmcs)
fi
fi
test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: gmcs not found in \$PATH])
@@ -73,13 +73,13 @@
AM_CONDITIONAL(DARWIN, test "$SIMIAS_OS" = "darwin")
AM_CONDITIONAL(DARWIN_X86, test "$host_cpu" = "i686")
if test "$runasclient" = "TRUE"; then
- AM_CONDITIONAL(MONO, test "$CSC" = "mcs")
+ AM_CONDITIONAL(MONO, test "$CSC" = "gmcs")
else
if pkg-config --atleast-version=2.4 mono > /dev/null 2>&1
then
AM_CONDITIONAL(MONO, test "$CSC" = "gmcs")
else
- AM_CONDITIONAL(MONO, test "$CSC" = "mcs")
+ AM_CONDITIONAL(MONO, test "$CSC" = "gmcs")
fi
fi
AM_CONDITIONAL(DOTNET, test "$CSC" = "csc")

61
www-apps/ifolder3-enterprise/files/simias-1.8.3-server-setup-1.diff Normal file
View File

@@ -0,0 +1,61 @@
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;