From 64dfe62fab804be64cc29cc0c821e7abac1d946d Mon Sep 17 00:00:00 2001 From: onefang Date: Sun, 19 May 2019 23:10:15 +1000 Subject: Make examples directory, and shuffle all the out of tree stuff into it. --- example/AssetFiles/.keep | 0 example/AssetFiles/data/.keep | 0 example/AssetFiles/tmp/.keep | 0 example/AssetFiles/tmp/spool/.keep | 0 example/backups/.keep | 0 example/caches/.keep | 0 example/caches/DataSnapshot/.keep | 0 example/caches/MapImageCache/.keep | 0 example/caches/ScriptEngines/.keep | 0 example/caches/addin-db-001/.keep | 0 example/caches/addin-db-002/.keep | 0 example/caches/addin-db-003/.keep | 0 example/caches/addin-db-004/.keep | 0 example/caches/assetcache/.keep | 0 example/caches/assetcache/j2k/.keep | 0 example/caches/bakes/.keep | 0 example/caches/j2kDecodeCache/.keep | 0 example/caches/maptiles/.keep | 0 example/config/ROBUST/opensim-monit.conf | 36 ++++++++++++++++++++++ example/config/config.ini | 42 ++++++++++++++++++++++++++ example/config/sim_skeleton/My_sim.xml | 13 ++++++++ example/config/sim_skeleton/ThisSim.ini | 10 ++++++ example/config/sim_skeleton/opensim-monit.conf | 29 ++++++++++++++++++ example/db/.keep | 0 example/logs/.keep | 0 25 files changed, 130 insertions(+) create mode 100644 example/AssetFiles/.keep create mode 100644 example/AssetFiles/data/.keep create mode 100644 example/AssetFiles/tmp/.keep create mode 100644 example/AssetFiles/tmp/spool/.keep create mode 100644 example/backups/.keep create mode 100644 example/caches/.keep create mode 100644 example/caches/DataSnapshot/.keep create mode 100644 example/caches/MapImageCache/.keep create mode 100644 example/caches/ScriptEngines/.keep create mode 100644 example/caches/addin-db-001/.keep create mode 100644 example/caches/addin-db-002/.keep create mode 100644 example/caches/addin-db-003/.keep create mode 100644 example/caches/addin-db-004/.keep create mode 100644 example/caches/assetcache/.keep create mode 100644 example/caches/assetcache/j2k/.keep create mode 100644 example/caches/bakes/.keep create mode 100644 example/caches/j2kDecodeCache/.keep create mode 100644 example/caches/maptiles/.keep create mode 100644 example/config/ROBUST/opensim-monit.conf create mode 100644 example/config/config.ini create mode 100644 example/config/sim_skeleton/My_sim.xml create mode 100644 example/config/sim_skeleton/ThisSim.ini create mode 100644 example/config/sim_skeleton/opensim-monit.conf create mode 100644 example/db/.keep create mode 100644 example/logs/.keep (limited to 'example') diff --git a/example/AssetFiles/.keep b/example/AssetFiles/.keep new file mode 100644 index 0000000..e69de29 diff --git a/example/AssetFiles/data/.keep b/example/AssetFiles/data/.keep new file mode 100644 index 0000000..e69de29 diff --git a/example/AssetFiles/tmp/.keep b/example/AssetFiles/tmp/.keep new file mode 100644 index 0000000..e69de29 diff --git a/example/AssetFiles/tmp/spool/.keep b/example/AssetFiles/tmp/spool/.keep new file mode 100644 index 0000000..e69de29 diff --git a/example/backups/.keep b/example/backups/.keep new file mode 100644 index 0000000..e69de29 diff --git a/example/caches/.keep b/example/caches/.keep new file mode 100644 index 0000000..e69de29 diff --git a/example/caches/DataSnapshot/.keep b/example/caches/DataSnapshot/.keep new file mode 100644 index 0000000..e69de29 diff --git a/example/caches/MapImageCache/.keep b/example/caches/MapImageCache/.keep new file mode 100644 index 0000000..e69de29 diff --git a/example/caches/ScriptEngines/.keep b/example/caches/ScriptEngines/.keep new file mode 100644 index 0000000..e69de29 diff --git a/example/caches/addin-db-001/.keep b/example/caches/addin-db-001/.keep new file mode 100644 index 0000000..e69de29 diff --git a/example/caches/addin-db-002/.keep b/example/caches/addin-db-002/.keep new file mode 100644 index 0000000..e69de29 diff --git a/example/caches/addin-db-003/.keep b/example/caches/addin-db-003/.keep new file mode 100644 index 0000000..e69de29 diff --git a/example/caches/addin-db-004/.keep b/example/caches/addin-db-004/.keep new file mode 100644 index 0000000..e69de29 diff --git a/example/caches/assetcache/.keep b/example/caches/assetcache/.keep new file mode 100644 index 0000000..e69de29 diff --git a/example/caches/assetcache/j2k/.keep b/example/caches/assetcache/j2k/.keep new file mode 100644 index 0000000..e69de29 diff --git a/example/caches/bakes/.keep b/example/caches/bakes/.keep new file mode 100644 index 0000000..e69de29 diff --git a/example/caches/j2kDecodeCache/.keep b/example/caches/j2kDecodeCache/.keep new file mode 100644 index 0000000..e69de29 diff --git a/example/caches/maptiles/.keep b/example/caches/maptiles/.keep new file mode 100644 index 0000000..e69de29 diff --git a/example/config/ROBUST/opensim-monit.conf b/example/config/ROBUST/opensim-monit.conf new file mode 100644 index 0000000..70190b9 --- /dev/null +++ b/example/config/ROBUST/opensim-monit.conf @@ -0,0 +1,36 @@ +# manage the OpenSim process for Your Sim +# +# usage: +# monit start your_sim +# monit stop your_sim +# monit restart your_sim +# +# see 'daemon' setting in /etc/monit/monitrc for the cycle length. +# on ubuntu/debian, this is overridden by the CHECK_INTERVALS var in +# /etc/default/monit . the below assumes you've set it to 30 seconds. +# +# if process dies, will restart sim within 30 seconds. if process +# dies 5 times in as many tries, will stop trying and send email +# alert. +# +# if SimFPS drops to 0 for 2 minutes, restart. +# +# if process CPU usage stays above 300% for 2 minutes, restart. +# +# see ../README for configuration instructions. +# +# Hmmmm, seems that monit changing to a user and running bash -l is different from sudo changing to a user and running bash -l. +# +check process ROBUST with pidfile /var/run/opensim/ROBUST.pid + start program = "/usr/bin/sudo -Hu opensim /bin/bash -lc 'cd /opt/opensim/config/ROBUST && /opt/opensim/config/ROBUST/start-sim -q'" + as uid root and gid root + stop program = "/usr/bin/sudo -Hu opensim /bin/bash -lc 'cd /opt/opensim/config/ROBUST && /opt/opensim/config/ROBUST/stop-sim'" with timeout 600 seconds + if cpu usage > 50% for 4 cycles then restart +# if 5 restarts within 5 cycles then timeout +# if failed url http://127.0.0.1:9005/jsonSimStats/ +# and content != '"SimFPS":0.0,' for 4 cycles +# then restart +# if failed url http://127.0.0.1:9008/jsonSimStats/ +# and content == '"SimFPS":' for 4 cycles +# then restart + diff --git a/example/config/config.ini b/example/config/config.ini new file mode 100644 index 0000000..99d3c96 --- /dev/null +++ b/example/config/config.ini @@ -0,0 +1,42 @@ +; ** +; * 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. + + +[Const] + MOTD = "Welcome to this virtual world." + + AssetsPath = "../../AssetFiles" + CachePath = "../../caches" + ConfigPath = "../../config" + + GridName = "My virtual world" + + ; 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://grid.infinitegrid.org + + ;# {PublicPort} {} {PublicPort} {8002 9000} "8002" + PublicPort = "8002" + + ;# {PrivatePort} {} {PrivatePort} {8003} "8003" + 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;" + diff --git a/example/config/sim_skeleton/My_sim.xml b/example/config/sim_skeleton/My_sim.xml new file mode 100644 index 0000000..c5723f3 --- /dev/null +++ b/example/config/sim_skeleton/My_sim.xml @@ -0,0 +1,13 @@ + +
+ + + + + + + + + +
+ diff --git a/example/config/sim_skeleton/ThisSim.ini b/example/config/sim_skeleton/ThisSim.ini new file mode 100644 index 0000000..2f691f0 --- /dev/null +++ b/example/config/sim_skeleton/ThisSim.ini @@ -0,0 +1,10 @@ +[Const] + mysim="SIM_NUMBER" + +[Startup] + PIDFile = "/var/run/opensim/sim${Const|mysim}.pid" + regionload_regionsdir="/opt/opensim/config/sim${Const|mysim}" + LogFile = "../logs/OpenSim_sim${Const|mysim}.log" + +[Network] + http_listener_port = SIM_PORT diff --git a/example/config/sim_skeleton/opensim-monit.conf b/example/config/sim_skeleton/opensim-monit.conf new file mode 100644 index 0000000..ac50fc2 --- /dev/null +++ b/example/config/sim_skeleton/opensim-monit.conf @@ -0,0 +1,29 @@ +# manage the OpenSim process for Your Sim +# +# usage: +# monit start your_sim +# monit stop your_sim +# monit restart your_sim +# +# see 'daemon' setting in /etc/monit/monitrc for the cycle length. +# on ubuntu/debian, this is overridden by the CHECK_INTERVALS var in +# /etc/default/monit . the below assumes you've set it to 30 seconds. +# +# see ../README for configuration instructions. +# +# Hmmmm, seems that monit changing to a user and running bash -l is different from sudo changing to a user and running bash -l. +# +check process simSIM_NUMBER with pidfile /var/run/opensim/simSIM_NUMBER.pid + start program = "/usr/bin/sudo -Hu opensim /bin/bash -lc 'cd /opt/opensim/config/simSIM_NUMBER && /opt/opensim/config/simSIM_NUMBER/start-sim -q'" + as uid root and gid root + stop program = "/usr/bin/sudo -Hu opensim /bin/bash -lc 'cd /opt/opensim/config/simSIM_NUMBER && /opt/opensim/config/simSIM_NUMBER/stop-sim'" with timeout 600 seconds + if cpu usage > 50% for 4 cycles then restart + if MEMORY usage > 25% for 4 cycles then restart +# if 5 restarts within 5 cycles then timeout +# if failed url http://127.0.0.1:9005/jsonSimStats/ +# and content != '"SimFPS":0.0,' for 4 cycles +# then restart +# if failed url http://127.0.0.1:9008/jsonSimStats/ +# and content == '"SimFPS":' for 4 cycles +# then restart + depends on ROBUST diff --git a/example/db/.keep b/example/db/.keep new file mode 100644 index 0000000..e69de29 diff --git a/example/logs/.keep b/example/logs/.keep new file mode 100644 index 0000000..e69de29 -- cgit v1.1 From f0c22c54556b6c3e474b0197c9b7d47fc28cea3c Mon Sep 17 00:00:00 2001 From: onefang Date: Sun, 19 May 2019 23:15:55 +1000 Subject: Example sim startup script. --- example/start.sh | 4 ++++ 1 file changed, 4 insertions(+) create mode 100755 example/start.sh (limited to 'example') diff --git a/example/start.sh b/example/start.sh new file mode 100755 index 0000000..ce36d59 --- /dev/null +++ b/example/start.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +cd /opt/opensim-IG/current/bin +mono OpenSim.exe -inidirectory=../../config/simg01 -- cgit v1.1 From 12c77ddcb76af916c3fe15c05cc9f1688b4cd3d3 Mon Sep 17 00:00:00 2001 From: onefang Date: Mon, 20 May 2019 17:56:12 +1000 Subject: Update example config.ini. --- example/config/config.ini | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'example') diff --git a/example/config/config.ini b/example/config/config.ini index 99d3c96..3890e66 100644 --- a/example/config/config.ini +++ b/example/config/config.ini @@ -9,15 +9,22 @@ ; * such use is providing a base path for setting locations that Robust ; * uses to write data. +; Also put grid specific stuff here. -[Const] - MOTD = "Welcome to this virtual world." +[Paths] AssetsPath = "../../AssetFiles" + BackupPath = "../../backups" CachePath = "../../caches" - ConfigPath = "../../config" + DbPath = "../../db" + LogPath = "../../logs" + - GridName = "My virtual world" +[Const] + MOTD = "Welcome to your local grid." + + GridName = "localhost Grid" + ShortGridName = "lg" ; For a grid these will usually be the externally accessible IP/DNS ; name and use default public port 8002 and default private port 8003 @@ -25,10 +32,10 @@ ; 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 = "127.0.0.1" HostName = "localhost" - BaseURL = http://127.0.0.1 - GridURL = http://grid.infinitegrid.org + BaseURL = http://${Const|BaseHostname} + GridURL = http://${Const|BaseHostname} ;# {PublicPort} {} {PublicPort} {8002 9000} "8002" PublicPort = "8002" @@ -40,3 +47,6 @@ DataProvider = "OpenSim.Data.MySQL.dll" ConnectionString = "Data Source=MYSQL_HOST;Database=MYSQL_DB;User ID=MYSQL_USER;Password=MYSQL_PASSWORD;Old Guids=true;" + + ; The public port of the Robust server -- THIS IS SPECIAL PORT FOR ASSSET SERVER + AssetServerPort = "8003" -- cgit v1.1 From ca7a2ed839f8fec5a7d7abbf50fc2c031f192fb5 Mon Sep 17 00:00:00 2001 From: onefang Date: Wed, 22 May 2019 19:14:35 +1000 Subject: Major tweaking of the scripts to suit the new setup. --- example/caches/MeshCache/.keep | 0 example/config/ROBUST/opensim-monit.conf | 6 +++--- example/config/config.ini | 30 +++++++++++--------------- example/config/sim_skeleton/My_sim.xml | 7 ++++++ example/config/sim_skeleton/ThisSim.ini | 21 +++++++++++++++--- example/config/sim_skeleton/opensim-monit.conf | 8 +++---- example/start.sh | 2 +- 7 files changed, 45 insertions(+), 29 deletions(-) create mode 100644 example/caches/MeshCache/.keep (limited to 'example') diff --git a/example/caches/MeshCache/.keep b/example/caches/MeshCache/.keep new file mode 100644 index 0000000..e69de29 diff --git a/example/config/ROBUST/opensim-monit.conf b/example/config/ROBUST/opensim-monit.conf index 70190b9..adce46d 100644 --- a/example/config/ROBUST/opensim-monit.conf +++ b/example/config/ROBUST/opensim-monit.conf @@ -21,10 +21,10 @@ # # Hmmmm, seems that monit changing to a user and running bash -l is different from sudo changing to a user and running bash -l. # -check process ROBUST with pidfile /var/run/opensim/ROBUST.pid - start program = "/usr/bin/sudo -Hu opensim /bin/bash -lc 'cd /opt/opensim/config/ROBUST && /opt/opensim/config/ROBUST/start-sim -q'" +check process ROBUST with pidfile OS_PATH/caches/ROBUST.pid + start program = "/usr/bin/sudo -Hu opensim /bin/bash -lc 'cd OS_PATH/config/ROBUST && OS_PATH/config/ROBUST/start-sim -q'" as uid root and gid root - stop program = "/usr/bin/sudo -Hu opensim /bin/bash -lc 'cd /opt/opensim/config/ROBUST && /opt/opensim/config/ROBUST/stop-sim'" with timeout 600 seconds + stop program = "/usr/bin/sudo -Hu opensim /bin/bash -lc 'cd OS_PATH/config/ROBUST && OS_PATH/config/ROBUST/stop-sim'" with timeout 600 seconds if cpu usage > 50% for 4 cycles then restart # if 5 restarts within 5 cycles then timeout # if failed url http://127.0.0.1:9005/jsonSimStats/ diff --git a/example/config/config.ini b/example/config/config.ini index 3890e66..510c8b6 100644 --- a/example/config/config.ini +++ b/example/config/config.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. +; 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. @@ -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=MYSQL_HOST;Database=MYSQL_DB;User ID=MYSQL_USER;Password=MYSQL_PASSWORD;Old Guids=true;" - - - ; The public port of the Robust server -- THIS IS SPECIAL PORT FOR ASSSET SERVER - AssetServerPort = "8003" diff --git a/example/config/sim_skeleton/My_sim.xml b/example/config/sim_skeleton/My_sim.xml index c5723f3..f71df57 100644 --- a/example/config/sim_skeleton/My_sim.xml +++ b/example/config/sim_skeleton/My_sim.xml @@ -9,5 +9,12 @@ + + + + + + + diff --git a/example/config/sim_skeleton/ThisSim.ini b/example/config/sim_skeleton/ThisSim.ini index 2f691f0..140cf3b 100644 --- a/example/config/sim_skeleton/ThisSim.ini +++ b/example/config/sim_skeleton/ThisSim.ini @@ -2,9 +2,24 @@ mysim="SIM_NUMBER" [Startup] - PIDFile = "/var/run/opensim/sim${Const|mysim}.pid" - regionload_regionsdir="/opt/opensim/config/sim${Const|mysim}" - LogFile = "../logs/OpenSim_sim${Const|mysim}.log" + PIDFile = "${Paths|CachePath}/sim${Const|mysim}.pid" + LogFile = "${Paths|LogPath}/OpenSim_sim${Const|mysim}.log" + ConsoleHistoryFile = "${Paths|LogPath}/OpenSimConsoleHistory_sim${Const|mysim}.txt" + regionload_regionsdir="../../config/sim${Const|mysim}" + +[Map] + enablePosition = true + ; Only texture prims that have a diagonal size greater than this number. + TexturePrimSize = 1 [Network] http_listener_port = SIM_PORT + +[Performance] + ;; Select the performance characteristirs of OpenSim. + ; Include-Performance = "config-include/SimFast.ini" + Include-Performance = "config-include/SimBalanced.ini" + ; Include-Performance = "config-include/SimDefault.ini" + ; Include-Performance = "config-include/SimLean.ini" + │ 2621 mysql 20 0 4131620 483696 17640 S 0.3 2.9 8:07.82 /usr/sbin/mysqld --basedir=/usr --datadir=/var/lib/mysql --plugin-dir=/usr/lib/x86_64-linux-gnu/mariadb18/plugin --user=m+ + \ No newline at end of file diff --git a/example/config/sim_skeleton/opensim-monit.conf b/example/config/sim_skeleton/opensim-monit.conf index ac50fc2..fd9220f 100644 --- a/example/config/sim_skeleton/opensim-monit.conf +++ b/example/config/sim_skeleton/opensim-monit.conf @@ -13,12 +13,12 @@ # # Hmmmm, seems that monit changing to a user and running bash -l is different from sudo changing to a user and running bash -l. # -check process simSIM_NUMBER with pidfile /var/run/opensim/simSIM_NUMBER.pid - start program = "/usr/bin/sudo -Hu opensim /bin/bash -lc 'cd /opt/opensim/config/simSIM_NUMBER && /opt/opensim/config/simSIM_NUMBER/start-sim -q'" +check process simSIM_NUMBER with pidfile OS_PATH/caches/simSIM_NUMBER.pid + start program = "/usr/bin/sudo -Hu opensim /bin/bash -lc 'cd OS_PATH/config/simSIM_NUMBER && OS_PATH/config/simSIM_NUMBER/start-sim -q'" as uid root and gid root - stop program = "/usr/bin/sudo -Hu opensim /bin/bash -lc 'cd /opt/opensim/config/simSIM_NUMBER && /opt/opensim/config/simSIM_NUMBER/stop-sim'" with timeout 600 seconds + stop program = "/usr/bin/sudo -Hu opensim /bin/bash -lc 'cd OS_PATH/config/simSIM_NUMBER && OS_PATH/config/simSIM_NUMBER/stop-sim'" with timeout 600 seconds if cpu usage > 50% for 4 cycles then restart - if MEMORY usage > 25% for 4 cycles then restart + if MEMORY usage > 10% for 4 cycles then restart # if 5 restarts within 5 cycles then timeout # if failed url http://127.0.0.1:9005/jsonSimStats/ # and content != '"SimFPS":0.0,' for 4 cycles diff --git a/example/start.sh b/example/start.sh index ce36d59..d6ef48d 100755 --- a/example/start.sh +++ b/example/start.sh @@ -1,4 +1,4 @@ #!/bin/bash -cd /opt/opensim-IG/current/bin +cd /opt/opensim_SC/current/bin mono OpenSim.exe -inidirectory=../../config/simg01 -- cgit v1.1 From f921cb712e67893b44496192e5297335ed65caf7 Mon Sep 17 00:00:00 2001 From: onefang Date: Tue, 28 May 2019 06:19:38 +1000 Subject: Add [Region] .ini block. For including actual region definition in the normal .ini stack. Same as the usual Region.ini format, except we add a RegionName parameter. --- example/config/sim_skeleton/My_sim.xml | 20 -------------------- example/config/sim_skeleton/ThisSim.ini | 23 ++++++++++++++++++++--- 2 files changed, 20 insertions(+), 23 deletions(-) delete mode 100644 example/config/sim_skeleton/My_sim.xml (limited to 'example') diff --git a/example/config/sim_skeleton/My_sim.xml b/example/config/sim_skeleton/My_sim.xml deleted file mode 100644 index f71df57..0000000 --- a/example/config/sim_skeleton/My_sim.xml +++ /dev/null @@ -1,20 +0,0 @@ - -
- - - - - - - - - - - - - - - - -
- diff --git a/example/config/sim_skeleton/ThisSim.ini b/example/config/sim_skeleton/ThisSim.ini index 140cf3b..a1a209a 100644 --- a/example/config/sim_skeleton/ThisSim.ini +++ b/example/config/sim_skeleton/ThisSim.ini @@ -5,7 +5,25 @@ PIDFile = "${Paths|CachePath}/sim${Const|mysim}.pid" LogFile = "${Paths|LogPath}/OpenSim_sim${Const|mysim}.log" ConsoleHistoryFile = "${Paths|LogPath}/OpenSimConsoleHistory_sim${Const|mysim}.txt" - regionload_regionsdir="../../config/sim${Const|mysim}" + +[Region] + RegionName = "SIM_NAME" + RegionUUID = "SIM_UUID" + Location = "SIM_POS" + InternalAddress = "SIM_IP" + InternalPort = "SIM_INT_PORT" + AllowAlternatePorts = False + ExternalHostName = "SIM_URL" + RegionType = "private sim" + SizeX = SIM_SIZE + SizeY = SIM_SIZE + SizeZ = 16384 + MaxAgents = 100 + MaxPrims = 45000 + PhysicalPrimMax = 640 + NonphysicalPrimMax = 2560 + ClampPrimSize = False + MaptileStaticUUID = "00000000-0000-0000-0000-000000000000" [Map] enablePosition = true @@ -21,5 +39,4 @@ Include-Performance = "config-include/SimBalanced.ini" ; Include-Performance = "config-include/SimDefault.ini" ; Include-Performance = "config-include/SimLean.ini" - │ 2621 mysql 20 0 4131620 483696 17640 S 0.3 2.9 8:07.82 /usr/sbin/mysqld --basedir=/usr --datadir=/var/lib/mysql --plugin-dir=/usr/lib/x86_64-linux-gnu/mariadb18/plugin --user=m+ - \ No newline at end of file + -- cgit v1.1 From 67cefb000caf3b6f26cf2bc87cd1ff246635e906 Mon Sep 17 00:00:00 2001 From: onefang Date: Tue, 28 May 2019 06:23:07 +1000 Subject: Maps at full rez with coords is the default now. --- example/config/sim_skeleton/ThisSim.ini | 5 ----- 1 file changed, 5 deletions(-) (limited to 'example') diff --git a/example/config/sim_skeleton/ThisSim.ini b/example/config/sim_skeleton/ThisSim.ini index a1a209a..8e54c12 100644 --- a/example/config/sim_skeleton/ThisSim.ini +++ b/example/config/sim_skeleton/ThisSim.ini @@ -25,11 +25,6 @@ ClampPrimSize = False MaptileStaticUUID = "00000000-0000-0000-0000-000000000000" -[Map] - enablePosition = true - ; Only texture prims that have a diagonal size greater than this number. - TexturePrimSize = 1 - [Network] http_listener_port = SIM_PORT -- cgit v1.1 From ca83ca68ea20193023bbb5fd64bd324e485d0637 Mon Sep 17 00:00:00 2001 From: onefang Date: Thu, 30 May 2019 14:19:58 +1000 Subject: Typo-- --- example/config/sim_skeleton/ThisSim.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'example') diff --git a/example/config/sim_skeleton/ThisSim.ini b/example/config/sim_skeleton/ThisSim.ini index 8e54c12..cbaa3eb 100644 --- a/example/config/sim_skeleton/ThisSim.ini +++ b/example/config/sim_skeleton/ThisSim.ini @@ -29,7 +29,7 @@ http_listener_port = SIM_PORT [Performance] - ;; Select the performance characteristirs of OpenSim. + ;; Select the performance characteristics of OpenSim. ; Include-Performance = "config-include/SimFast.ini" Include-Performance = "config-include/SimBalanced.ini" ; Include-Performance = "config-include/SimDefault.ini" -- cgit v1.1 From fc7408b36fa39931f25b89347a624578195e9a62 Mon Sep 17 00:00:00 2001 From: onefang Date: Sun, 28 Jul 2019 00:41:45 +1000 Subject: Make the stats log file sim specific. --- example/config/sim_skeleton/ThisSim.ini | 1 + 1 file changed, 1 insertion(+) (limited to 'example') diff --git a/example/config/sim_skeleton/ThisSim.ini b/example/config/sim_skeleton/ThisSim.ini index cbaa3eb..5c11ef0 100644 --- a/example/config/sim_skeleton/ThisSim.ini +++ b/example/config/sim_skeleton/ThisSim.ini @@ -4,6 +4,7 @@ [Startup] PIDFile = "${Paths|CachePath}/sim${Const|mysim}.pid" LogFile = "${Paths|LogPath}/OpenSim_sim${Const|mysim}.log" + StatsLogFile = "${Paths|LogPath}/OpenSimStats_sim${Const|mysim}.log" ConsoleHistoryFile = "${Paths|LogPath}/OpenSimConsoleHistory_sim${Const|mysim}.txt" [Region] -- cgit v1.1 From dbff9cb5ec4b84a75b3eef1569c0da9c2175784e Mon Sep 17 00:00:00 2001 From: onefang Date: Thu, 1 Aug 2019 05:54:22 +1000 Subject: ROBUST does support includes, so use them. --- example/config/config.ini | 1 + 1 file changed, 1 insertion(+) (limited to 'example') diff --git a/example/config/config.ini b/example/config/config.ini index 510c8b6..7efdb44 100644 --- a/example/config/config.ini +++ b/example/config/config.ini @@ -15,6 +15,7 @@ AssetsPath = "../../AssetFiles" BackupPath = "../../backups" CachePath = "../../caches" + ConfigPath = "../../config" DbPath = "../../db" LogPath = "../../logs" -- cgit v1.1 From b6b38dd4206c35dec02edd7bbfd9a0545fc12df6 Mon Sep 17 00:00:00 2001 From: onefang Date: Sun, 4 Aug 2019 01:50:56 +1000 Subject: Tweaking create_sim. ExternalHostName = "${Const|HostName}" Move size to the third argument. --- example/config/sim_skeleton/ThisSim.ini | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'example') diff --git a/example/config/sim_skeleton/ThisSim.ini b/example/config/sim_skeleton/ThisSim.ini index 5c11ef0..db3cf94 100644 --- a/example/config/sim_skeleton/ThisSim.ini +++ b/example/config/sim_skeleton/ThisSim.ini @@ -14,7 +14,7 @@ InternalAddress = "SIM_IP" InternalPort = "SIM_INT_PORT" AllowAlternatePorts = False - ExternalHostName = "SIM_URL" + ExternalHostName = "${Const|HostName}" RegionType = "private sim" SizeX = SIM_SIZE SizeY = SIM_SIZE @@ -22,9 +22,18 @@ MaxAgents = 100 MaxPrims = 45000 PhysicalPrimMax = 640 - NonphysicalPrimMax = 2560 + NonPhysicalPrimMax = 2560 ClampPrimSize = False MaptileStaticUUID = "00000000-0000-0000-0000-000000000000" + ; NonPhysicalPrimMin = 0 + ; PhysicalPrimMin = 0 + ; MaxPrimsPerUser = -1 + ; LinksetPrims = 0 + ; DefaultLanding = "<128, 128, 30>" + ; MaptileStaticFile = "" + ; ScopeID = "00000000-0000-0000-0000-000000000000" + ; Datastore = "" + ; ResolveAddress = "" [Network] http_listener_port = SIM_PORT -- cgit v1.1 From bf27216a290c125f565d08700bb6693387fac9bf Mon Sep 17 00:00:00 2001 From: onefang Date: Sun, 4 Aug 2019 10:30:42 +1000 Subject: Add a basic generic web server, and a login page, plus stubs for the other basic pages. And update everyone to suit. --- example/config/config.ini | 2 +- example/web/SledjHamr.png | Bin 0 -> 2025959 bytes example/web/about.html | 9 +++++++++ example/web/help.html | 9 +++++++++ example/web/loginpage.html | 24 ++++++++++++++++++++++++ example/web/password_help.html | 9 +++++++++ example/web/register.html | 11 +++++++++++ 7 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 example/web/SledjHamr.png create mode 100644 example/web/about.html create mode 100644 example/web/help.html create mode 100644 example/web/loginpage.html create mode 100644 example/web/password_help.html create mode 100644 example/web/register.html (limited to 'example') diff --git a/example/config/config.ini b/example/config/config.ini index 7efdb44..e95b04c 100644 --- a/example/config/config.ini +++ b/example/config/config.ini @@ -18,7 +18,7 @@ ConfigPath = "../../config" DbPath = "../../db" LogPath = "../../logs" - + WebPath = "../../web" [Const] MOTD = "Welcome to your local grid." diff --git a/example/web/SledjHamr.png b/example/web/SledjHamr.png new file mode 100644 index 0000000..1660a90 Binary files /dev/null and b/example/web/SledjHamr.png differ diff --git a/example/web/about.html b/example/web/about.html new file mode 100644 index 0000000..e45f00a --- /dev/null +++ b/example/web/about.html @@ -0,0 +1,9 @@ + +About this grid + + + +This is a virtual world, usually called a grid, based on OpenSim_SC. +

 

+ + diff --git a/example/web/help.html b/example/web/help.html new file mode 100644 index 0000000..64194ca --- /dev/null +++ b/example/web/help.html @@ -0,0 +1,9 @@ + +Help for this grid + + + +Include help for your grid here. +

 

+ + diff --git a/example/web/loginpage.html b/example/web/loginpage.html new file mode 100644 index 0000000..aa58e6b --- /dev/null +++ b/example/web/loginpage.html @@ -0,0 +1,24 @@ + +This grid + + + +

 

+

 

+

Add your fancy splash page for your grid here.

+

 

+

 

+

There may be some new members.   Welcome new members.

+

 

+

There are likely some members of this grid.

+

 

+

There maybe some people online now.

+

 

+

There maybe some visitors from the hypergrid.

+

 

+

There is probably at least one region, maybe more.

+

 

+

Some people might have been on in the last month.

+

 

+ + diff --git a/example/web/password_help.html b/example/web/password_help.html new file mode 100644 index 0000000..129fb7d --- /dev/null +++ b/example/web/password_help.html @@ -0,0 +1,9 @@ + +Password help for this grid + + + +Include password help for your grid here. +

 

+ + diff --git a/example/web/register.html b/example/web/register.html new file mode 100644 index 0000000..a316f41 --- /dev/null +++ b/example/web/register.html @@ -0,0 +1,11 @@ + +Account for this grid + + + +Include account registration help for your grid here. +

 

+

If you want to register an acocunt on this grid, ask the person that runs it to do that for you.

+

 

+ + -- cgit v1.1 From 5fae30eb8863f3f39e6853584fd49197c52e8835 Mon Sep 17 00:00:00 2001 From: onefang Date: Mon, 5 Aug 2019 01:41:34 +1000 Subject: More basic web server. --- example/web/loginpage.html | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'example') diff --git a/example/web/loginpage.html b/example/web/loginpage.html index aa58e6b..9246263 100644 --- a/example/web/loginpage.html +++ b/example/web/loginpage.html @@ -1,24 +1,21 @@ -This grid +<!--#echo var="grid" --> splash page

 

 

-

Add your fancy splash page for your grid here.

+

Add your fancy splash page for here.     Login URI -

 

 

-

There may be some new members.   Welcome new members.

+

There are likely some () members of this grid.

 

-

There are likely some members of this grid.

+

There are maybe some () people in world now (including hypergridders).

 

-

There maybe some people online now.

+

There are maybe some () locals hypergridding now.

 

-

There maybe some visitors from the hypergrid.

-

 

-

There is probably at least one region, maybe more.

-

 

-

Some people might have been on in the last month.

+

There is probably at least one () region, maybe more.

 

+

This grid is running

-- cgit v1.1 From c8ac2ef7a89d0bbaf8c34a6f11378cf9bc6ce206 Mon Sep 17 00:00:00 2001 From: onefang Date: Mon, 5 Aug 2019 16:25:04 +1000 Subject: Splash page CSS from Taylor. --- example/web/loginpage.html | 76 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 61 insertions(+), 15 deletions(-) (limited to 'example') diff --git a/example/web/loginpage.html b/example/web/loginpage.html index 9246263..abce719 100644 --- a/example/web/loginpage.html +++ b/example/web/loginpage.html @@ -1,21 +1,67 @@ <!--#echo var="grid" --> splash page + - -

 

-

 

-

Add your fancy splash page for here.     Login URI -

-

 

-

 

-

There are likely some () members of this grid.

-

 

-

There are maybe some () people in world now (including hypergridders).

-

 

-

There are maybe some () locals hypergridding now.

-

 

-

There is probably at least one () region, maybe more.

-

 

-

This grid is running

+ +
+ SledjHamr +
+

Add your fancy splash page for here.

+

 

+

 

+

 

+

There are likely some () members of this grid.

+

 

+

There are maybe some () people in world now (including hypergridders).

+

 

+

There are maybe some () locals hypergridding now.

+

 

+

There is probably at least one () region, maybe more.

+

 

+
+
+

Login URI -

+
+
+

This grid is running

+
-- cgit v1.1 From feb85445b441e720b2e7fea761be0272c21659d3 Mon Sep 17 00:00:00 2001 From: onefang Date: Mon, 5 Aug 2019 18:30:43 +1000 Subject: More splash page fiddling. --- example/web/loginpage.html | 54 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 16 deletions(-) (limited to 'example') diff --git a/example/web/loginpage.html b/example/web/loginpage.html index abce719..ebce4aa 100644 --- a/example/web/loginpage.html +++ b/example/web/loginpage.html @@ -2,66 +2,88 @@ <!--#echo var="grid" --> splash page - +
- SledjHamr + SledjHamr

Add your fancy splash page for here.

 

 

 

-

There are likely some () members of this grid.

+

Perhaps describe here.

+
+
+

Login URI -

 

+

may or maynot be in good shape now.

+

There are likely some () members of this grid.

There are maybe some () people in world now (including hypergridders).

-

 

There are maybe some () locals hypergridding now.

-

 

There is probably at least one () region, maybe more.

-

 

-
-

Login URI -

+
+

Maybe add some news or events here, or something.

+
+
+

CSS by Taylor Temper, photo by onefang rejected.

-

This grid is running

+

is running

-- cgit v1.1 From 659229c0777f381c66462fd7a4f2dfddbe3e1ef6 Mon Sep 17 00:00:00 2001 From: onefang Date: Tue, 6 Aug 2019 01:08:51 +1000 Subject: Add actual grid stats to the web page. Except HGers, still trying to sort that one out. --- example/web/loginpage.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'example') diff --git a/example/web/loginpage.html b/example/web/loginpage.html index ebce4aa..614c73d 100644 --- a/example/web/loginpage.html +++ b/example/web/loginpage.html @@ -70,11 +70,11 @@ a:active {color: blue;}

Login URI -

 

-

may or maynot be in good shape now.

-

There are likely some () members of this grid.

-

There are maybe some () people in world now (including hypergridders).

-

There are maybe some () locals hypergridding now.

-

There is probably at least one () region, maybe more.

+

There are members of this grid.

+

There are locals and hypergrid visitors in world.

+

There are locals out on the hypergrid.

+

There have been people on this grid in the last month.

+

There are regions, though some might not be online right now.

Maybe add some news or events here, or something.

-- cgit v1.1 From 0e5ea0d68c7470cc48b97bdc48287348da0a2fa1 Mon Sep 17 00:00:00 2001 From: onefang Date: Tue, 6 Aug 2019 01:09:00 +1000 Subject: Typo-- --- example/web/register.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'example') diff --git a/example/web/register.html b/example/web/register.html index a316f41..8008881 100644 --- a/example/web/register.html +++ b/example/web/register.html @@ -5,7 +5,7 @@ Include account registration help for your grid here.

 

-

If you want to register an acocunt on this grid, ask the person that runs it to do that for you.

+

If you want to register an account on this grid, ask the person that runs it to do that for you.

 

-- cgit v1.1 From a29493e18e0224242a31434f88e7e884e8f251e0 Mon Sep 17 00:00:00 2001 From: onefang Date: Tue, 6 Aug 2019 01:21:31 +1000 Subject: Be more inclusive in the monthly online count. --- example/web/loginpage.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'example') diff --git a/example/web/loginpage.html b/example/web/loginpage.html index 614c73d..a369e3c 100644 --- a/example/web/loginpage.html +++ b/example/web/loginpage.html @@ -73,7 +73,7 @@ a:active {color: blue;}

There are members of this grid.

There are locals and hypergrid visitors in world.

There are locals out on the hypergrid.

-

There have been people on this grid in the last month.

+

There have been locals and visitors on this grid in the last month.

There are regions, though some might not be online right now.

-- cgit v1.1 From 6877202c0ecc7b5dacdc73ac6c4eb99990c7563d Mon Sep 17 00:00:00 2001 From: onefang Date: Tue, 6 Aug 2019 04:04:57 +1000 Subject: Reduce the width of the splash page divs. --- example/web/loginpage.html | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'example') diff --git a/example/web/loginpage.html b/example/web/loginpage.html index a369e3c..3f6e6b1 100644 --- a/example/web/loginpage.html +++ b/example/web/loginpage.html @@ -25,6 +25,7 @@ a:active {color: blue;} position: absolute; top: 8px; left: 16px; + width: 30%; } .top-right @@ -32,6 +33,7 @@ a:active {color: blue;} position: absolute; top: 8px; right: 16px; + width: 30%; } .centre @@ -39,6 +41,7 @@ a:active {color: blue;} position: absolute; top: 50%; left: 50%; + width: 30%; transform: translate(-50%, -50%); } @@ -47,6 +50,7 @@ a:active {color: blue;} position: absolute; bottom: 8px; left: 16px; + width: 30%; } .bottom-right @@ -54,6 +58,7 @@ a:active {color: blue;} position: absolute; bottom: 8px; right: 16px; + width: 30%; } -- cgit v1.1 From 836189329de43906169ab26fa44396b53b91b713 Mon Sep 17 00:00:00 2001 From: onefang Date: Wed, 7 Aug 2019 00:12:46 +1000 Subject: The beginnings of an account management web page. Just some simple dynamic pages that don't actually do anything. --- example/web/register.html | 2 ++ 1 file changed, 2 insertions(+) (limited to 'example') diff --git a/example/web/register.html b/example/web/register.html index 8008881..a34becb 100644 --- a/example/web/register.html +++ b/example/web/register.html @@ -7,5 +7,7 @@ Include account registration help for your grid here.

 

If you want to register an account on this grid, ask the person that runs it to do that for you.

 

+

If you want to register an account on this grid, click here (when it's finished).

+

 

-- cgit v1.1 From b972846c5f7abf0deead2876c646c039a60df38a Mon Sep 17 00:00:00 2001 From: onefang Date: Tue, 13 Aug 2019 03:02:02 +1000 Subject: Make [Region] InternalAddress and ExternalHostName reasonable defaults. Also AllowAlternatePorts isn't actually in the code anywhere, get rid of it. --- example/config/sim_skeleton/ThisSim.ini | 3 --- 1 file changed, 3 deletions(-) (limited to 'example') diff --git a/example/config/sim_skeleton/ThisSim.ini b/example/config/sim_skeleton/ThisSim.ini index db3cf94..44749bb 100644 --- a/example/config/sim_skeleton/ThisSim.ini +++ b/example/config/sim_skeleton/ThisSim.ini @@ -11,10 +11,7 @@ RegionName = "SIM_NAME" RegionUUID = "SIM_UUID" Location = "SIM_POS" - InternalAddress = "SIM_IP" InternalPort = "SIM_INT_PORT" - AllowAlternatePorts = False - ExternalHostName = "${Const|HostName}" RegionType = "private sim" SizeX = SIM_SIZE SizeY = SIM_SIZE -- cgit v1.1 From 884204d01c1b0f0a99b637d5678c0d1f8a4e2ae0 Mon Sep 17 00:00:00 2001 From: onefang Date: Tue, 13 Aug 2019 07:36:15 +1000 Subject: Reload splash page every couple of minutes, to get fresh stats. --- example/web/loginpage.html | 1 + 1 file changed, 1 insertion(+) (limited to 'example') diff --git a/example/web/loginpage.html b/example/web/loginpage.html index 3f6e6b1..cca795e 100644 --- a/example/web/loginpage.html +++ b/example/web/loginpage.html @@ -1,6 +1,7 @@ <!--#echo var="grid" --> splash page +