From dcfd54b7608093d509cd045a152a4cde7317f66f Mon Sep 17 00:00:00 2001
From: onefang
Date: Tue, 8 Sep 2020 21:17:45 +1000
Subject: Move various paths out of the bin directory.

---
 bin/OpenSim.ConsoleClient.exe.config            |  2 +-
 bin/OpenSim.exe.config                          |  5 +++--
 bin/OpenSim.ini.example                         |  4 ++--
 bin/OpenSimDefaults.ini                         | 19 ++++++++++++++-----
 bin/Robust.Tests.dll.config                     |  2 +-
 bin/Robust.exe.config                           |  5 +++--
 bin/config-include/GridCommon.ini.example       |  2 +-
 bin/config-include/StandaloneCommon.ini.example |  2 +-
 8 files changed, 26 insertions(+), 15 deletions(-)

(limited to 'bin')

diff --git a/bin/OpenSim.ConsoleClient.exe.config b/bin/OpenSim.ConsoleClient.exe.config
index 3a50408..6542517 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="OpenSim.ConsoleClient.log" />
+      <file value="../../logs/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 5be6989..690f808 100755
--- a/bin/OpenSim.exe.config
+++ b/bin/OpenSim.exe.config
@@ -24,7 +24,8 @@
 
 <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender:
     <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
-      <file value="log/OpenSim.log" />
+      <threshold value="DEBUG" />
+      <file value="../../logs/OpenSim.log" />
       <rollingStyle value="Date" />
       <datePattern value="'.'yyyy-MM-dd"/>
       ...
@@ -44,7 +45,7 @@
     </appender>
 
     <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="OpenSimStats.log"/>
+      <file value="../../logs/OpenSimStats.log"/>
       <appendToFile value="true" />
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date - %message%newline" />
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 04a4f7d..6129640 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -988,7 +988,7 @@
     ;; co-op will be more stable but this option is currently experimental.
     ;; If moving from co-op to abort, existing script DLLs will need to be recompiled.
     ;; This currently can only be done manually, either by setting DeleteScriptsOnStartup = true for one run
-    ;; or by deleting the script DLL* files in bin/ScriptEngines/<region-id>/
+    ;; or by deleting the script DLL* files in ../../caches/ScriptEngines/<region-id>/
     ;; One can move from co-op back to abort without recompilation, but reverting back to co-op again will need script recompile
     ;; Current valid values are "abort" and "co-op"
     ; ScriptStopStrategy = co-op
@@ -1049,7 +1049,7 @@
 
     ;# {ScriptEnginesPath} {} {Path to script assemblies} {} ScriptEngines
     ;; Path to script engine assemblies
-    ;; Default is ./bin/ScriptEngines
+    ;; Default is ../../caches/ScriptEngines
     ; ScriptEnginesPath = "ScriptEngines"
 
 [OSSL]
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 5d99110..2e680df 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1,6 +1,12 @@
 ; This file contains defaults for various settings in OpenSimulator.  These can be overriden
 ; by changing the same setting in OpenSim.ini (once OpenSim.ini.example has been copied to OpenSim.ini).
 
+
+[Includes]
+    ; Define your server specific constants in this file.
+    Include-Common = ../../config/config.ini
+
+
 [Startup]
     ; Console prompt
     ; Certain special characters can be used to customize the prompt
@@ -13,11 +19,11 @@
     ConsoleHistoryFileEnabled = true
 
     ; Log file location. This can be set to a simple file path
-    ; LogFile = OpenSim.log
+    LogFile = "${Paths|LogPath}/OpenSim.log"
 
     ; The history file can be just a filename (relative to OpenSim's bin/ directory
     ; or it can be a full path to somewhere else. (default is OpenSimConsoleHistory.txt in bin/)
-    ConsoleHistoryFile = "OpenSimConsoleHistory.txt"
+    ConsoleHistoryFile = "${Paths|LogPath}/OpenSimConsoleHistory.txt"
 
     ; How many lines of command history should we keep? (default is 100)
     ConsoleHistoryFileLines = 100
@@ -98,7 +104,7 @@
 
     ; Determines where the region XML files are stored if you are loading these from the filesystem.
     ; Defaults to bin/Regions in your OpenSimulator installation directory
-    ; regionload_regionsdir="C:\somewhere\xmlfiles\"
+    regionload_regionsdir="Regions"
 
     ; Determines the page from which regions xml is retrieved if you are loading these from the web
     ; The XML here has the same format as it does on the filesystem (including the <Root> tag),
@@ -459,6 +465,9 @@
     ; Show NPCs as green world map dots
     ;ShowNPCs = true
 
+    ; where to store cached map tiles.
+    CacheDirectory = "${Paths|CachePath}/MapImageCache"
+
 [Permissions]
     ; ##
     ; ## PERMISSIONS
@@ -1699,7 +1708,7 @@
     default_snapshot_period = 1200
 
     ; This will be created in bin, if it doesn't exist already. It will hold the data snapshots.
-    snapshot_cache_directory = "DataSnapshot"
+    snapshot_cache_directory = "${Paths|CachePath}/DataSnapshot"
 
     ; Uncomment if you want to index your data with this and/or other search providers. One entry per
     ; data service
@@ -1927,7 +1936,7 @@
     ; DisableUndergroundMovement = true
 
     ;; Path to script assemblies
-    ; ScriptEnginesPath = "ScriptEngines"
+    ; ScriptEnginesPath = "${Paths|CachePath}/ScriptEngines"
 
 
 [Concierge]
diff --git a/bin/Robust.Tests.dll.config b/bin/Robust.Tests.dll.config
index a4c43e7..cc0bead 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="Robust.Tests.log" />
+      <file value="../../logs/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 3ad5f31..62ffcc6 100644
--- a/bin/Robust.exe.config
+++ b/bin/Robust.exe.config
@@ -22,7 +22,8 @@
 
 <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender:
     <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
-      <file value="log/Robust.log" />
+      <threshold value="DEBUG" />
+      <file value="../../logs/Robust.log" />
       <rollingStyle value="Date" />
       <datePattern value="'.'yyyy-MM-dd"/>
       ...
@@ -41,7 +42,7 @@
     </appender>
 
     <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="RobustStats.log"/>
+      <file value="../../logs/RobustStats.log"/>
       <appendToFile value="true" />
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date - %message%newline" />
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 46b4ded..3550ed9 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -6,7 +6,7 @@
     ;
 
     ; SQLite
-    Include-Storage = "config-include/storage/SQLiteStandalone.ini";
+    ; Include-Storage = "config-include/storage/SQLiteStandalone.ini";
 
     ; MySql
     ; Uncomment these lines if you want to use mysql storage
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index a4be88e9..906ab84 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -6,7 +6,7 @@
     ;
 
     ; SQLite
-    Include-Storage = "config-include/storage/SQLiteStandalone.ini";
+    ;Include-Storage = "config-include/storage/SQLiteStandalone.ini";
 
     ; MySql
     ; Uncomment these lines if you want to use mysql storage
-- 
cgit v1.1