aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rwxr-xr-xInstallItAll.sh36
-rw-r--r--OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs3
-rw-r--r--README.md9
-rw-r--r--config/OpenSimDefaults.ini14
-rw-r--r--config/Robust.ini.template58
-rw-r--r--config/config.ini1
-rw-r--r--config/sim01/My_sim.xml4
-rw-r--r--scripts/opensim-crontab.txt16
-rw-r--r--scripts/opensim.tmux.conf4
-rwxr-xr-xscripts/start-sim2
10 files changed, 71 insertions, 76 deletions
diff --git a/InstallItAll.sh b/InstallItAll.sh
index ab1074d..124fd5a 100755
--- a/InstallItAll.sh
+++ b/InstallItAll.sh
@@ -1,12 +1,12 @@
1#!/bin/bash 1#!/bin/bash
2 2
3OSPATH="/opt/opensim_TEST" 3OSPATH="/opt/opensim"
4MYSQL_HOST="localhost" 4MYSQL_HOST="localhost"
5MYSQL_DB="InfiniteGrid" 5MYSQL_DB="InfiniteGrid"
6MYSQL_USER="opensim" 6MYSQL_USER="opensim"
7OS_USER="opensim" 7OS_USER="opensim"
8 8
9OSVER="8.2.1" 9OSVER="0.8.2.1"
10 10
11 11
12# Figure out where we are, most of this mess is to troll through soft links. 12# Figure out where we are, most of this mess is to troll through soft links.
@@ -51,21 +51,21 @@ fi
51USER=$(whoami) 51USER=$(whoami)
52 52
53echo "Installing software." 53echo "Installing software."
54#sudo apt-get install mysql-server tmux mono-complete uuid-runtime monit mc 54sudo apt-get install mysql-server tmux mono-complete nant nunit uuid-runtime monit mc
55#sudo /etc/init.d/mysql restart 55sudo /etc/init.d/mysql restart
56 56
57echo "Setting up mySQL." 57echo "Setting up mySQL."
58#mysql -u root -p -h localhost << zzzzEOFzzz 58mysql -u root -p -h localhost << zzzzEOFzzz
59#create database if not exists '$MYSQL_DB'; 59create database if not exists $MYSQL_DB;
60#create user '$OS_USER' identified by '$MYSQL_PASSWORD'; 60create user $OS_USER identified by '$MYSQL_PASSWORD';
61#create user '$OS_USER'@'localhost' identified by '$MYSQL_PASSWORD'; 61create user $OS_USER@localhost identified by '$MYSQL_PASSWORD';
62#grant all on $MYSQL_DB.* to '$OS_USER'; 62grant all on $MYSQL_DB.* to $OS_USER;
63#grant all on $MYSQL_DB.* to '$OS_USER'@'localhost'; 63grant all on $MYSQL_DB.* to $OS_USER@localhost;
64#FLUSH PRIVILEGES; 64FLUSH PRIVILEGES;
65#zzzzEOFzzz 65zzzzEOFzzz
66 66
67echo "Setting up OpenSim." 67echo "Setting up OpenSim."
68sudo adduser --system --shell /bin/false --group $OS_USER 68sudo adduser --system --shell /bin/bash --group $OS_USER
69sudo addgroup $USER $OS_USER 69sudo addgroup $USER $OS_USER
70 70
71sudo rm -fr $OSPATH/opensim-IG_* 71sudo rm -fr $OSPATH/opensim-IG_*
@@ -85,9 +85,6 @@ sudo chmod -R g+w $OSPATH
85sudo chmod -R a+x $OSPATH/current/scripts/*.sh 85sudo chmod -R a+x $OSPATH/current/scripts/*.sh
86sudo chmod a+x $OSPATH/current/scripts/show-console 86sudo chmod a+x $OSPATH/current/scripts/show-console
87sudo chmod a+x $OSPATH/current/scripts/start-sim 87sudo chmod a+x $OSPATH/current/scripts/start-sim
88sudo chmod ug+rwx config
89sudo chmod g+s config
90sudo chmod 600 config/config.ini
91 88
92for dir in AssetFiles backups caches config db logs 89for dir in AssetFiles backups caches config db logs
93do 90do
@@ -96,11 +93,17 @@ do
96 sudo ln -fs ../$dir $dir 93 sudo ln -fs ../$dir $dir
97done 94done
98 95
96sudo chmod ug+rwx $OSPATH/config
97sudo chmod g+s $OSPATH/config
98sudo chmod 600 $OSPATH/config/config.ini
99
99pushd config/ROBUST >/dev/null 100pushd config/ROBUST >/dev/null
101sudo ln -fs ../../current/scripts/common.sh common.sh
100sudo ln -fs ../../current/scripts/start-sim start-sim 102sudo ln -fs ../../current/scripts/start-sim start-sim
101sudo ln -fs ../../current/scripts/start-sim stop-sim 103sudo ln -fs ../../current/scripts/start-sim stop-sim
102popd >/dev/null 104popd >/dev/null
103pushd config/sim01 >/dev/null 105pushd config/sim01 >/dev/null
106sudo ln -fs ../../current/scripts/common.sh common.sh
104sudo ln -fs ../../current/scripts/start-sim backup-sim 107sudo ln -fs ../../current/scripts/start-sim backup-sim
105sudo ln -fs ../../current/scripts/start-sim start-sim 108sudo ln -fs ../../current/scripts/start-sim start-sim
106sudo ln -fs ../../current/scripts/start-sim stop-sim 109sudo ln -fs ../../current/scripts/start-sim stop-sim
@@ -118,4 +121,3 @@ sudo chown $USER /home/$OS_USER/.tmux.conf
118sudo chmod 644 /home/$OS_USER/.tmux.conf 121sudo chmod 644 /home/$OS_USER/.tmux.conf
119 122
120sudo scripts/fix_var_run.sh 123sudo scripts/fix_var_run.sh
121sudo cat scripts/opensim-crontab.txt | sudo crontab -u $OS_USER -
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 98032cb..17646fb 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -599,7 +599,8 @@ namespace OpenSim.Region.CoreModules.Asset
599 } 599 }
600 catch (Exception e) 600 catch (Exception e)
601 { 601 {
602 m_log.Warn(string.Format("[FLOTSAM ASSET CACHE]: Could not complete clean of expired files in {0}", dir), e); 602//// TODO - I'm almost sure this is another case of failing to delete something that doesn't actually exist.
603//// m_log.Warn(string.Format("[FLOTSAM ASSET CACHE]: Could not complete clean of expired files in {0}", dir));
603 } 604 }
604 } 605 }
605 606
diff --git a/README.md b/README.md
index c648e6a..3ab2339 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
1Use this to create a sim that links into Infinite Grid from Linux. 1Use this to create a sim that links into Infinite Grid from Linux.
2 2
3It's only been tested on Ubuntu 10.04, 11.04, and 12.04, YMMV. This is 3It's only been tested on Ubuntu 10.04, 11.04, 12.04, and 16.04, YMMV.
4also a WIP, use it at your own risk. It's been used to set up two 4This is also a WIP, use it at your own risk. It's been used to set up
5freshly installed Ubuntu servers though. 5a few freshly installed Ubuntu servers though.
6 6
7Follow these steps. 7Follow these steps.
8------------------- 8-------------------
@@ -22,7 +22,7 @@ Next you need to figure out what password you want to use for OpenSims
22access to the database. We will call this "DatabasePassword". Run the 22access to the database. We will call this "DatabasePassword". Run the
23following script - 23following script -
24 24
25./install_opensim.sh DatabasePassword 25./InstallItAll.sh DatabasePassword
26 26
27This will do most of the work for you, except for creating sims. There 27This will do most of the work for you, except for creating sims. There
28is a final step that needs to be done manually for now. Edit 28is a final step that needs to be done manually for now. Edit
@@ -75,7 +75,6 @@ You can backup the sim with -
75 75
76./backup-sim 76./backup-sim
77 77
78Though they all get backed up every six hours anyway.
79 78
80 79
81Finishing up. 80Finishing up.
diff --git a/config/OpenSimDefaults.ini b/config/OpenSimDefaults.ini
index b62bcd7..12ca68f 100644
--- a/config/OpenSimDefaults.ini
+++ b/config/OpenSimDefaults.ini
@@ -807,8 +807,8 @@
807 807
808 ;# {OfflineMessageURL} {OfflineMessageModule:OfflineMessageModule Offline Message Module V2:Offline Message Module V2} {URL of offline messaging service} {} 808 ;# {OfflineMessageURL} {OfflineMessageModule:OfflineMessageModule Offline Message Module V2:Offline Message Module V2} {URL of offline messaging service} {}
809 ;; URL of web service for offline message storage. Leave it commented if your service is local to the sim. 809 ;; URL of web service for offline message storage. Leave it commented if your service is local to the sim.
810 ; OfflineMessageURL = ${Const|BaseURL}/Offline.php 810 ; OfflineMessageURL = ${Const|GridURL}/Offline.php
811 OfflineMessageURL = ${Const|BaseURL}:${Const|PrivatePort} 811 OfflineMessageURL = ${Const|GridURL}:${Const|PrivatePort}
812 812
813 ;# {StorageProvider} {Offline Message Module V2:Offline Message Module V2} {DLL that provides the storage interface} {OpenSim.Data.MySQL.dll} 813 ;# {StorageProvider} {Offline Message Module V2:Offline Message Module V2} {DLL that provides the storage interface} {OpenSim.Data.MySQL.dll}
814 ;; For standalones, this is the storage dll. 814 ;; For standalones, this is the storage dll.
@@ -822,7 +822,7 @@
822 ;# {MuteListURL} {OfflineMessageModule:OfflineMessageModule} {} {} http://yourserver/Mute.php 822 ;# {MuteListURL} {OfflineMessageModule:OfflineMessageModule} {} {} http://yourserver/Mute.php
823 ;; URL of the web service that serves mute lists. Not currently used, but 823 ;; URL of the web service that serves mute lists. Not currently used, but
824 ;; must be set to allow offline messaging to work. 824 ;; must be set to allow offline messaging to work.
825 MuteListURL = "${Const|BaseURL}/opensim/mute.php" 825 MuteListURL = "${Const|GridURL}/opensim/mute.php"
826 826
827 ;; Control whether group invites and notices are stored for offline users. 827 ;; Control whether group invites and notices are stored for offline users.
828 ;; Default is true. 828 ;; Default is true.
@@ -1960,9 +1960,9 @@
1960 ;; URI for the groups services of this grid 1960 ;; URI for the groups services of this grid
1961 ;; e.g. http://yourxmlrpcserver.com/xmlrpc.php for Flotsam XmlRpc 1961 ;; e.g. http://yourxmlrpcserver.com/xmlrpc.php for Flotsam XmlRpc
1962 ;; or http://mygridserver.com:82/Grid/ for SimianGrid 1962 ;; or http://mygridserver.com:82/Grid/ for SimianGrid
1963 ;; or ${Const|BaseURL}:${Const|PrivatePort} for robust, V2 1963 ;; or ${Const|GridURL}:${Const|PrivatePort} for robust, V2
1964 ;; Leave it commented for standalones, V2 1964 ;; Leave it commented for standalones, V2
1965 GroupsServerURI = "${Const|BaseURL}:${Const|PrivatePort}" 1965 GroupsServerURI = "${Const|GridURL}:${Const|PrivatePort}"
1966 1966
1967 ;# {HomeURI} {ServicesConnectorModule:Groups HG Service Connector} {What's the home address of this world?} {} 1967 ;# {HomeURI} {ServicesConnectorModule:Groups HG Service Connector} {What's the home address of this world?} {}
1968 ;; Used for V2 in HG only. For example 1968 ;; Used for V2 in HG only. For example
@@ -2088,14 +2088,14 @@
2088 ;; points to your grid's Robust user profiles service 2088 ;; points to your grid's Robust user profiles service
2089 ;; 2089 ;;
2090 ; ProfileURL = http://127.0.0.1:9000 2090 ; ProfileURL = http://127.0.0.1:9000
2091 ProfileServiceURL = ${Const|BaseURL}:${Const|PublicPort} 2091 ProfileServiceURL = ${Const|GridURL}:${Const|PublicPort}
2092 2092
2093 2093
2094[XBakes] 2094[XBakes]
2095 ;# {URL} {} {Set URL for Baked texture service} {} 2095 ;# {URL} {} {Set URL for Baked texture service} {}
2096 ;; Sets the URL for the baked texture ROBUST service. 2096 ;; Sets the URL for the baked texture ROBUST service.
2097 ;; Disabled when unset. 2097 ;; Disabled when unset.
2098 URL = ${Const|BaseURL}:${Const|PrivatePort} 2098 URL = ${Const|GridURL}:${Const|PrivatePort}
2099 2099
2100 2100
2101;; 2101;;
diff --git a/config/Robust.ini.template b/config/Robust.ini.template
index b7a68a6..4ee1bb3 100644
--- a/config/Robust.ini.template
+++ b/config/Robust.ini.template
@@ -153,14 +153,14 @@
153 ;; runs the UserAgentsService, possibly this server. 153 ;; runs the UserAgentsService, possibly this server.
154 ;; For example http://myworld.com:8002 154 ;; For example http://myworld.com:8002
155 ;; This is a default that can be overwritten in some sections. 155 ;; This is a default that can be overwritten in some sections.
156 HomeURI = "${Const|BaseURL}:${Const|PublicPort}" 156 HomeURI = "${Const|GridURL}:${Const|PublicPort}"
157 157
158 ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {} 158 ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {}
159 ;; This is the address of the external robust server 159 ;; This is the address of the external robust server
160 ;; that runs the Gatekeeper service, possibly this server. 160 ;; that runs the Gatekeeper service, possibly this server.
161 ;; For example http://myworld.com:8002 161 ;; For example http://myworld.com:8002
162 ;; This is a default that can be overwritten in some sections. 162 ;; This is a default that can be overwritten in some sections.
163 GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}" 163 GatekeeperURI = "${Const|GridURL}:${Const|PublicPort}"
164 164
165[AccessControl] 165[AccessControl]
166 ;# {AllowedClients} {} {Bar (|) separated list of allowed clients} {} 166 ;# {AllowedClients} {} {Bar (|) separated list of allowed clients} {}
@@ -306,7 +306,7 @@
306 ExportSupported = true 306 ExportSupported = true
307 307
308 ;; If you have this set under [Hypergrid], no need to set it here, leave it commented 308 ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
309 ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}" 309 ; GatekeeperURI = "${Const|GridURL}:${Const|PublicPort}"
310 310
311 311
312; * This is the configuration for the freeswitch server in grid mode 312; * This is the configuration for the freeswitch server in grid mode
@@ -470,31 +470,31 @@
470 AllowRemoteSetLoginLevel = "false" 470 AllowRemoteSetLoginLevel = "false"
471 471
472 ; For V2 map 472 ; For V2 map
473 MapTileURL = "${Const|BaseURL}:${Const|PublicPort}/"; 473 MapTileURL = "${Const|GridURL}:${Const|PublicPort}/";
474 474
475 ; Url to search service 475 ; Url to search service
476 ; SearchURL = "${Const|BaseURL}:${Const|PublicPort}/"; 476 ; SearchURL = "${Const|GridURL}:${Const|PublicPort}/";
477 477
478 ; For V3 destination guide 478 ; For V3 destination guide
479 ; DestinationGuide = "${Const|BaseURL}/guide" 479 ; DestinationGuide = "${Const|GridURL}/guide"
480 480
481 ; For V3 avatar picker (( work in progress )) 481 ; For V3 avatar picker (( work in progress ))
482 ; AvatarPicker = "${Const|BaseURL}/avatars" 482 ; AvatarPicker = "${Const|GridURL}/avatars"
483 483
484 ; If you run this login server behind a proxy, set this to true 484 ; If you run this login server behind a proxy, set this to true
485 ; HasProxy = false 485 ; HasProxy = false
486 486
487 ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs) 487 ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs)
488 ;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented 488 ;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented
489 ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}" 489 ; GatekeeperURI = "${Const|GridURL}:${Const|PublicPort}"
490 490
491 SRV_HomeURI = "${Const|BaseURL}:${Const|PublicPort}" 491 SRV_HomeURI = "${Const|GridURL}:${Const|PublicPort}"
492 SRV_InventoryServerURI = "${Const|BaseURL}:${Const|PublicPort}" 492 SRV_InventoryServerURI = "${Const|GridURL}:${Const|PublicPort}"
493 SRV_AssetServerURI = "${Const|BaseURL}:${Const|PublicPort}" 493 SRV_AssetServerURI = "${Const|GridURL}:${Const|PublicPort}"
494 SRV_ProfileServerURI = "${Const|BaseURL}:${Const|PublicPort}" 494 SRV_ProfileServerURI = "${Const|GridURL}:${Const|PublicPort}"
495 SRV_FriendsServerURI = "${Const|BaseURL}:${Const|PublicPort}" 495 SRV_FriendsServerURI = "${Const|GridURL}:${Const|PublicPort}"
496 SRV_IMServerURI = "${Const|BaseURL}:${Const|PublicPort}" 496 SRV_IMServerURI = "${Const|GridURL}:${Const|PublicPort}"
497 SRV_GroupsServerURI = "${Const|BaseURL}:${Const|PublicPort}" 497 SRV_GroupsServerURI = "${Const|GridURL}:${Const|PublicPort}"
498 498
499 ;# {DSTZone} {} {Override Daylight Saving Time rules} {* none local} "America/Los_Angeles;Pacific Standard Time" 499 ;# {DSTZone} {} {Override Daylight Saving Time rules} {* none local} "America/Los_Angeles;Pacific Standard Time"
500 ;; Viewers do not receive timezone information from the server - almost all (?) default to Pacific Standard Time 500 ;; Viewers do not receive timezone information from the server - almost all (?) default to Pacific Standard Time
@@ -551,42 +551,42 @@
551 ; See http://opensimulator.org/wiki/GridInfo 551 ; See http://opensimulator.org/wiki/GridInfo
552 552
553 ; login uri: for grid this is the login server URI 553 ; login uri: for grid this is the login server URI
554 login = ${Const|BaseURL}:${Const|PublicPort}/ 554 login = ${Const|GridURL}:${Const|PublicPort}/
555 555
556 ; long grid name: the long name of your grid 556 ; long grid name: the long name of your grid
557 gridname = "${Const|GridName}" 557 gridname = "${Const|GridName}"
558 558
559 ; short grid name: the short name of your grid 559 ; short grid name: the short name of your grid
560 gridnick = "${Const|GridName}" 560 gridnick = "${Const|ShortGridName}"
561 561
562 ; login page: optional: if it exists it will be used to tell the client to use 562 ; login page: optional: if it exists it will be used to tell the client to use
563 ; this as splash page 563 ; this as splash page
564 ;welcome = ${Const|BaseURL}/welcome 564 welcome = ${Const|GridURL}/drupal/loginpage
565 565
566 ; helper uri: optional: if it exists it will be used to tell the client to use 566 ; helper uri: optional: if it exists it will be used to tell the client to use
567 ; this for all economy related things 567 ; this for all economy related things
568 ;economy = ${Const|BaseURL}/economy 568 ;economy = ${Const|GridURL}/economy
569 569
570 ; web page of grid: optional: page providing further information about your grid 570 ; web page of grid: optional: page providing further information about your grid
571 ;about = ${Const|BaseURL}/about 571 about = ${Const|GridURL}/drupal/
572 572
573 ; account creation: optional: page providing further information about obtaining 573 ; account creation: optional: page providing further information about obtaining
574 ; a user account on your grid 574 ; a user account on your grid
575 ;register = ${Const|BaseURL}/register 575 register = ${Const|GridURL}/drupal/content/How_to_join
576 576
577 ; help: optional: page providing further assistance for users of your grid 577 ; help: optional: page providing further assistance for users of your grid
578 ;help = ${Const|BaseURL}/help 578 help = ${Const|GridURL}/drupal/Tags/help
579 579
580 ; password help: optional: page providing password assistance for users of your grid 580 ; password help: optional: page providing password assistance for users of your grid
581 ;password = ${Const|BaseURL}/password 581 password = ${Const|GridURL}/drupal
582 582
583 ; HG address of the gatekeeper, if you have one 583 ; HG address of the gatekeeper, if you have one
584 ; this is the entry point for all the regions of the world 584 ; this is the entry point for all the regions of the world
585 ; gatekeeper = ${Const|BaseURL}:${Const|PublicPort}/ 585 ; gatekeeper = ${Const|GridURL}:${Const|PublicPort}/
586 586
587 ; HG user domain, if you have one 587 ; HG user domain, if you have one
588 ; this is the entry point for all user-related HG services 588 ; this is the entry point for all user-related HG services
589 ; uas = ${Const|BaseURL}:${Const|PublicPort}/ 589 ; uas = ${Const|GridURL}:${Const|PublicPort}/
590 590
591 591
592[GatekeeperService] 592[GatekeeperService]
@@ -601,7 +601,7 @@
601 SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" 601 SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
602 ; how does the outside world reach me? This acts as public key too. 602 ; how does the outside world reach me? This acts as public key too.
603 ;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented 603 ;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented
604 ; ExternalName = "${Const|BaseURL}:${Const|PublicPort}" 604 ; ExternalName = "${Const|GridURL}:${Const|PublicPort}"
605 605
606 ; Does this grid allow incoming links to any region in it? 606 ; Does this grid allow incoming links to any region in it?
607 ; If false, HG TPs happen only to the Default regions specified in [GridService] section 607 ; If false, HG TPs happen only to the Default regions specified in [GridService] section
@@ -691,7 +691,7 @@
691 AuthType = None 691 AuthType = None
692 692
693 ;; Can overwrite the default in [Hypergrid], but probably shouldn't 693 ;; Can overwrite the default in [Hypergrid], but probably shouldn't
694 ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}" 694 ; HomeURI = "${Const|GridURL}:${Const|PublicPort}"
695 695
696 696
697; * The interface that local users get when they are in other grids. 697; * The interface that local users get when they are in other grids.
@@ -710,7 +710,7 @@
710 AuthType = None 710 AuthType = None
711 711
712 ;; Can overwrite the default in [Hypergrid], but probably shouldn't 712 ;; Can overwrite the default in [Hypergrid], but probably shouldn't
713 ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}" 713 ; HomeURI = "${Const|GridURL}:${Const|PublicPort}"
714 714
715 ;; The asset types that this grid can export to / import from other grids. 715 ;; The asset types that this grid can export to / import from other grids.
716 ;; Comma separated. 716 ;; Comma separated.
@@ -755,7 +755,7 @@
755 755
756 ;; What is the HomeURI of users associated with this grid? 756 ;; What is the HomeURI of users associated with this grid?
757 ;; Can overwrite the default in [Hypergrid], but probably shouldn't 757 ;; Can overwrite the default in [Hypergrid], but probably shouldn't
758 ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}" 758 ; HomeURI = "${Const|GridURL}:${Const|PublicPort}"
759 759
760 ;; Sets the maximum number of groups an agent may join 760 ;; Sets the maximum number of groups an agent may join
761 MaxAgentGroups = 420 761 MaxAgentGroups = 420
diff --git a/config/config.ini b/config/config.ini
index 31ce07f..99d3c96 100644
--- a/config/config.ini
+++ b/config/config.ini
@@ -28,6 +28,7 @@
28 ;# {BaseURL} {} {BaseURL} {"http://example.com" "http://127.0.0.1"} "http://127.0.0.1" 28 ;# {BaseURL} {} {BaseURL} {"http://example.com" "http://127.0.0.1"} "http://127.0.0.1"
29 HostName = "localhost" 29 HostName = "localhost"
30 BaseURL = http://127.0.0.1 30 BaseURL = http://127.0.0.1
31 GridURL = http://grid.infinitegrid.org
31 32
32 ;# {PublicPort} {} {PublicPort} {8002 9000} "8002" 33 ;# {PublicPort} {} {PublicPort} {8002 9000} "8002"
33 PublicPort = "8002" 34 PublicPort = "8002"
diff --git a/config/sim01/My_sim.xml b/config/sim01/My_sim.xml
index 144cb0a..2f893ad 100644
--- a/config/sim01/My_sim.xml
+++ b/config/sim01/My_sim.xml
@@ -6,6 +6,8 @@
6 <Key Name="InternalPort" Value="9106" /> 6 <Key Name="InternalPort" Value="9106" />
7 <Key Name="AllowAlternatePorts" Value="False" /> 7 <Key Name="AllowAlternatePorts" Value="False" />
8 <Key Name="ExternalHostName" Value="SYSTEMIP" /> 8 <Key Name="ExternalHostName" Value="SYSTEMIP" />
9 <Key Name="RegionType" Value="public sim" /> 9 <Key Name="RegionType" Value="private sim" />
10 <Key Name="SizeX" Value="256" />
11 <Key Name="SizeY" Value="256" />
10 </Section> 12 </Section>
11</Nini> 13</Nini>
diff --git a/scripts/opensim-crontab.txt b/scripts/opensim-crontab.txt
deleted file mode 100644
index 2a0dbed..0000000
--- a/scripts/opensim-crontab.txt
+++ /dev/null
@@ -1,16 +0,0 @@
1# to see current crontab for opensim
2# $ sudo crontab -u opensim -l
3#
4# to install this crontab for opensim:
5# $ cat /opt/opensim/current/scripts/opensim-crontab.txt | sudo crontab -u opensim -
6#
7# at midnight, remove old logs, files created 3 or more days ago
8#0 0 * * * find /var/log/opensim -ctime +1 -delete
9# experimental version using savelog -c cycles all opensim log files over 7 days
10#0 0 * * * /usr/bin/savelog -c 7 /var/log/opensim/*.log > /dev/null
11
12# Backup the inventories and sims every week.
13#0 */6 * * * /opt/opensim/current/scripts/backup-sims.sh
14
15# Only backup inventories on the grid server itself.
16#55 */6 * * * /opt/opensim/current/scripts/backup-inventories.sh
diff --git a/scripts/opensim.tmux.conf b/scripts/opensim.tmux.conf
index ecd0b04..c101f88 100644
--- a/scripts/opensim.tmux.conf
+++ b/scripts/opensim.tmux.conf
@@ -14,6 +14,7 @@ set-option -g bell-on-alert on
14 14
15set-option -g history-limit 100000 15set-option -g history-limit 100000
16 16
17# These three wont work under Ubuntu 16.04.
17set-option -g mouse-resize-pane on 18set-option -g mouse-resize-pane on
18set-option -g mouse-select-pane on 19set-option -g mouse-select-pane on
19set-option -g mouse-select-window on 20set-option -g mouse-select-window on
@@ -37,7 +38,10 @@ set-option -g visual-content on
37set-option -g visual-silence on 38set-option -g visual-silence on
38 39
39set-option -gw clock-mode-style 24 40set-option -gw clock-mode-style 24
41# This wont work under Ubuntu 16.04.
40set-option -gw mode-mouse on 42set-option -gw mode-mouse on
43# Instead do this (also defaults to turning on the above three mouse things) -
44#set-option -gw mouse on
41 45
42# Highlight active window 46# Highlight active window
43set-option -gw window-status-current-bg red 47set-option -gw window-status-current-bg red
diff --git a/scripts/start-sim b/scripts/start-sim
index c9cca04..936fe13 100755
--- a/scripts/start-sim
+++ b/scripts/start-sim
@@ -102,6 +102,7 @@ case $(basename $0) in
102 ;; 102 ;;
103 103
104 "backup-inventory") 104 "backup-inventory")
105 cd ${PRGDIR}
105 $SUDO ${PRGDIR}/gitAR.sh i "${inventory}" 106 $SUDO ${PRGDIR}/gitAR.sh i "${inventory}"
106 user=$(sanitize "${inventory}") 107 user=$(sanitize "${inventory}")
107 # Add the full date and time to create the IAR file name. 108 # Add the full date and time to create the IAR file name.
@@ -112,6 +113,7 @@ case $(basename $0) in
112 ;; 113 ;;
113 114
114 "backup-sim") 115 "backup-sim")
116 cd ${PRGDIR}
115 $SUDO ${PRGDIR}/gitAR.sh o "${title}" 117 $SUDO ${PRGDIR}/gitAR.sh o "${title}"
116 sim=$(sanitize "${title}") 118 sim=$(sanitize "${title}")
117 # Add the full date and time to create the OAR file name. 119 # Add the full date and time to create the OAR file name.