Move more stuff into the var directory.

37 files changed, 42 insertions, 37 deletions

diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index cc449af..187ed4f 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1306,12 +1306,12 @@ namespace OpenSim.Framework
 
         public static string dbDir()
         {
-            return Path.Combine("..", Path.Combine("..", "db"));
+            return Path.Combine("..", Path.Combine("..", "var/lib/db"));
         }
 
         public static string cacheDir()
         {
-            return Path.Combine("..", Path.Combine("..", "caches"));
+            return Path.Combine("..", Path.Combine("..", "var/cache"));
         }
 
         public static string configDir()
@@ -1327,7 +1327,7 @@ namespace OpenSim.Framework
 
         public static string logsDir()
         {
-            return Path.Combine("..", "logs");
+            return Path.Combine("..", "var/log");
         }
 
         public static string webDir()
diff --git a/OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs b/OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs
index 6c42e2e..b1c85c8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
             string dirName = myDomain.FriendlyName;
             string ScriptEnginesPath = myDomain.SetupInformation.PrivateBinPath;
 
-            string[] pathList = new string[] {"", "caches", ScriptEnginesPath,
+            string[] pathList = new string[] {"", "var/cache", ScriptEnginesPath,
                                               Path.Combine(ScriptEnginesPath, dirName)};
 
             string assemblyName = args.Name;
diff --git a/OpenSim/Tests/Robust/Server/DemonServer.cs b/OpenSim/Tests/Robust/Server/DemonServer.cs
index 41c2185..fa0c958 100644
--- a/OpenSim/Tests/Robust/Server/DemonServer.cs
+++ b/OpenSim/Tests/Robust/Server/DemonServer.cs
@@ -48,8 +48,8 @@ namespace Robust.Tests
         [SetUp]
         public void StartDemon()
         {
-            if (File.Exists("../../logs/Robust.Tests.log"))
-                File.Delete("../../logs/Robust.Tests.log");
+            if (File.Exists("../../var/log/Robust.Tests.log"))
+                File.Delete("../../var/log/Robust.Tests.log");
 
             Console.WriteLine("**** Starting demon Robust server ****");
             m_demon = new Thread( () => Main(new string[] {"-inifile=Robust.Tests.ini"}));
diff --git a/bin/OpenSim.ConsoleClient.exe.config b/bin/OpenSim.ConsoleClient.exe.config
index 6542517..b117c3c 100644
--- a/bin/OpenSim.ConsoleClient.exe.config
+++ b/bin/OpenSim.ConsoleClient.exe.config
@@ -18,7 +18,7 @@
     </appender>
 
     <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="../../logs/OpenSim.ConsoleClient.log" />
+      <file value="../../var/log/OpenSim.ConsoleClient.log" />
       <appendToFile value="true" />
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date %-5level - %logger %message%newline" />
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config
index ed250b3..1f2ef14 100644
--- a/bin/OpenSim.exe.config
+++ b/bin/OpenSim.exe.config
@@ -23,7 +23,7 @@
 
     <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
       <threshold value="DEBUG" />
-      <file value="../../logs/OpenSim.log" />
+      <file value="../../var/log/OpenSim.log" />
       <rollingStyle value="Date" />
       <datePattern value="'.'yyyy-MM-dd"/>
       <appendToFile value="true" />
@@ -37,7 +37,7 @@
     </appender>
 
     <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="../../logs/OpenSimStats.log"/>
+      <file value="../../var/log/OpenSimStats.log"/>
       <appendToFile value="true" />
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date - %message%newline" />
diff --git a/bin/Robust.Tests.dll.config b/bin/Robust.Tests.dll.config
index cc0bead..f327ee8 100644
--- a/bin/Robust.Tests.dll.config
+++ b/bin/Robust.Tests.dll.config
@@ -22,7 +22,7 @@
     </appender>
 
     <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="../../logs/Robust.Tests.log" />
+      <file value="../../var/log/Robust.Tests.log" />
       <appendToFile value="true" />
       <filter type="log4net.Filter.LoggerMatchFilter">
         <loggerToMatch value="special"/>
diff --git a/bin/Robust.exe.config b/bin/Robust.exe.config
index f5379ff..d3c835f 100644
--- a/bin/Robust.exe.config
+++ b/bin/Robust.exe.config
@@ -23,7 +23,7 @@
 
     <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
       <threshold value="DEBUG" />
-      <file value="../../logs/Robust.log" />
+      <file value="../../var/log/Robust.log" />
       <rollingStyle value="Date" />
       <datePattern value="'.'yyyy-MM-dd"/>
       <appendToFile value="true" />
@@ -37,7 +37,7 @@
     </appender>
 
     <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="../../logs/RobustStats.log"/>
+      <file value="../../var/log/RobustStats.log"/>
       <appendToFile value="true" />
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date - %message%newline" />
diff --git a/bin/Robust.ini b/bin/Robust.ini
index 34d996b..9c54de7 100644
--- a/bin/Robust.ini
+++ b/bin/Robust.ini
@@ -42,7 +42,7 @@
 [Startup]
     ; Place to create a PID file
     ; If no path if specified then a PID file is not created.
-    PIDFile = "${Paths|CachePath}/ROBUST.pid"
+    PIDFile = "${Paths|PIDPath}/ROBUST.pid"
 
     ; Plugin Registry Location
     ; Set path to directory for plugin registry. Information
diff --git a/bin/config-include/config_DG.ini b/bin/config-include/config_DG.ini
index 59e54cd..27178c2 100644
--- a/bin/config-include/config_DG.ini
+++ b/bin/config-include/config_DG.ini
@@ -13,11 +13,12 @@
 
 [Paths]
     AssetsPath = "../../AssetFiles"
-    BackupPath = "../../backups"
-    CachePath = "../../caches"
+    BackupPath = "../../var/backups"
+    CachePath = "../../var/cache"
     ConfigPath = "../../config"
-    DbPath = "../../db"
-    LogPath = "../../logs"
+    DbPath = "../../var/lib/db"
+    LogPath = "../../var/log"
+    PIDPath = "../../var/run"
     WebPath = "../../web"
 
 [Const]
diff --git a/bin/config-include/config_IG.ini b/bin/config-include/config_IG.ini
index d1f1e19..ce43cbd 100644
--- a/bin/config-include/config_IG.ini
+++ b/bin/config-include/config_IG.ini
@@ -13,11 +13,12 @@
 
 [Paths]
     AssetsPath = "../../AssetFiles"
-    BackupPath = "../../backups"
-    CachePath = "../../caches"
+    BackupPath = "../../var/backups"
+    CachePath = "../../var/cache"
     ConfigPath = "../../config"
-    DbPath = "../../db"
-    LogPath = "../../logs"
+    DbPath = "../../var/lib/db"
+    LogPath = "../../var/log"
+    PIDPath = "../../var/run"
     WebPath = "../../web"
 
 [Const]
diff --git a/bin/config-include/config_MG.ini b/bin/config-include/config_MG.ini
index be46dc2..59eb2f1 100644
--- a/bin/config-include/config_MG.ini
+++ b/bin/config-include/config_MG.ini
@@ -13,11 +13,12 @@
 
 [Paths]
     AssetsPath = "../../AssetFiles"
-    BackupPath = "../../backups"
-    CachePath = "../../caches"
+    BackupPath = "../../var/backups"
+    CachePath = "../../var/cache"
     ConfigPath = "../../config"
-    DbPath = "../../db"
-    LogPath = "../../logs"
+    DbPath = "../../var/lib/db"
+    LogPath = "../../var/log"
+    PIDPath = "../../var/run"
     WebPath = "../../web"
 
 [Const]
diff --git a/bin/config-include/config_localhost.ini b/bin/config-include/config_localhost.ini
index 830f173..7abd30e 100644
--- a/bin/config-include/config_localhost.ini
+++ b/bin/config-include/config_localhost.ini
@@ -13,11 +13,12 @@
 
 [Paths]
     AssetsPath = "../../AssetFiles"
-    BackupPath = "../../backups"
-    CachePath = "../../caches"
+    BackupPath = "../../var/backups"
+    CachePath = "../../var/cache"
     ConfigPath = "../../config"
-    DbPath = "../../db"
-    LogPath = "../../logs"
+    DbPath = "../../var/lib/db"
+    LogPath = "../../var/log"
+    PIDPath = "../../var/run"
     WebPath = "../../web"
 
 [Const]
diff --git a/example/backups/.keep b/example/config/ROBUST/.keep
index e69de29..e69de29 100644
--- a/example/backups/.keep
+++ b/example/config/ROBUST/.keep
diff --git a/example/config/config.ini b/example/config/config.ini
index e95b04c..03182fa 100644
--- a/example/config/config.ini
+++ b/example/config/config.ini
@@ -13,11 +13,12 @@
 
 [Paths]
     AssetsPath = "../../AssetFiles"
-    BackupPath = "../../backups"
-    CachePath = "../../caches"
+    BackupPath = "../../var/backups"
+    CachePath = "../../var/cache"
     ConfigPath = "../../config"
-    DbPath = "../../db"
-    LogPath = "../../logs"
+    DbPath = "../../var/lib/db"
+    LogPath = "../../var/log"
+    PIDPath = "../../var/run"
     WebPath = "../../web"
 
 [Const]
diff --git a/example/caches/.keep b/example/var/.keep
index e69de29..e69de29 100644
--- a/example/caches/.keep
+++ b/example/var/.keep
diff --git a/example/caches/DataSnapshot/.keep b/example/var/backups/.keep
index e69de29..e69de29 100644
--- a/example/caches/DataSnapshot/.keep
+++ b/example/var/backups/.keep
diff --git a/example/backups/DefaultMember.IAR b/example/var/backups/Default_Member.IAR
index 67b95cf..cfddb83 100644
--- a/example/backups/DefaultMember.IAR
+++ b/example/var/backups/Default_Member.IAR
diff --git a/example/caches/MapImageCache/.keep b/example/var/cache/.keep
index e69de29..e69de29 100644
--- a/example/caches/MapImageCache/.keep
+++ b/example/var/cache/.keep
diff --git a/example/caches/MeshCache/.keep b/example/var/cache/DataSnapshot/.keep
index e69de29..e69de29 100644
--- a/example/caches/MeshCache/.keep
+++ b/example/var/cache/DataSnapshot/.keep
diff --git a/example/caches/ScriptEngines/.keep b/example/var/cache/MapImageCache/.keep
index e69de29..e69de29 100644
--- a/example/caches/ScriptEngines/.keep
+++ b/example/var/cache/MapImageCache/.keep
diff --git a/example/caches/addin-db-001/.keep b/example/var/cache/MeshCache/.keep
index e69de29..e69de29 100644
--- a/example/caches/addin-db-001/.keep
+++ b/example/var/cache/MeshCache/.keep
diff --git a/example/caches/addin-db-002/.keep b/example/var/cache/ScriptEngines/.keep
index e69de29..e69de29 100644
--- a/example/caches/addin-db-002/.keep
+++ b/example/var/cache/ScriptEngines/.keep
diff --git a/example/caches/addin-db-003/.keep b/example/var/cache/addin-db-001/.keep
index e69de29..e69de29 100644
--- a/example/caches/addin-db-003/.keep
+++ b/example/var/cache/addin-db-001/.keep
diff --git a/example/caches/addin-db-004/.keep b/example/var/cache/addin-db-002/.keep
index e69de29..e69de29 100644
--- a/example/caches/addin-db-004/.keep
+++ b/example/var/cache/addin-db-002/.keep
diff --git a/example/caches/assetcache/.keep b/example/var/cache/addin-db-003/.keep
index e69de29..e69de29 100644
--- a/example/caches/assetcache/.keep
+++ b/example/var/cache/addin-db-003/.keep
diff --git a/example/caches/assetcache/j2k/.keep b/example/var/cache/addin-db-004/.keep
index e69de29..e69de29 100644
--- a/example/caches/assetcache/j2k/.keep
+++ b/example/var/cache/addin-db-004/.keep
diff --git a/example/caches/bakes/.keep b/example/var/cache/assetcache/.keep
index e69de29..e69de29 100644
--- a/example/caches/bakes/.keep
+++ b/example/var/cache/assetcache/.keep
diff --git a/example/caches/j2kDecodeCache/.keep b/example/var/cache/assetcache/j2k/.keep
index e69de29..e69de29 100644
--- a/example/caches/j2kDecodeCache/.keep
+++ b/example/var/cache/assetcache/j2k/.keep
diff --git a/example/caches/maptiles/.keep b/example/var/cache/bakes/.keep
index e69de29..e69de29 100644
--- a/example/caches/maptiles/.keep
+++ b/example/var/cache/bakes/.keep
diff --git a/example/db/.keep b/example/var/cache/j2kDecodeCache/.keep
index e69de29..e69de29 100644
--- a/example/db/.keep
+++ b/example/var/cache/j2kDecodeCache/.keep
diff --git a/example/logs/.keep b/example/var/cache/maptiles/.keep
index e69de29..e69de29 100644
--- a/example/logs/.keep
+++ b/example/var/cache/maptiles/.keep
diff --git a/example/var/lib/.keep b/example/var/lib/.keep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/example/var/lib/.keep
diff --git a/example/var/lib/db/.keep b/example/var/lib/db/.keep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/example/var/lib/db/.keep
diff --git a/example/var/lib/users/.keep b/example/var/lib/users/.keep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/example/var/lib/users/.keep
diff --git a/example/var/log/.keep b/example/var/log/.keep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/example/var/log/.keep
diff --git a/example/var/run/.keep b/example/var/run/.keep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/example/var/run/.keep
diff --git a/src/sledjchisl/sledjchisl.c b/src/sledjchisl/sledjchisl.c
index 79a3b57..1bcf873 100644
--- a/src/sledjchisl/sledjchisl.c
+++ b/src/sledjchisl/sledjchisl.c
@@ -1623,7 +1623,7 @@ int checkSimIsRunning(char *sim)
   struct stat st;
 
   // Check if it's running.
-  char *path = xmprintf("%s/caches/%s.pid", scRoot, sim);
+  char *path = xmprintf("%s/%s.pid", scRun, sim);
   if (0 == stat(path, &st))
   {
     int fd, i;
@@ -1651,7 +1651,7 @@ int checkSimIsRunning(char *sim)
           if (0 != WEXITSTATUS(i))      // No such pid.
           {
             free(path);
-            path = xmprintf("rm -f %s/caches/%s.pid", scRoot, sim);
+            path = xmprintf("rm -f %s/%s.pid", scRun, sim);
             d("%s", path);
             i = system(path);
             if (WIFEXITED(i))
@@ -1672,7 +1672,7 @@ int checkSimIsRunning(char *sim)
 
   // Now check if it's really really running.  lol
   free(path);
-  path = xmprintf("%s/caches/%s.pid", scRoot, sim);
+  path = xmprintf("%s/%s.pid", scRun, sim);
   if (0 == stat(path, &st))
   {
     D("checkSimIsRunning(%s) -> %s is really really running.", sim, path);
@@ -1745,7 +1745,7 @@ void prepSims(simData *simd, char *sim, char *type, int count, int window, int p
     " -e 's@\\[Region\\]@"
     "    paneID = \"\\%s\"\\n"
     "\\[Startup\\]\\n"
-    "    PIDFile = \"\\$\\{Paths\\|CachePath\\}\\/\\$\\{Const\\|mysim\\}\\.pid\"\\n"
+    "    PIDFile = \"\\$\\{Paths\\|PIDPath\\}\\/\\$\\{Const\\|mysim\\}\\.pid\"\\n"
     "    LogFile = \"\\$\\{Paths\\|LogPath\\}\\/OpenSim_\\$\\{Const\\|mysim\\}\\.log\"\\n"
     "    StatsLogFile = \"\\$\\{Paths\\|LogPath\\}\\/OpenSimStats_\\$\\{Const\\|mysim\\}\\.log\"\\n"
     "    ConsoleHistoryFile = \"\\$\\{Paths\\|LogPath\\}\\/OpenSimConsoleHistory_\\$\\{Const\\|mysim\\}\\.txt\"\\n"