Major tweaking of the scripts to suit the new setup.

4 files changed, 74 insertions, 94 deletions

diff --git a/bin/config-include/config.ini.IG_example  b/bin/config-include/config.ini.IG_example 
deleted file mode 100644
index 710ccae..0000000
--- a/bin/config-include/config.ini.IG_example 
+++ /dev/null
@@ -1,54 +0,0 @@
-; **
-; * 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.
-
-; Also put grid specific stuff here.
-
-
-[Paths]
-    AssetsPath = "../../AssetFiles"
-    BackupPath = "../../backups"
-    CachePath = "../../caches"
-    DbPath = "../../db"
-    LogPath = "../../logs"
-
-
-[Const]
-;    MOTD = "onefang needs a little coding or sysadmin work to keep IG going.  Please help me find some."
-    MOTD = "More members are coming, slowly.  Invite your friends to."
-
-    GridName = "Infinite Grid"
-    ShortGridName = "IG"
-
-    ; 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"
-    BaseHostname = "http://grid.infinitegrid.org"
-    HostName = "grid.infinitegrid.org"
-    BaseURL = http://grid.infinitegrid.org
-    GridURL = http://grid.infinitegrid.org
-
-    ;# {PublicPort} {} {PublicPort} {8002 9000} "8002"
-    PublicPort = "8002"
-
-    ;# {PrivatePort} {} {PrivatePort} {8003} "8003"
-    PrivatePort = "8003"
-
-
-    DataProvider = "OpenSim.Data.MySQL.dll"
-    ConnectionString = "Data Source=localhost;Database=****;User ID=****;Password=****;Old Guids=true;"
-
-
-    ; The public port of the Robust server -- THIS IS SPECIAL PORT FOR ASSSET SERVER
-    AssetServerPort = "8003"
diff --git a/bin/config-include/config_IG.ini b/bin/config-include/config_IG.ini
new file mode 100644
index 0000000..3ec215c
--- /dev/null
+++ b/bin/config-include/config_IG.ini
@@ -0,0 +1,46 @@
+ 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.
+
+; Also put grid specific stuff here.
+
+
+[Paths]
+    AssetsPath = "../../AssetFiles"
+    BackupPath = "../../backups"
+    CachePath = "../../caches"
+    DbPath = "../../db"
+    LogPath = "../../logs"
+
+
+[Const]
+    MOTD = "onefang needs a little coding or sysadmin work to keep IG going.  Please help me find some."
+
+    GridName = "Infinite Grid"
+    ShortGridName = "IG"
+
+    ; 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.
+    BaseHostname = "http://grid.infinitegrid.org"
+    HostName = "grid.infinitegrid.org"
+    BaseURL = ${Const|BaseHostname}
+    GridURL = ${Const|BaseHostname}
+
+    PublicPort = "8002"
+    PrivatePort = "8003"
+
+    ; The public port of the ROBUST asset server, which might be different.
+    AssetServerPort = "8003"
+
+    ; Database credentials.
+    DataProvider = "OpenSim.Data.MySQL.dll"
+    ConnectionString = "Data Source=MYSQL_HOST;Database=MYSQL_DB;User ID=MYSQL_USER;Password=MYSQL_PASSWORD;Old Guids=true;"
diff --git a/bin/config-include/config.ini.MG_example b/bin/config-include/config_MG.ini
index 737bff4..4f675d7 100644
--- a/bin/config-include/config.ini.MG_example
+++ b/bin/config-include/config_MG.ini
@@ -1,13 +1,12 @@
-; **
-; * 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.
+ 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.
 
 ; Also put grid specific stuff here.
 
@@ -31,28 +30,23 @@
     ; 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"
     BaseHostname = "http://misfitzgrid.com"
     HostName = "misfitzgrid.com"
-    BaseURL = http://misfitzgrid.com
-    GridURL = http://misfitzgrid.com
+    BaseURL = ${Const|BaseHostname}
+    GridURL = ${Const|BaseHostname}
 
-    ;# {PublicPort} {} {PublicPort} {8002 9000} "8002"
     PublicPort = "8002"
-
-    ;# {PrivatePort} {} {PrivatePort} {8003} "8003"
     PrivatePort = "8003"
 
+    ; The public port of the ROBUST asset server, which might be different.
+    AssetServerPort = "8003"
 
+    ; Database credentials.
     DataProvider = "OpenSim.Data.MySQL.dll"
-    ConnectionString = "Data Source=localhost;Database=****;User ID=****;Password=****;Old Guids=true;"
-
+    ConnectionString = "Data Source=MYSQL_HOST;Database=MYSQL_DB;User ID=MYSQL_USER;Password=MYSQL_PASSWORD;Old Guids=true;"
 
     ; jOpenSim URL
     jOpensimURL = "http://misfitzgrid.com/members"
-    ; The public port of the Robust server -- THIS IS SPECIAL PORT FOR ASSSET SERVER
-    AssetServerPort = "8004"
 
 
 [Network]
diff --git a/bin/config-include/config.ini.localhost_example b/bin/config-include/config_localhost.ini
index aa26abd..31f2f2c 100644
--- a/bin/config-include/config.ini.localhost_example
+++ b/bin/config-include/config_localhost.ini
@@ -1,13 +1,12 @@
-; **
-; * 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.
+; ** 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.
 
 ; Also put grid specific stuff here.
 
@@ -31,22 +30,17 @@
     ; 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.
-
     BaseHostname = "127.0.0.1"
     HostName = "localhost"
     BaseURL = http://${Const|BaseHostname}
     GridURL = http://${Const|BaseHostname}
 
-    ;# {PublicPort} {} {PublicPort} {8002 9000} "8002"
     PublicPort = "8002"
-
-    ;# {PrivatePort} {} {PrivatePort} {8003} "8003"
     PrivatePort = "8003"
 
+    ; The public port of the ROBUST asset server, which might be different.
+    AssetServerPort = "8003"
 
+    ; Database credentials.
     DataProvider = "OpenSim.Data.MySQL.dll"
-    ConnectionString = "Data Source=localhost;Database=****;User ID=****;Password=****;Old Guids=true;"
-
-
-    ; The public port of the Robust server -- THIS IS SPECIAL PORT FOR ASSSET SERVER
-    AssetServerPort = "8003"
+    ConnectionString = "Data Source=MYSQL_HOST;Database=MYSQL_DB;User ID=MYSQL_USER;Password=MYSQL_PASSWORD;Old Guids=true;"