aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--TODO.txt1
-rw-r--r--bin/Robust.ini5
-rw-r--r--example/config/config.ini1
-rwxr-xr-xscripts/install/secure.sh1
-rwxr-xr-xscripts/robust-include11
-rwxr-xr-xscripts/start-sim4
6 files changed, 6 insertions, 17 deletions
diff --git a/TODO.txt b/TODO.txt
index 8e71978..04bbdc5 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,7 +1,6 @@
1Still to do - 1Still to do -
2 2
3Clean up the configs. 3Clean up the configs.
4 Make robust support includes.
5 Why do we have Include-Common, Include-modules, Include-osslEnable, Include-Architecture, Include-Storage, Include-*Cache ?????? 4 Why do we have Include-Common, Include-modules, Include-osslEnable, Include-Architecture, Include-Storage, Include-*Cache ??????
6 It only looks for "Include-". 5 It only looks for "Include-".
7 Maybe move bin/assets and bin/inventory out of tree as well? 6 Maybe move bin/assets and bin/inventory out of tree as well?
diff --git a/bin/Robust.ini b/bin/Robust.ini
index 30e64be..4e92d1a 100644
--- a/bin/Robust.ini
+++ b/bin/Robust.ini
@@ -1,4 +1,9 @@
1 1
2[Includes]
3 ; Define your server specific constants in this file.
4 Include-Common = ../../config/config.ini
5
6
2; * The startup section lists all the connectors to start up in this server 7; * The startup section lists all the connectors to start up in this server
3; * instance. This may be only one, or it may be the entire server suite. 8; * instance. This may be only one, or it may be the entire server suite.
4; * Multiple connectors should be separated by commas. 9; * Multiple connectors should be separated by commas.
diff --git a/example/config/config.ini b/example/config/config.ini
index 510c8b6..7efdb44 100644
--- a/example/config/config.ini
+++ b/example/config/config.ini
@@ -15,6 +15,7 @@
15 AssetsPath = "../../AssetFiles" 15 AssetsPath = "../../AssetFiles"
16 BackupPath = "../../backups" 16 BackupPath = "../../backups"
17 CachePath = "../../caches" 17 CachePath = "../../caches"
18 ConfigPath = "../../config"
18 DbPath = "../../db" 19 DbPath = "../../db"
19 LogPath = "../../logs" 20 LogPath = "../../logs"
20 21
diff --git a/scripts/install/secure.sh b/scripts/install/secure.sh
index db73558..43ed679 100755
--- a/scripts/install/secure.sh
+++ b/scripts/install/secure.sh
@@ -12,7 +12,6 @@ sudo chmod -R g+w ${OS_PATH}
12sudo chmod -R a+x ${OS_PATH}/current/*.sh 12sudo chmod -R a+x ${OS_PATH}/current/*.sh
13sudo chmod -R a+x ${OS_PATH}/current/scripts/*.sh 13sudo chmod -R a+x ${OS_PATH}/current/scripts/*.sh
14sudo chmod -R a+x ${OS_PATH}/current/scripts/install/*.sh 14sudo chmod -R a+x ${OS_PATH}/current/scripts/install/*.sh
15sudo chmod a+x ${OS_PATH}/current/scripts/robust-include
16sudo chmod a+x ${OS_PATH}/current/scripts/show-console 15sudo chmod a+x ${OS_PATH}/current/scripts/show-console
17sudo chmod a+x ${OS_PATH}/current/scripts/start-sim 16sudo chmod a+x ${OS_PATH}/current/scripts/start-sim
18 17
diff --git a/scripts/robust-include b/scripts/robust-include
deleted file mode 100755
index e427eb1..0000000
--- a/scripts/robust-include
+++ /dev/null
@@ -1,11 +0,0 @@
1#!/bin/bash
2
3# Silly script to get around the lack of includes in ROBUST.
4
5source common.sh
6getPrgDir
7
8# The problem here is that the > bit is executed as the user, not as opensim.
9cat ${PRGDIR}/../../config/config.ini ${PRGDIR}/../bin/Robust.ini >${PRGDIR}/../../config/Robust.ini
10chown -R ${OS_USER}:${OS_USER} ${PRGDIR}/../../config/Robust.ini
11chmod 600 ${PRGDIR}/../../config/Robust.ini
diff --git a/scripts/start-sim b/scripts/start-sim
index 774aa54..3966ac8 100755
--- a/scripts/start-sim
+++ b/scripts/start-sim
@@ -92,10 +92,6 @@ case $(basename $0) in
92 if [ ! -e ${PRGDIR}/../../caches/${tgt}.pid ] 92 if [ ! -e ${PRGDIR}/../../caches/${tgt}.pid ]
93 then 93 then
94 if [ "x$tgt" = "xROBUST" ]; then 94 if [ "x$tgt" = "xROBUST" ]; then
95 pushd ${PRGDIR}/../scripts
96 $SUDO ./robust-include
97 popd
98 cmd="${cmd} -inifile=${PRGDIR}/../../config/Robust.ini"
99 ${tmux_command} split-window -hp 50 -t "${tmux_session}:" "${cmd}" 95 ${tmux_command} split-window -hp 50 -t "${tmux_session}:" "${cmd}"
100 else 96 else
101 ${tmux_command} new-window -dn "${title}" -t "${tmux_session}:${num}" "${cmd}" 97 ${tmux_command} new-window -dn "${title}" -t "${tmux_session}:${num}" "${cmd}"