aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/config-include
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-03-12 20:29:17 +0000
committerJustin Clark-Casey (justincc)2010-03-12 20:29:17 +0000
commitaad17e751383069b799c6a78a3ac4e0ca1020a4d (patch)
tree80b18150e5e91711cb25cf1dc64b1d1a6bcb6182 /bin/config-include
parentMerge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-aad17e751383069b799c6a78a3ac4e0ca1020a4d.zip
opensim-SC_OLD-aad17e751383069b799c6a78a3ac4e0ca1020a4d.tar.gz
opensim-SC_OLD-aad17e751383069b799c6a78a3ac4e0ca1020a4d.tar.bz2
opensim-SC_OLD-aad17e751383069b799c6a78a3ac4e0ca1020a4d.tar.xz
Simplify database setup and remove migration problems by moving all sqlite config-include settings to a separate file for standalone
Update information in StandaloneCommon.ini.example to reflect this Remove ISharedRegionModule interfaces from all SimianGrid connector classes temporarily since this stopped standalone from working (due to absence of AssetURI settings, etc.). Solution here may be to create separate region module connectors as done by local/grid/hypergrid so that loading can be controlled via include files Or otherwise work out how to stop these modules from being loaded for all OpenSim invocations
Diffstat (limited to 'bin/config-include')
-rw-r--r--bin/config-include/Standalone.ini4
-rw-r--r--bin/config-include/StandaloneCommon.ini.example23
-rw-r--r--bin/config-include/storage/SQLiteStandalone.ini16
3 files changed, 30 insertions, 13 deletions
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 3011370..54e11af 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -32,14 +32,12 @@
32 32
33[AvatarService] 33[AvatarService]
34 LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" 34 LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService"
35 ConnectionString = "URI=file:avatars.db,version=3"
36 35
37[AuthorizationService] 36[AuthorizationService]
38 LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService" 37 LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
39 38
40[AuthenticationService] 39[AuthenticationService]
41 LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 40 LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
42 ConnectionString = "URI=file:auth.db,version=3"
43 41
44[GridService] 42[GridService]
45 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 43 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
@@ -52,7 +50,6 @@
52 50
53[UserAccountService] 51[UserAccountService]
54 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" 52 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
55 ConnectionString = "URI=file:userprofiles.db,version=3"
56 53
57 ;; These are for creating new accounts 54 ;; These are for creating new accounts
58 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 55 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
@@ -62,7 +59,6 @@
62 59
63[FriendsService] 60[FriendsService]
64 LocalServiceModule = "OpenSim.Services.FriendsService.dll" 61 LocalServiceModule = "OpenSim.Services.FriendsService.dll"
65 ConnectionString = "URI=file:friends.db,version=3"
66 62
67[Friends] 63[Friends]
68 Connector = "OpenSim.Services.FriendsService.dll" 64 Connector = "OpenSim.Services.FriendsService.dll"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 8e21a8c..f89c67a 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -1,19 +1,24 @@
1; This is the main configuration file for standalone OpenSim instances
2
1[DatabaseService] 3[DatabaseService]
2 ; 4 ;
3 ;### Choose the DB 5 ; ### Choose the DB
4 ; 6 ;
5 ;--- For SQLite 7
6 StorageProvider = "OpenSim.Data.SQLite.dll" 8 ; SQLite
7 ;--- For MySql 9 ; Uncomment this line if you want to use sqlite storage
10 Include-Storage = "config-include/storage/SQLiteStandalone.ini";
11
12 ; For MySql.
13 ; Uncomment these lines if you want to use mysql storage
14 ; Change the connection string to your db details
8 ;StorageProvider = "OpenSim.Data.MySQL.dll" 15 ;StorageProvider = "OpenSim.Data.MySQL.dll"
9 ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;" 16 ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
10 17
11[AssetService] 18[AssetService]
12
13 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" 19 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
14 AssetLoaderArgs = "assets/AssetSets.xml" 20 AssetLoaderArgs = "assets/AssetSets.xml"
15 21
16
17[Modules] 22[Modules]
18 ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. 23 ;; 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 24 ;; Copy the config .example file into your own .ini file and change configs there
@@ -35,10 +40,10 @@
35 40
36[GridService] 41[GridService]
37 ;; For in-memory region storage (default) 42 ;; For in-memory region storage (default)
38 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" 43 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
39 ;;--- For MySql region storage (alternative) 44 ;;--- For MySql region storage (alternative)
40 ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData" 45 ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
41 ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;" 46
42 ;; Next, we can specify properties of regions, including default and fallback regions 47 ;; Next, we can specify properties of regions, including default and fallback regions
43 ;; The syntax is: Region_<RegioName> = "<flags>" 48 ;; The syntax is: Region_<RegioName> = "<flags>"
44 ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut 49 ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut
diff --git a/bin/config-include/storage/SQLiteStandalone.ini b/bin/config-include/storage/SQLiteStandalone.ini
new file mode 100644
index 0000000..1ce0357
--- /dev/null
+++ b/bin/config-include/storage/SQLiteStandalone.ini
@@ -0,0 +1,16 @@
1; These are the initialization settings for running OpenSim Standalone with an SQLite database
2
3[DatabaseService]
4 StorageProvider = "OpenSim.Data.SQLite.dll"
5
6[AvatarService]
7 ConnectionString = "URI=file:avatars.db,version=3"
8
9[AuthenticationService]
10 ConnectionString = "URI=file:auth.db,version=3"
11
12[UserAccountService]
13 ConnectionString = "URI=file:userprofiles.db,version=3"
14
15[FriendsService]
16 ConnectionString = "URI=file:friends.db,version=3"