From d0857cc126a3bf46c432aed86617feb31f6ca26e Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Fri, 9 Dec 2022 00:31:30 +0000 Subject: [PATCH] Add configuration and script changes for image-opensim-herbal3d/config/config-basilalpha --- image-opensim-herbal3d/config/Loden.ini | 3 ++- image-opensim-herbal3d/config/RaguOS.ini | 8 +++--- .../config-basilalpha/Regions/Regions.ini | 5 ++-- .../docker-compose-external-config.yml | 25 ++++--------------- image-opensim-herbal3d/run-herbal3d.sh | 2 +- image-opensim-herbal3d/stop-herbal3d.sh | 2 +- 6 files changed, 17 insertions(+), 28 deletions(-) diff --git a/image-opensim-herbal3d/config/Loden.ini b/image-opensim-herbal3d/config/Loden.ini index f7c0661..093886e 100644 --- a/image-opensim-herbal3d/config/Loden.ini +++ b/image-opensim-herbal3d/config/Loden.ini @@ -18,7 +18,8 @@ HalfRezTerrain = true ; The maximum pixel dimension for images if exporting, - TextureMaxSize = 1024 + ;TextureMaxSize = 1024 + TextureMaxSize = 256 ; One of: PNG, JPG, GIF, BMP, PNG PreferredTextureFormat = "PNG" ; One of: PNG, JPG, GIF, BMP, diff --git a/image-opensim-herbal3d/config/RaguOS.ini b/image-opensim-herbal3d/config/RaguOS.ini index c40bb8d..b13e16f 100644 --- a/image-opensim-herbal3d/config/RaguOS.ini +++ b/image-opensim-herbal3d/config/RaguOS.ini @@ -2,18 +2,20 @@ Enabled=true ; Hostname for external clients it access. Computed if zero length - ExternalAccessHostname = "basilalpha.bluestuff.org" + ExternalAccessHostname = "basil.bluestuff.org" ; For debugging, you can turn off auth checks for fetching assets ShouldEnforceAccessAuthorization=true + AssetUrlTemplate = "https://{0}/Assets{2}" + ; Each transport for each layer takes parameters. The current ones ; defined are: ; WSConnectionHost (default "0.0.0.0" if not specified ; WSIsSecure (default false) ; WSPort (at least base must be specified to compute port or specific port) - ; WSCertificate (must be specified for secure connections - ; DisableNaglesAlgorithm (default true if not specified. + ; WSCertificate (must be specified for secure connections) + ; DisableNaglesAlgorithm (default true if not specified). ; ; The parameters are computed based on values that can be in RegionInfo or in ; the RaguOS.ini file. If specific port numbers are not specified, they are diff --git a/image-opensim-herbal3d/config/config-basilalpha/Regions/Regions.ini b/image-opensim-herbal3d/config/config-basilalpha/Regions/Regions.ini index 91998e7..c660901 100644 --- a/image-opensim-herbal3d/config/config-basilalpha/Regions/Regions.ini +++ b/image-opensim-herbal3d/config/config-basilalpha/Regions/Regions.ini @@ -6,7 +6,7 @@ Location = 7400,7200 InternalAddress = 0.0.0.0 InternalPort = 9050 AllowAlternatePorts = False -ExternalHostName = "basilalpha.bluestuff.org" +ExternalHostName = "basil.bluestuff.org" DefaultLanding = <128,128,40> @@ -21,6 +21,7 @@ MaxPrimsPerUser = 1000 MasterAvatarFirstName = Misterblue MasterAvatarLastName = Waves -SpaceServer_BasePort = 11440 +SpaceServer_WSExternalUrlTemplate = "wss://{0}/wss/" +SpaceServer_WSDisableNaglesAlgorithm = true diff --git a/image-opensim-herbal3d/config/config-basilalpha/docker-compose-external-config.yml b/image-opensim-herbal3d/config/config-basilalpha/docker-compose-external-config.yml index 5cf7347..e16dd52 100644 --- a/image-opensim-herbal3d/config/config-basilalpha/docker-compose-external-config.yml +++ b/image-opensim-herbal3d/config/config-basilalpha/docker-compose-external-config.yml @@ -3,23 +3,7 @@ version: '3' services: - dbservice: - image: mariadb:latest - environment: - MARIADB_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD} - # Parameters added to invocation. - # Default is to flush after every operation which slows Docker image down. - # This flushes log once a second. - command: --innodb_flush_log_at_trx_commit=2 --sync_binlog=0 - volumes: - # NOTE: you must create this directory before starting the simulator - # This mysql data directory can be placed anywhere - - /root/opensim-sql-data:/var/lib/mysql - restart: unless-stopped - opensim: - depends_on: - - dbservice image: opensim-herbal3d environment: @@ -27,11 +11,15 @@ services: CONFIGKEY: EXTERNAL_HOSTNAME: + network_mode: "host" + volumes: # overlay the OpenSimulator bin/config/ with external config/ - ./config:/home/opensim/opensim/bin/config # Loden generated asset directory tree is stored externally - - /root/LodenAssets:/home/opensim/opensim/bin/LodenAssets + - /home/basil/LodenAssets:/home/opensim/opensim/bin/LodenAssets + # Linkage for local mysqld + - /var/run/mysqld:/var/run/mysqld ports: - 8002:8002/tcp @@ -40,7 +28,4 @@ services: - 11400-11410:11400-11410/tcp - 11440:11440/tcp - links: - - dbservice:dbservice - restart: unless-stopped diff --git a/image-opensim-herbal3d/run-herbal3d.sh b/image-opensim-herbal3d/run-herbal3d.sh index 2414b3d..6e8bb0e 100755 --- a/image-opensim-herbal3d/run-herbal3d.sh +++ b/image-opensim-herbal3d/run-herbal3d.sh @@ -69,7 +69,7 @@ fi # https://docs.docker.com/engine/security/userns-remap/ # --userns-remap="opensim:opensim" -docker-compose \ +docker compose \ --file "$COMPOSEFILE" \ --project-name opensim-${CONFIG_NAME} \ --project-directory "$BASE" \ diff --git a/image-opensim-herbal3d/stop-herbal3d.sh b/image-opensim-herbal3d/stop-herbal3d.sh index b8ead19..dde04ec 100755 --- a/image-opensim-herbal3d/stop-herbal3d.sh +++ b/image-opensim-herbal3d/stop-herbal3d.sh @@ -21,7 +21,7 @@ fi echo "Stopping configuration $CONFIG_NAME from \"$COMPOSEFILE\"" -docker-compose \ +docker compose \ --file "$COMPOSEFILE" \ --project-name opensim-${CONFIG_NAME} \ down