ifolder/www-apps/ifolder3-enterprise/files/3.8.4/serverpaths_from_configure_v2.patch

136 lines
5.7 KiB
Diff
Raw Normal View History

submitted https://bugzilla.novell.com/show_bug.cgi?id=608882
Index: simias-1.8.3.10200.stable/src/core/SimiasClient/SimiasSetup.cs.in
===================================================================
--- simias-1.8.3.10200.stable.orig/src/core/SimiasClient/SimiasSetup.cs.in 2010-04-15 10:16:23.000000000 -0400
+++ simias-1.8.3.10200.stable/src/core/SimiasClient/SimiasSetup.cs.in 2010-07-19 12:37:33.315199428 -0400
@@ -58,6 +58,8 @@ namespace Simias.Client
// custom setup paths
private static string _webdir = "@webdir@";
+ private static string _admindir = "@admindir@"; // defined in toplevel configure.in
+ private static string _webaccessdir = "@webaccessdir@"; // defined in toplevel configure.in
private static string _webbindir = "@webbindir@";
private static string _modulesdir = "@modulesdir@";
private static string _bootstrapdir = "@bootstrapdir@";
@@ -134,6 +136,8 @@ namespace Simias.Client
_sharedstatedir = Path.GetFullPath(_sharedstatedir.Replace(_prefix, value));
_sysconfdir = Path.GetFullPath(_sysconfdir.Replace(_prefix, value));
_webdir = Path.GetFullPath(_webdir.Replace(_prefix, value));
+ _admindir = Path.GetFullPath(_admindir.Replace(_prefix, value));
+ _webaccessdir = Path.GetFullPath(_webaccessdir.Replace(_prefix, value));
_webbindir = Path.GetFullPath(_webbindir.Replace(_prefix, value));
_modulesdir = Path.GetFullPath(_modulesdir.Replace(_prefix, value));
_bootstrapdir = Path.GetFullPath(_bootstrapdir.Replace(_prefix, value));
@@ -251,6 +255,22 @@ namespace Simias.Client
}
/// <summary>
+ /// admindir
+ /// </summary>
+ public static string admindir
+ {
+ get { return _admindir; }
+ }
+
+ /// <summary>
+ /// webaccessdir
+ /// </summary>
+ public static string webaccessdir
+ {
+ get { return _webaccessdir; }
+ }
+
+ /// <summary>
/// modulesdir
/// </summary>
public static string modulesdir
Index: simias-1.8.3.10200.stable/src/server/setup/SimiasServerSetup.cs
===================================================================
--- simias-1.8.3.10200.stable.orig/src/server/setup/SimiasServerSetup.cs 2010-07-19 12:37:01.265198310 -0400
+++ simias-1.8.3.10200.stable/src/server/setup/SimiasServerSetup.cs 2010-07-19 12:37:33.315199428 -0400
@@ -95,7 +95,7 @@ namespace Novell.iFolder
#region Member Fields
#if MONO
- string webPath = Path.GetFullPath("../lib/simias/web");
+ string webPath = Path.Combine( SimiasSetup.webdir, "" ); // find better method!
#endif
/// <summary>
@@ -820,7 +820,7 @@ Console.WriteLine("Url {0}", service.Url
}
string MachineArch = Environment.GetEnvironmentVariable("OS_ARCH");
- webPath =( MachineArch == null )? Path.GetFullPath("../lib/simias/web"): Path.GetFullPath("../lib64/simias/web");
+ webPath = Path.Combine( SimiasSetup.webdir, ""); // find better methods!
// restore policy
// ServicePointManager.CertificatePolicy = policy;
Index: simias-1.8.3.10200.stable/src/server/setup/iFolderAdminSetup.cs
===================================================================
--- simias-1.8.3.10200.stable.orig/src/server/setup/iFolderAdminSetup.cs 2010-07-19 12:34:17.565198869 -0400
+++ simias-1.8.3.10200.stable/src/server/setup/iFolderAdminSetup.cs 2010-07-19 12:37:33.315199428 -0400
@@ -42,6 +42,7 @@ using System.Text.RegularExpressions;
using System.Security.Cryptography;
using Novell.iFolder.Utility;
+using Simias.Client; // for SimiasSetup.admindir
namespace Novell.iFolderApp.Web
{
@@ -59,9 +60,9 @@ namespace Novell.iFolderApp.Web
/// Web Path
/// </summary>
#if MONO
- string webPath = Path.GetFullPath("../lib/simias/admin");
+ string webPath = Path.Combine(SimiasSetup.admindir, "");
#else
- string webPath = Path.GetFullPath("./admin");
+ string webPath = Path.Combine(SimiasSetup.admindir, "");
#endif
#region Options
@@ -148,7 +149,7 @@ namespace Novell.iFolderApp.Web
try
{
string MachineArch = Environment.GetEnvironmentVariable("OS_ARCH");
- webPath =( MachineArch == null )? Path.GetFullPath("../lib/simias/admin"): Path.GetFullPath("../lib64/simias/admin");
+ webPath = Path.Combine(SimiasSetup.admindir, ""); // lib vs lib64 set in configure.in
// uid.conf
string path = Path.GetFullPath("/etc/apache2/uid.conf");
Index: simias-1.8.3.10200.stable/src/server/setup/iFolderWebSetup.cs
===================================================================
--- simias-1.8.3.10200.stable.orig/src/server/setup/iFolderWebSetup.cs 2010-07-19 12:34:21.005197750 -0400
+++ simias-1.8.3.10200.stable/src/server/setup/iFolderWebSetup.cs 2010-07-19 12:37:33.315199428 -0400
@@ -42,6 +42,7 @@ using System.Text.RegularExpressions;
using System.Security.Cryptography;
using Novell.iFolder.Utility;
+using Simias.Client; // for SimiasSetup.webaccessdir
namespace Novell.iFolderApp.Web
{
@@ -59,9 +60,9 @@ namespace Novell.iFolderApp.Web
/// Web Path
/// </summary>
#if MONO
- string webPath = Path.GetFullPath("../lib/simias/webaccess");
+ string webPath = Path.Combine(SimiasSetup.webaccessdir, "");
#else
- string webPath = Path.GetFullPath("./webaccess");
+ string webPath = Path.Combine(SimiasSetup.webaccessdir, "");
#endif
#region Options
@@ -176,7 +177,7 @@ namespace Novell.iFolderApp.Web
try
{
string MachineArch = Environment.GetEnvironmentVariable("OS_ARCH");
- webPath = (MachineArch == null) ? Path.GetFullPath("../lib/simias/webaccess"): Path.GetFullPath("../lib64/simias/webaccess");
+ webPath = Path.Combine(SimiasSetup.webaccessdir, ""); // lib vs lib64 set in configure.in
// uid.conf
string path = Path.GetFullPath("/etc/apache2/uid.conf");