git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add nitos module to setup.py
[sfa.git]
/
init.d
/
sfa
diff --git
a/init.d/sfa
b/init.d/sfa
index
80b5da3
..
69cf6f6
100755
(executable)
--- a/
init.d/sfa
+++ b/
init.d/sfa
@@
-11,7
+11,6
@@
# source function library
. /etc/init.d/functions
# Default locations
# source function library
. /etc/init.d/functions
# Default locations
-set -x
PGDATA=/var/lib/pgsql/data
postgresql_conf=$PGDATA/postgresql.conf
pghba_conf=$PGDATA/pg_hba.conf
PGDATA=/var/lib/pgsql/data
postgresql_conf=$PGDATA/postgresql.conf
pghba_conf=$PGDATA/pg_hba.conf
@@
-22,7
+21,8
@@
sfa_whole_config=/etc/sfa/sfa_config
# SFA default config (read-only template)
sfa_default_config=/etc/sfa/default_config.xml
# SFA local (site-dependent) file
# SFA default config (read-only template)
sfa_default_config=/etc/sfa/default_config.xml
# SFA local (site-dependent) file
-sfa_local_config=/etc/sfa/configs/site
+sfa_local_config=/etc/sfa/configs/site_config
+sfa_local_config_xml=/etc/sfa/configs/site_config.xml
# Source sfa shell config if present
[ -f /etc/sfa/sfa_config.sh ] && . /etc/sfa/sfa_config.sh
# Source sfa shell config if present
[ -f /etc/sfa/sfa_config.sh ] && . /etc/sfa/sfa_config.sh
@@
-94,6
+94,10
@@
function reload () {
done
# Convert configuration to various formats
done
# Convert configuration to various formats
+ if [ -f $sfa_local_config_xml ] ; then
+ sfa-config --python $sfa_local_config_xml > $sfa_local_config
+ rm $sfa_local_config_xml
+ fi
if [ -n "$force" -o $sfa_local_config -nt $sfa_whole_config ] ; then
sfa-config --python $sfa_default_config $sfa_local_config > $sfa_whole_config
fi
if [ -n "$force" -o $sfa_local_config -nt $sfa_whole_config ] ; then
sfa-config --python $sfa_default_config $sfa_local_config > $sfa_whole_config
fi
@@
-121,7
+125,7
@@
function reload () {
function db_start () {
# only if enabled
function db_start () {
# only if enabled
- [ "$SFA_DB_ENABLED" == 1 -o "$SFA_DB_ENABLED" ==
t
rue ] || return
+ [ "$SFA_DB_ENABLED" == 1 -o "$SFA_DB_ENABLED" ==
T
rue ] || return
if ! rpm -q myplc >& /dev/null; then
if ! rpm -q myplc >& /dev/null; then
@@
-229,6
+233,8
@@
function db_start () {
check
fi
check
check
fi
check
+ # mention sfaadmin.py instead of just sfaadmin for people who do not install through rpm
+ sfaadmin.py reg sync_db
MESSAGE=$"SFA: Checking for PostgreSQL server"
echo -n "$MESSAGE"
MESSAGE=$"SFA: Checking for PostgreSQL server"
echo -n "$MESSAGE"
@@
-239,7
+245,7
@@
function db_start () {
function db_stop () {
# only if enabled
function db_stop () {
# only if enabled
- [ "$SFA_DB_ENABLED" == 1 ] || return
+ [ "$SFA_DB_ENABLED" == 1
-o "$SFA_DB_ENABLED" == True
] || return
# not too nice, but.. when co-located with myplc we'll let it start/stop postgresql
if ! rpm -q myplc >& /dev/null ; then
# not too nice, but.. when co-located with myplc we'll let it start/stop postgresql
if ! rpm -q myplc >& /dev/null ; then
@@
-261,11
+267,11
@@
function start() {
# install peer certs
action $"SFA: installing peer certs" daemon /usr/bin/sfa-start.py -t -d $OPTIONS
# install peer certs
action $"SFA: installing peer certs" daemon /usr/bin/sfa-start.py -t -d $OPTIONS
- [ "$SFA_REGISTRY_ENABLED" == 1 ] && action $"SFA: Registry" daemon /usr/bin/sfa-start.py -r -d $OPTIONS
+ [ "$SFA_REGISTRY_ENABLED" == 1
-o "$SFA_REGISTRY_ENABLED" == True
] && action $"SFA: Registry" daemon /usr/bin/sfa-start.py -r -d $OPTIONS
- [ "$SFA_AGGREGATE_ENABLED" == 1 ] && action $"SFA: Aggregate" daemon /usr/bin/sfa-start.py -a -d $OPTIONS
+ [ "$SFA_AGGREGATE_ENABLED" == 1
-o "$SFA_AGGREGATE_ENABLED" == True
] && action $"SFA: Aggregate" daemon /usr/bin/sfa-start.py -a -d $OPTIONS
- [ "$SFA_SM_ENABLED" == 1 ] && action "SFA: SliceMgr" daemon /usr/bin/sfa-start.py -s -d $OPTIONS
+ [ "$SFA_SM_ENABLED" == 1
-o "$SFA_SM_ENABLED" == True
] && action "SFA: SliceMgr" daemon /usr/bin/sfa-start.py -s -d $OPTIONS
[ "$SFA_FLASHPOLICY_ENABLED" == 1 ] && \
action "Flash Policy Server" daemon /usr/bin/sfa_flashpolicy.py --file="$SFA_FLASHPOLICY_CONFIG_FILE" --port=$SFA_FLASHPOLICY_PORT -d
[ "$SFA_FLASHPOLICY_ENABLED" == 1 ] && \
action "Flash Policy Server" daemon /usr/bin/sfa_flashpolicy.py --file="$SFA_FLASHPOLICY_CONFIG_FILE" --port=$SFA_FLASHPOLICY_PORT -d