aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid Walter Seikel2017-02-15 22:34:03 +1000
committerDavid Walter Seikel2017-02-15 22:34:03 +1000
commitb31202ef485ed1b5148c168b601d69dddd0eba72 (patch)
tree4fb33478ed8d70797414937ee21c9750fb10cacc
parentFix up the install script a bit. (diff)
downloadopensim-SC_OLD-b31202ef485ed1b5148c168b601d69dddd0eba72.zip
opensim-SC_OLD-b31202ef485ed1b5148c168b601d69dddd0eba72.tar.gz
opensim-SC_OLD-b31202ef485ed1b5148c168b601d69dddd0eba72.tar.bz2
opensim-SC_OLD-b31202ef485ed1b5148c168b601d69dddd0eba72.tar.xz
Include some more .ini files.
-rw-r--r--.gitignore2
-rw-r--r--config/config-include/FlotsamCache.ini56
-rw-r--r--config/config-include/GridCommon.ini272
3 files changed, 328 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 21f3d45..9863bb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,8 +68,6 @@ caches/maptiles
68bin/bakes 68bin/bakes
69bin/estate_settings.xml 69bin/estate_settings.xml
70config/config-include/CenomeCache.ini 70config/config-include/CenomeCache.ini
71config/config-include/FlotsamCache.ini
72config/config-include/GridCommon.ini
73config/config-include/StandaloneCommon.ini 71config/config-include/StandaloneCommon.ini
74logs/OpenSim.Grid.AssetInventoryServer.log 72logs/OpenSim.Grid.AssetInventoryServer.log
75logs/OpenSim.Grid.AssetServer.log 73logs/OpenSim.Grid.AssetServer.log
diff --git a/config/config-include/FlotsamCache.ini b/config/config-include/FlotsamCache.ini
new file mode 100644
index 0000000..507521f
--- /dev/null
+++ b/config/config-include/FlotsamCache.ini
@@ -0,0 +1,56 @@
1[AssetCache]
2 ;;
3 ;; Options for FlotsamAssetCache
4 ;;
5
6 ; cache directory can be shared by multiple instances
7 CacheDirectory = "${Const|CachePath}/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 = 0
21
22 ; Set to false for no memory cache
23 MemoryCacheEnabled = false
24
25 ; Set to false for no file cache
26 FileCacheEnabled = true
27
28 ; How long {in hours} to keep assets cached in memory, .5 == 30 minutes
29 ; Optimization: for VPS or limited memory system installs set Timeout to .016 (1 minute)
30 ; increases performance without large memory impact
31 MemoryCacheTimeout = 0.5
32
33 ; How long {in hours} to keep assets cached on disk, .5 == 30 minutes
34 ; Specify 0 if you do not want your disk cache to expire
35 FileCacheTimeout = 0.5
36
37 ; How often {in hours} should the disk be checked for expired filed
38 ; Specify 0 to disable expiration checking
39 FileCleanupTimer = 1.0 ;every hour
40
41 ; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how
42 ; long (in miliseconds) to block a request thread while trying to complete
43 ; an existing write to disk.
44 ; NOTE: THIS PARAMETER IS NOT CURRENTLY USED BY THE CACHE
45 ; WaitOnInprogressTimeout = 3000
46
47 ; Number of tiers to use for cache directories (current valid
48 ; range 1 to 3)
49 ;CacheDirectoryTiers = 1
50
51 ; Number of letters per path tier, 1 will create 16 directories
52 ; per tier, 2 - 256, 3 - 4096 and 4 - 65K
53 ;CacheDirectoryTierLength = 3
54
55 ; Warning level for cache directory size
56 ;CacheWarnAt = 30000
diff --git a/config/config-include/GridCommon.ini b/config/config-include/GridCommon.ini
new file mode 100644
index 0000000..1281aee
--- /dev/null
+++ b/config/config-include/GridCommon.ini
@@ -0,0 +1,272 @@
1; This is the main configuration file for an instance of OpenSim running in grid mode
2; In particular, this one is set up for connecting to Infinite Grid.
3
4[DatabaseService]
5 ;
6 ; ### Choose the DB
7 ;
8
9 ; SQLite
10 ; Include-Storage = "config-include/storage/SQLiteStandalone.ini";
11
12 ; MySql
13 ; Uncomment these lines if you want to use mysql storage
14 ; Change the connection string to your db details
15 ;StorageProvider = "OpenSim.Data.MySQL.dll"
16 ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
17 ; Uncomment this line if you are using MySQL and want to use a different database for estates
18 ; The usual application for this is to allow estates to be spread out across multiple simulators by share the same database.
19 ; Most people won't need to do this so only uncomment if you know what you're doing.
20 ;EstateConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
21
22 ; MSSQL
23 ; Uncomment these lines if you want to use MSSQL storage
24 ; Change the connection string to your db details
25 ; The value for server property is shown in your SQL Server Management Studio login dialog.
26 ; (This sample is the default of express edition)
27 ;StorageProvider = "OpenSim.Data.MSSQL.dll"
28 ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
29
30 ; PGSQL
31 ; Uncomment these lines if you want to use PGSQL storage
32 ; Change the connection string to your db details
33 ;StorageProvider = "OpenSim.Data.PGSQL.dll"
34 ;ConnectionString = "Server=localhost;Database=opensim;User Id=opensim; password=***;"
35
36 StorageProvider = "${Const|DataProvider}"
37 ConnectionString = "${Const|ConnectionString}"
38
39
40[Hypergrid]
41 ; Uncomment the variables in this section only if you are in
42 ; Hypergrid configuration. Otherwise, ignore.
43
44 ;# {HomeURI} {Hypergrid} {The Home URL of this world} {}
45 ;; If this is a standalone world, this is the address of this instance.
46 ;; If this is a grided simulator, this is the address of the external robust server that
47 ;; runs the UserAgentsService.
48 ;; For example http://myworld.com:9000 or http://myworld.com:8002
49 ;; This is a default that can be overwritten in some sections.
50 ; HomeURI = "${Const|GridURL}:${Const|PublicPort}"
51
52 ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {}
53 ;; If this is a standalone world, this is the address of this instance.
54 ;; If this is a grided simulator, this is the address of the external robust server
55 ;; that runs the Gatekeeper service.
56 ;; For example http://myworld.com:9000 or http://myworld.com:8002
57 ;; This is a default that can be overwritten in some sections.
58 ; GatekeeperURI = "${Const|GridURL}:${Const|PublicPort}"
59
60[Modules]
61 ;; Choose one cache module and the corresponding config file, if it exists.
62 ;; Copy the config .example file into your own .ini file and adapt that.
63 ;; We recommend the use of the FlotsamAssetCache since this is most actively maintained.
64 ; I think only Windows needs caching, haven't noticed any difference under Linux, which uses spare memory for file caching anyway.
65
66 AssetCaching = "FlotsamAssetCache"
67 Include-FlotsamCache = "config-include/FlotsamCache.ini"
68
69 ;AssetCaching = "CenomeMemoryAssetCache"
70 ;Include-CenomeCache = "config-include/CenomeCache.ini"
71
72 ;AssetCaching = "GlynnTuckerAssetCache"
73
74 ;; Optionally, the port for the LLProxyLoginModule module can be changed
75 ;Setup_LLProxyLoginModule = "9090/"
76
77 ;; Authorization is not on by default, as it depends on external php
78 ;AuthorizationServices = "RemoteAuthorizationServicesConnector"
79
80 ;; To allow the Teleport and Show on Map buttons to work properly (for search
81 ;; results containing locations). From ossearch module.
82; LandServices = "RemoteLandServicesConnector"
83; LandServiceInConnector = "true"
84
85[AssetService]
86 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
87 AssetLoaderArgs = "assets/AssetSets.xml"
88
89 ;
90 ; Change this to your grid-wide asset server. Do not add a slash to the end of any of these addresses.
91 ;
92 AssetServerURI = "${Const|GridURL}:${Const|PrivatePort}"
93
94 ConnectionString = "${Const|ConnectionString}"
95
96
97[InventoryService]
98 ;
99 ; Change this to your grid-wide inventory server
100 ;
101 InventoryServerURI = "${Const|GridURL}:${Const|PrivatePort}"
102
103 ConnectionString = "${Const|ConnectionString}"
104
105[GridInfo]
106 ;
107 ; Change this to your grid info service
108 ;
109 GridInfoURI = "${Const|GridURL}:${Const|PublicPort}"
110
111[GridService]
112 ;
113 ; Change this to your grid-wide grid server
114 ;
115 GridServerURI = "${Const|GridURL}:${Const|PrivatePort}"
116 AllowHypergridMapSearch = true
117
118 ;; Directory for map tile images of linked regions
119 MapTileDirectory = "${Const|CachePath}/maptiles"
120
121 ; === HG ONLY ===
122 ;; Change this to the address of your Gatekeeper service
123 ;; (usually bundled with the rest of the services in one
124 ;; Robust server in port ${Const|PublicPort}, but not always)
125 Gatekeeper="${Const|GridURL}:${Const|PublicPort}"
126
127[EstateDataStore]
128 ;
129 ; Uncomment if you want centralized estate data at robust server,
130 ; in which case the URL in [EstateService] will be used
131 ;
132 ;LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataRemoteConnector"
133
134[EstateService]
135 EstateServerURI = "${Const|GridURL}:${Const|PrivatePort}"
136
137[Messaging]
138 ; === HG ONLY ===
139 ;; Change this to the address of your Gatekeeper service
140 ;; (usually bundled with the rest of the services in one
141 ;; Robust server in port ${Const|PublicPort}, but not always)
142 Gatekeeper = "${Const|GridURL}:${Const|PublicPort}"
143
144[AvatarService]
145 ;
146 ; Change this to your grid-wide grid server
147 ;
148 AvatarServerURI = "${Const|GridURL}:${Const|PrivatePort}"
149
150 ConnectionString = "${Const|ConnectionString}"
151
152[AgentPreferencesService]
153 ;
154 ; Change this to your grid-wide avatar prefs server
155 ;
156 AgentPreferencesServerURI = "${Const|GridURL}:${Const|PrivatePort}"
157
158[PresenceService]
159 ;
160 ; Change this to your grid-wide presence server
161 ;
162 PresenceServerURI = "${Const|GridURL}:${Const|PrivatePort}"
163
164[UserAccountService]
165 ;
166 ; Change this to your grid-wide user accounts server
167 ;
168 UserAccountServerURI = "${Const|GridURL}:${Const|PrivatePort}"
169
170 ConnectionString = "${Const|ConnectionString}"
171
172[GridUserService]
173 ;
174 ; Change this to your grid-wide user accounts server
175 ;
176 GridUserServerURI = "${Const|GridURL}:${Const|PrivatePort}"
177
178 ConnectionString = "${Const|ConnectionString}"
179
180[AuthenticationService]
181 ;
182 ; Change this to your grid-wide authentication server
183 ;
184 AuthenticationServerURI = "${Const|GridURL}:${Const|PrivatePort}"
185
186 ConnectionString = "${Const|ConnectionString}"
187
188[FriendsService]
189 ;
190 ; Change this to your grid-wide friends server
191 ;
192 FriendsServerURI = "${Const|GridURL}:${Const|PrivatePort}"
193
194 ConnectionString = "${Const|ConnectionString}"
195
196[HGInventoryAccessModule]
197 ;
198 ; === HG ONLY ===
199 ; Change this to your server
200 ; accessible from other grids
201 ;
202 HomeURI = "${Const|GridURL}:${Const|PublicPort}"
203 Gatekeeper = "${Const|GridURL}:${Const|PublicPort}"
204 ;; If you want to protect your assets from being copied by foreign visitors
205 ;; set this to false. You may want to do this on sims that have licensed content.
206 ;; Default is true.
207 OutboundPermission = True
208
209 ;; Send visual reminder to local users that their inventories are unavailable while they are traveling
210 ;; and available when they return. True by default.
211 ;RestrictInventoryAccessAbroad = True
212
213 ;; Warning: advanced and unusual. Default is false.
214 ;; Enables configurations where grids share user services, including inventory,
215 ;; while separating regions' assets from users' assets. Asset transfer between
216 ;; the users' asset server and the regions' asset server is done in HG-like manner.
217 ; CheckSeparateAssets = false
218 ; RegionHGAssetServerURI = ${Const|GridURL}:${Const|PublicPort}
219
220
221[HGAssetService]
222 ;
223 ; === HG ONLY ===
224 ; Change this to your server
225 ; accessible from other grids
226 ;
227 HomeURI = "${Const|GridURL}:${Const|PublicPort}"
228
229 ;; The asset types that this grid can export to / import from other grids.
230 ;; Comma separated.
231 ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely:
232 ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText,
233 ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh
234 ;;
235 ;; Leave blank or commented if you don't want to apply any restrictions.
236 ;; A more strict, but still reasonable, policy may be to disallow the exchange
237 ;; of scripts, like so:
238 ; DisallowExport ="LSLText"
239 ; DisallowImport ="LSLBytecode"
240
241[HGFriendsModule]
242 ; User level required to be able to send friendship invitations to foreign users
243 LevelHGFriends = 0;
244
245[UserAgentService]
246 ;
247 ; === HG ONLY ===
248 ; Change this to your user agent server (HG robust)
249 ;
250 UserAgentServerURI = "${Const|GridURL}:${Const|PublicPort}"
251
252[MapImageService]
253 MapImageServerURI = "${Const|GridURL}:${Const|PrivatePort}"
254
255[AuthorizationService]
256 ; If you have regions with access restrictions
257 ; specify them here using the convention
258 ; Region_<Region_Name> = <flags>
259 ; Valid flags are:
260 ; DisallowForeigners -- HG visitors not allowed
261 ; DisallowResidents -- only Admins and Managers allowed
262 ; Example:
263 ; Region_Test_1 = "DisallowForeigners"
264
265;; Uncomment if you are using SimianGrid for grid services
266[SimianGrid]
267 ;; SimianGrid services URL
268 ;; SimianServiceURL = "http://grid.sciencesim.com/Grid/"
269
270 ;; Capability assigned by the grid administrator for the simulator
271 ;; SimulatorCapability = "00000000-0000-0000-0000-000000000000"
272