aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/config-include
diff options
context:
space:
mode:
Diffstat (limited to 'bin/config-include')
-rw-r--r--bin/config-include/CenomeCache.ini.example13
-rw-r--r--bin/config-include/FlotsamCache.ini.example39
-rw-r--r--bin/config-include/Grid.ini8
-rw-r--r--bin/config-include/GridCommon.ini.example58
-rw-r--r--bin/config-include/GridHypergrid.ini13
-rw-r--r--bin/config-include/StableSettings.ini28
-rw-r--r--bin/config-include/Standalone.ini9
-rw-r--r--bin/config-include/StandaloneCommon.ini.example21
-rw-r--r--bin/config-include/StandaloneHypergrid.ini15
9 files changed, 126 insertions, 78 deletions
diff --git a/bin/config-include/CenomeCache.ini.example b/bin/config-include/CenomeCache.ini.example
new file mode 100644
index 0000000..993fe64
--- /dev/null
+++ b/bin/config-include/CenomeCache.ini.example
@@ -0,0 +1,13 @@
1[AssetCache]
2 ;;
3 ;; Options for CenmoeAssetCache
4 ;;
5
6 ; 256 MB (default: 134217728)
7 MaxSize = 268435456
8
9 ; How many assets it is possible to store cache (default: 4096)
10 MaxCount = 16384
11
12 ; Expiration time - 1 hour (default: 30 minutes)
13 ExpirationTime = 60
diff --git a/bin/config-include/FlotsamCache.ini.example b/bin/config-include/FlotsamCache.ini.example
new file mode 100644
index 0000000..e9e43f6
--- /dev/null
+++ b/bin/config-include/FlotsamCache.ini.example
@@ -0,0 +1,39 @@
1[AssetCache]
2 ;;
3 ;; Options for FlotsamAssetCache
4 ;;
5
6 ; cache directory can be shared by multiple instances
7 CacheDirectory = ./assetcache
8 ; Other examples:
9 ;CacheDirectory = /directory/writable/by/OpenSim/instance
10
11 ; Log level
12 ; 0 - (Error) Errors only
13 ; 1 - (Info) Hit Rate Stats + Level 0
14 ; 2 - (Debug) Cache Activity (Reads/Writes) + Level 1
15 ;
16 LogLevel = 0
17
18 ; How often should hit rates be displayed (given in AssetRequests)
19 ; 0 to disable
20 HitRateDisplay = 100
21
22 ; Set to false for disk cache only.
23 MemoryCacheEnabled = true
24
25 ; How long {in hours} to keep assets cached in memory, .5 == 30 minutes
26 MemoryCacheTimeout = 2
27
28 ; How long {in hours} to keep assets cached on disk, .5 == 30 minutes
29 ; Specify 0 if you do not want your disk cache to expire
30 FileCacheTimeout = 0
31
32 ; How often {in hours} should the disk be checked for expired filed
33 ; Specify 0 to disable expiration checking
34 FileCleanupTimer = .166 ;roughly every 10 minutes
35
36 ; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how
37 ; long (in miliseconds) to block a request thread while trying to complete
38 ; an existing write to disk.
39 ; WaitOnInprogressTimeout = 3000
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 4f2e839..68326b8 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -1,7 +1,13 @@
1;;
2;; Please don't change this file.
3;; All optional settings are in GridCommon.ini.example,
4;; which you can copy and change.
5;;
6
1[Includes] 7[Includes]
2 Include-Common = "config-include/GridCommon.ini" 8 Include-Common = "config-include/GridCommon.ini"
3 Include-Stable = "config-include/StableSettings.ini"
4 9
5[Modules] 10[Modules]
6 AssetServices = "RemoteAssetServicesConnector" 11 AssetServices = "RemoteAssetServicesConnector"
12 InventoryServices = "RemoteInventoryServicesConnector"
7 13
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index efbde56..ff324ce 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -1,43 +1,3 @@
1[Modules]
2 ;AssetCaching = "CoreAssetCache"
3 ;AssetCaching = "GlynnTuckerAssetCache"
4 ;AssetCaching = "CenomeMemoryAssetCache"
5 AssetCaching = "FlotsamAssetCache"
6
7[AssetCache]
8 ; cache directory can be shared by multiple instances
9 CacheDirectory = /directory/writable/by/OpenSim/instance
10
11 ; Log level
12 ; 0 - (Error) Errors only
13 ; 1 - (Info) Hit Rate Stats + Level 0
14 ; 2 - (Debug) Cache Activity (Reads/Writes) + Level 1
15 ;
16 LogLevel = 0
17
18 ; How often should hit rates be displayed (given in AssetRequests)
19 ; 0 to disable
20 HitRateDisplay = 100
21
22 ; Set to false for disk cache only.
23 MemoryCacheEnabled = true
24
25 ; How long {in hours} to keep assets cached in memory, .5 == 30 minutes
26 MemoryCacheTimeout = 2
27
28 ; How long {in hours} to keep assets cached on disk, .5 == 30 minutes
29 ; Specify 0 if you do not want your disk cache to expire
30 FileCacheTimeout = 0
31
32 ; How often {in hours} should the disk be checked for expired filed
33 ; Specify 0 to disable expiration checking
34 FileCleanupTimer = .166 ;roughly every 10 minutes
35
36 ; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how
37 ; long (in miliseconds) to block a request thread while trying to complete
38 ; an existing write to disk.
39 ; WaitOnInprogressTimeout = 3000
40
41[AssetService] 1[AssetService]
42 2
43 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" 3 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
@@ -48,3 +8,21 @@
48 ; 8 ;
49 AssetServerURI = "http://myassetserver.com:8003" 9 AssetServerURI = "http://myassetserver.com:8003"
50 10
11[InventoryService]
12 ;
13 ; change this to your grid-wide asset server
14 ;
15 InventoryServerURI = "http://myassetserver.com:8004"
16
17
18[Modules]
19 ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
20 ;; Copy the config .example file into your own .ini file and change configs there
21
22 AssetCaching = "FlotsamAssetCache"
23 Include-FlotsamCache = "config-include/FlotsamCache.ini"
24
25 ;AssetCaching = "CenomeMemoryAssetCache"
26 ;Include-CenomeCache = "config-include/CenomeCache.ini"
27
28 ;AssetCaching = "GlynnTuckerAssetCache"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index f22113b..abac345 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -1,11 +1,20 @@
1;;
2;; Please don't change this file.
3;; All optional settings are in GridCommon.ini.example,
4;; which you can copy and change.
5;;
6
1[Includes] 7[Includes]
2 Include-Common = "config-include/GridCommon.ini" 8 Include-Common = "config-include/GridCommon.ini"
3 Include-Stable = "config-include/StableSettings.ini"
4 9
5[Modules] 10[Modules]
6 AssetServices = "HGAssetBroker" 11 AssetServices = "HGAssetBroker"
7 12 InventoryServices = "HGInventoryBroker"
8 13
9[AssetService] 14[AssetService]
10 LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" 15 LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
11 HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService" 16 HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"
17
18[InventoryService]
19 LocalGridInventoryService = "OpenSim.Services.Connectors.dll:InventoryServicesConnector"
20 HypergridInventoryService = "OpenSim.Services.InventoryService.dll:HGInventoryService"
diff --git a/bin/config-include/StableSettings.ini b/bin/config-include/StableSettings.ini
deleted file mode 100644
index 5e3cbbc..0000000
--- a/bin/config-include/StableSettings.ini
+++ /dev/null
@@ -1,28 +0,0 @@
1[AssetCache]
2 ;; ---- Optional configurations for CoreAssetCache
3 ; Number of buckets for assets
4 ;CacheBuckets = 32768
5 ;; ---- endof CoreAssetCache ----------------
6
7 ;; ---- Optional configurations for CenomeMemoryAssetCache
8 ; Cache size 128 MB (default: 134217728)
9 ; MaxSize = 134217728
10 ; Maximal asset count
11 ; MaxCount = 4096
12 ; Asset's expiration time (minutes)
13 ; ExpirationTime = 30
14 ;; ---- endof CenomeMemoryAssetCache --------
15
16 ;; ---- Optional configurations for FlotsamAssetCache
17
18 ; Set to false for disk cache only.
19 MemoryCacheEnabled = true
20
21 ; How long {in hours} to keep assets cached in memory, .5 == 30 minutes
22 MemoryCacheTimeout = 2
23
24 ; How often {in hours} should the disk be checked for expired filed
25 ; Specify 0 to disable expiration checking
26 FileCleanupTimer = .166 ;roughly every 10 minutes
27
28 ;; ---- endof FlotsamAssetCache --------
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 74c440e..a0cd098 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -1,11 +1,20 @@
1;;
2;; Please don't change this file.
3;; All optional settings are in StandaloneCommon.ini.example,
4;; which you can copy and change.
5;;
6
1[Includes] 7[Includes]
2 Include-Common = "config-include/StandaloneCommon.ini" 8 Include-Common = "config-include/StandaloneCommon.ini"
3 Include-Stable = "config-include/StableSettings.ini" 9 Include-Stable = "config-include/StableSettings.ini"
4 10
5[Modules] 11[Modules]
6 AssetServices = "LocalAssetServicesConnector" 12 AssetServices = "LocalAssetServicesConnector"
13 InventoryServices = "LocalInventoryServicesConnector"
7 14
8 15
9[AssetService] 16[AssetService]
10 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" 17 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
11 18
19[InventoryService]
20 LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 034d1e2..41112ef 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -1,9 +1,4 @@
1[Modules] 1[DatabaseService]
2 ;AssetCaching = "CoreAssetCache"
3 ;AssetCaching = "GlynnTuckerAssetCache"
4 AssetCaching = "CenomeMemoryAssetCache"
5
6[AssetService]
7 ; 2 ;
8 ;### Choose the DB 3 ;### Choose the DB
9 ; 4 ;
@@ -13,6 +8,20 @@
13 ;StorageProvider = "OpenSim.Data.MySQL.dll" 8 ;StorageProvider = "OpenSim.Data.MySQL.dll"
14 ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;" 9 ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
15 10
11[AssetService]
12
16 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" 13 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
17 AssetLoaderArgs = "assets/AssetSets.xml" 14 AssetLoaderArgs = "assets/AssetSets.xml"
18 15
16
17[Modules]
18 ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
19 ;; Copy the config .example file into your own .ini file and change configs there
20
21 ;AssetCaching = "GlynnTuckerAssetCache"
22
23 ;AssetCaching = "FlotsamAssetCache"
24 ;Include-FlotsamCache = "config-include/FlotsamCache.ini"
25
26 AssetCaching = "CenomeMemoryAssetCache"
27 Include-CenomeCache = "config-include/CenomeCache.ini"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 7c5700e..f962132 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -1,9 +1,15 @@
1;;
2;; Please don't change this file.
3;; All optional settings are in StandaloneCommon.ini.example,
4;; which you can copy and change.
5;;
6
1[Includes] 7[Includes]
2 Include-Common = "config-include/StandaloneCommon.ini" 8 Include-Common = "config-include/StandaloneCommon.ini"
3 Include-Stable = "config-include/StableSettings.ini"
4 9
5[Modules] 10[Modules]
6 AssetServices = "HGAssetBroker" 11 AssetServices = "HGAssetBroker"
12 InventoryServices = "HGInventoryBroker"
7 13
8 14
9[AssetService] 15[AssetService]
@@ -14,3 +20,10 @@
14 LocalGridAssetService = "OpenSim.Services.AssetService.dll:AssetService" 20 LocalGridAssetService = "OpenSim.Services.AssetService.dll:AssetService"
15 HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService" 21 HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"
16 22
23[InventoryService]
24 ; For the RegionInventoryService
25 LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
26
27 ; For HGInventoryBroker
28 LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
29 HypergridInventoryService = "OpenSim.Services.InventoryService.dll:HGInventoryService"