Move the MG configs to their own file.

4 files changed, 93 insertions, 147 deletions

diff --git a/bin/OpenSim.ini b/bin/OpenSim.ini
index 0087258..bcbed2b 100644
--- a/bin/OpenSim.ini
+++ b/bin/OpenSim.ini
@@ -38,6 +38,12 @@
 ;;    out.
 
 
+
+[Includes]
+    ;; Uncomment this if using this for Misfitz Grid.
+;    Include-Extra = "config-include/extra_MG.ini"
+
+
 [Architecture]
     ;; Uncomment one of the following includes as required.  For instance, to create a standalone OpenSim,
     ;; uncomment Include-Architecture = "config-include/Standalone.ini"
diff --git a/bin/Robust.ini b/bin/Robust.ini
index 34815fb..30e64be 100644
--- a/bin/Robust.ini
+++ b/bin/Robust.ini
@@ -1,61 +1,3 @@
-; * Run
-; * $ Robust.exe -inifile Robust.HG.ini
-; *
-
-; * Configurations for enabling HG1.5
-; *
-; * HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService
-; *                     OpenSim.Server.Handlers.dll:UserAgentService
-; * Additional OpenSim.Server.Handlers.dll:AssetServiceConnector and
-; *            OpenSim.Server.Handlers.dll:XInventoryInConnector
-; * are started in port 8002, outside the firewall
-; *
-; **
-; *
-; * The Const section allows us to define some basic information that we
-; * will use throughout our configuration. We will provide examples for
-; * setting the base url of the Robust server and the public and private ports
-; * it uses. Changing the values of the constants will set the operating
-; * parameters thoughout the configuration. Other constants that may prove
-; * to be useful may be added to the followin section. They may be
-; * referenced anywhere in the configuration by using ${Const|Name}. One
-; * such use is providing a base path for setting locations that Robust
-; * uses to write data.
-; *
-
-[Paths]
-    AssetsPath = "../../AssetFiles"
-    BackupPath = "../../backups"
-    CachePath = "../../caches"
-    ConfigPath = "../../config"
-    DbPath = "../../db"
-    LogPath = "../../logs"
-
-[Const]
-    MOTD = "Welcome to this virtual world."
-
-    GridName = "My virtual world"
-    ShortGridName = "mvw"
-    ; For a grid these will usually be the externally accessible IP/DNS
-    ; name and use default public port 8002 and default private port 8003
-    ; For a standalone this will usually be the externally accessible IP/DNS
-    ; name and use default public port 9000. The private port is not used
-    ; in the configuration for a standalone.
-
-    ;# {BaseURL} {} {BaseURL} {"http://example.com" "http://127.0.0.1"} "http://127.0.0.1"
-    HostName = "localhost"
-    BaseURL = http://127.0.0.1
-    GridURL = http://127.0.0.1
-
-    ;# {PublicPort} {} {PublicPort} {8002 9000} "8002"
-    PublicPort = "8002"
-
-    ; The private port of the Robust server
-    PrivatePort = "8003"
-
-
-    DataProvider = "OpenSim.Data.MySQL.dll"
-    ConnectionString = "Data Source=MYSQL_HOST;Database=MYSQL_DB;User ID=MYSQL_USER;Password=MYSQL_PASSWORD;Old Guids=true;"
 
 ; * The startup section lists all the connectors to start up in this server
 ; * instance. This may be only one, or it may be the entire server suite.
diff --git a/bin/config-include/config_MG.ini b/bin/config-include/config_MG.ini
index 4dd5274..fd812a7 100644
--- a/bin/config-include/config_MG.ini
+++ b/bin/config-include/config_MG.ini
@@ -47,92 +47,3 @@
 
     ; jOpenSim URL
     jOpensimURL = "http://misfitzgrid.com/members"
-
-
-[Network]
-    ;# {ExternalHostNameForLSL} {} {Hostname to use for HTTP-IN URLs. This should be reachable from the internet.} {}
-    ;; Hostname to use in llRequestURL/llRequestSecureURL
-    ;; if not defined - llRequestURL/llRequestSecureURL are disabled
-    ExternalHostNameForLSL = "server2.misfitzgrid.com"
-
-
-[Messaging]
-    ;# {OfflineMessageModule} {} {Module to use for offline message storage} {OfflineMessageModule "Offline Message Module V2" *}
-    ;; Module to handle offline messaging. The core module requires an external
-    ;; web service to do this. See OpenSim wiki.
-     OfflineMessageModule = OfflineMessageModule
-    ;; Or, alternatively, use this one, which works for both standalones and grids
-    ; OfflineMessageModule = "Offline Message Module V2"
-
-    ;# {OfflineMessageURL} {OfflineMessageModule:OfflineMessageModule Offline Message Module V2:Offline Message Module V2} {URL of offline messaging service} {}
-    ;; URL of web service for offline message storage. Leave it commented if your service is local to the sim.
-    ; OfflineMessageURL = ${Const|BaseURL}/Offline.php
-     OfflineMessageURL = ${Const|jOpensimURL}/components/com_opensim/interface.php
-
-
-[DataSnapshot]
-    ;# {index_sims} {} {Enable data snapshotting (search)?} {true false} false
-    ;; The following set of configs pertains to search.
-    ;; Set index_sims to true to enable search engines to index your
-    ;; searchable data.
-    ;; If false, no data will be exposed, DataSnapshot module will be off,
-    ;; and you can ignore the rest of these search-related configs.
-     index_sims = true
-
-    ;# {data_exposure} {index_sims:true} {How much data should be exposed?} {minimum all} minimum
-    ;; The variable data_exposure controls what the regions expose:
-    ;;    minimum: exposes only things explicitly marked for search
-    ;;    all: exposes everything
-     data_exposure = all
-
-    ;; [Supported, but obsolete]
-    ;# {data_services} {index_sims:true} {Data service URLs to register with?} {} http://metaverseink.com/cgi-bin/register.py
-    ; This semicolon-separated string serves to notify specific data services
-    ; about the existence of this sim. Uncomment if you want to index your
-    ; data with this and/or other search providers.
-     data_services="${Const|jOpensimURL}/components/com_opensim/registersearch.php"
-
-
-[Groups]
-    ;# {SecretKey} {ServicesConnectorModule:Groups Remote Service Connector} {Secret key between sim and remote group service} {} ""
-    ;; Used for V2 in Remote only.
-     SecretKey = "Kensentm3"
-
-
-[Search]
-        SearchURL = ${Const|jOpensimURL}/components/com_opensim/interface.php
-
-
-[AuthorizationService]
-    DefaultRegionAccess = "DisallowForeigners"
-    ; If you have regions with access restrictions
-    ; specify them here using the convention
-    ; Region_<Region_Name> = <flags>
-    ; Valid flags are:
-    ; DisallowForeigners -- HG visitors not allowed
-    ; DisallowResidents -- only Admins and Managers allowed
-    ; None -- No restrictions.
-
-    Region_Blue_Moon = "None"
-    Region_MisFitz_ = "None"
-    Region_MisFitz_Continuum = "None"
-    Region_MisFitz_Dev = "None"
-    Region_MisFitz_Getaway = "None"
-    Region_MisFitz_Hyperport = "None"
-    Region_MisFitz_Motion = "None"
-    Region_Misfitz_Nature = "None"
-    Region_MisFitz_Residents1 = "None"
-    Region_MisFitz_Residents2 = "None"
-    Region_MisFitz_Sandbox = "None"
-    Region_MisFitz_Shopping = "None"
-    Region_MisFitz_Welcome = "None"
-    Region_MisFitz_Welcome_Beta = "None"
-    Region_White_Harbor = "None"
-
-[Profile]
-
-    ProfileServiceURL = ${Const|jOpensimURL}/components/com_opensim/interface.php
-    Module = "jOpenSimProfile"
-
-        ; Optional:
-        Debug = true
diff --git a/bin/config-include/extra_MG.ini b/bin/config-include/extra_MG.ini
new file mode 100644
index 0000000..3fe8a13
--- /dev/null
+++ b/bin/config-include/extra_MG.ini
@@ -0,0 +1,87 @@
+[Network]
+    ;# {ExternalHostNameForLSL} {} {Hostname to use for HTTP-IN URLs. This should be reachable from the internet.} {}
+    ;; Hostname to use in llRequestURL/llRequestSecureURL
+    ;; if not defined - llRequestURL/llRequestSecureURL are disabled
+    ExternalHostNameForLSL = "server2.misfitzgrid.com"
+
+
+[Messaging]
+    ;# {OfflineMessageModule} {} {Module to use for offline message storage} {OfflineMessageModule "Offline Message Module V2" *}
+    ;; Module to handle offline messaging. The core module requires an external
+    ;; web service to do this. See OpenSim wiki.
+     OfflineMessageModule = OfflineMessageModule
+    ;; Or, alternatively, use this one, which works for both standalones and grids
+    ; OfflineMessageModule = "Offline Message Module V2"
+
+    ;# {OfflineMessageURL} {OfflineMessageModule:OfflineMessageModule Offline Message Module V2:Offline Message Module V2} {URL of offline messaging service} {}
+    ;; URL of web service for offline message storage. Leave it commented if your service is local to the sim.
+    ; OfflineMessageURL = ${Const|BaseURL}/Offline.php
+     OfflineMessageURL = ${Const|jOpensimURL}/components/com_opensim/interface.php
+
+
+[DataSnapshot]
+    ;# {index_sims} {} {Enable data snapshotting (search)?} {true false} false
+    ;; The following set of configs pertains to search.
+    ;; Set index_sims to true to enable search engines to index your
+    ;; searchable data.
+    ;; If false, no data will be exposed, DataSnapshot module will be off,
+    ;; and you can ignore the rest of these search-related configs.
+     index_sims = true
+
+    ;# {data_exposure} {index_sims:true} {How much data should be exposed?} {minimum all} minimum
+    ;; The variable data_exposure controls what the regions expose:
+    ;;    minimum: exposes only things explicitly marked for search
+    ;;    all: exposes everything
+     data_exposure = all
+
+    ;; [Supported, but obsolete]
+    ;# {data_services} {index_sims:true} {Data service URLs to register with?} {} http://metaverseink.com/cgi-bin/register.py
+    ; This semicolon-separated string serves to notify specific data services
+    ; about the existence of this sim. Uncomment if you want to index your
+    ; data with this and/or other search providers.
+     data_services="${Const|jOpensimURL}/components/com_opensim/registersearch.php"
+
+
+[Groups]
+    ;# {SecretKey} {ServicesConnectorModule:Groups Remote Service Connector} {Secret key between sim and remote group service} {} ""
+    ;; Used for V2 in Remote only.
+     SecretKey = "Kensentm3"
+
+
+[Search]
+        SearchURL = ${Const|jOpensimURL}/components/com_opensim/interface.php
+
+
+[AuthorizationService]
+    DefaultRegionAccess = "DisallowForeigners"
+    ; If you have regions with access restrictions
+    ; specify them here using the convention
+    ; Region_<Region_Name> = <flags>
+    ; Valid flags are:
+    ; DisallowForeigners -- HG visitors not allowed
+    ; DisallowResidents -- only Admins and Managers allowed
+    ; None -- No restrictions.
+
+    Region_Blue_Moon = "None"
+    Region_MisFitz_ = "None"
+    Region_MisFitz_Continuum = "None"
+    Region_MisFitz_Dev = "None"
+    Region_MisFitz_Getaway = "None"
+    Region_MisFitz_Hyperport = "None"
+    Region_MisFitz_Motion = "None"
+    Region_Misfitz_Nature = "None"
+    Region_MisFitz_Residents1 = "None"
+    Region_MisFitz_Residents2 = "None"
+    Region_MisFitz_Sandbox = "None"
+    Region_MisFitz_Shopping = "None"
+    Region_MisFitz_Welcome = "None"
+    Region_MisFitz_Welcome_Beta = "None"
+    Region_White_Harbor = "None"
+
+[Profile]
+
+    ProfileServiceURL = ${Const|jOpensimURL}/components/com_opensim/interface.php
+    Module = "jOpenSimProfile"
+
+        ; Optional:
+        Debug = true