cosmetic

[sfa.git] / init.d / sfa

diff --git a/init.d/sfa b/init.d/sfa
index 9ba3783..ac77312 100755 (executable)
--- a/init.d/sfa
+++ b/init.d/sfa
@@ -1,11 +1,12 @@
 #!/bin/bash
 #
-# sfa   Wraps PLCAPI into the SFA compliant API
+# sfa
+# Provides a generic SFA wrapper based on the initial PlanetLab Implementation
 #
 # hopefully right after plc
 # chkconfig: 2345 61 39
 #
-# description:   Wraps PLCAPI into the SFA compliant API
+# description:   An implementation  of the SFA Architecture
 #
 
 ####################
@@ -37,6 +38,7 @@ if [ -f /etc/redhat-release ] ; then
     PGLOCK=/var/lock/subsys/postgresql
     SFALOCK=/var/lock/subsys/sfa-start.pid
 elif [ -f /etc/debian_version ] ; then
+    . /etc/init.d/functions.sfa
     debian_get_postgresql_versions
     PGDATA=/etc/postgresql/$pgver/main/
     PGWATCH=postgres
@@ -49,7 +51,7 @@ fi
 
 
 postgresql_conf=$PGDATA/postgresql.conf
-pghba_conf=$PGDATA/pg_hba.conf
+pg_hba_conf=$PGDATA/pg_hba.conf
 postgresql_sysconfig=/etc/sysconfig/pgsql
 
 # SFA consolidated (merged) config file
@@ -112,7 +114,6 @@ function reload () {
 
     # Regenerate the main configuration file from default values
     # overlaid with site-specific and current values.
-    # Thierry -- 2007-07-05 : values in plc_config.xml are *not* taken into account here
     files=( $sfa_default_config $sfa_local_config )
     for file in "${files[@]}" ; do
        if [ -n "$force" -o $file -nt $sfa_whole_config ] ; then
@@ -140,10 +141,6 @@ function reload () {
     if [ -n "$force" -o $sfa_whole_config -nt /etc/sfa/sfa_config.sh ] ; then
        sfa-config --shell $sfa_default_config $sfa_local_config > /etc/sfa/sfa_config.sh
     fi
-#    if [ -n "$force" -o $sfa_whole_config -nt /etc/sfa/php/sfa_config.php ] ; then
-#      mkdir -p /etc/sfa/php
-#      plc-config --php  $sfa_whole_config >/etc/sfa/php/sfa_config.php
-#    fi
 
     # [re]generate the sfa_component_config
     # this is a server-side thing but produces a file that somehow needs to be pushed
@@ -163,7 +160,7 @@ function db_start () {
     # only if enabled
     [ "$SFA_DB_ENABLED" == 1 -o "$SFA_DB_ENABLED" == True ] || return
 
-    if ! rpm -q myplc >& /dev/null; then
+    if [ ! -f /etc/myplc-release ] ; then
 
        ######## standalone deployment - no colocated myplc
 
@@ -208,22 +205,22 @@ function db_start () {
 
        ######## /var/lib/pgsql/data/pg_hba.conf
        # Disable access to all DBs from all hosts
-       sed -i -e '/^\(host\|local\)/d' $pghba_conf
+       sed -i -e '/^\(host\|local\)/d' $pg_hba_conf
 
        # Enable passwordless localhost access
-       echo "local all all trust" >>$pghba_conf
+       echo "local all all trust" >>$pg_hba_conf
        # grant access
        (
            echo "host $SFA_DB_NAME $SFA_DB_USER 127.0.0.1/32 password"
            [ -n "$registry_ip" ] && echo "host $SFA_DB_NAME $SFA_DB_USER ${registry_ip}/32 password"
-       ) >>$pghba_conf
+       ) >>$pg_hba_conf
 
     if [ "$SFA_GENERIC_FLAVOUR" == "openstack" ] ; then
-        [ -n "$registry_ip" ] && echo "host nova nova ${registry_ip}/32 password" >> $pghba_conf
+        [ -n "$registry_ip" ] && echo "host nova nova ${registry_ip}/32 password" >> $pg_hba_conf
     fi   
        
        # Fix ownership (sed -i changes it)
-       chown postgres:postgres $postgresql_conf $pghba_conf
+       chown postgres:postgres $postgresql_conf $pg_hba_conf
 
        ######## compute a password if needed
        if [ -z "$SFA_DB_PASSWORD" ] ; then
@@ -247,7 +244,7 @@ function db_start () {
 
     ######## Start up the server
     # not too nice, but.. when co-located with myplc we'll let it start/stop postgresql
-    if ! rpm -q myplc >& /dev/null ; then
+    if [ ! -f /etc/myplc-release ] ; then
        echo STARTING...
        service postgresql start >& /dev/null
     fi
@@ -269,7 +266,7 @@ function db_start () {
        check
     fi
     check
-    # mention sfaadmin.py instead of just sfaadmin for people who do not install through rpm
+    # mention sfaadmin.py instead of just sfaadmin for safety
     sfaadmin.py reg sync_db
 
     MESSAGE=$"SFA: Checking for PostgreSQL server"
@@ -284,7 +281,7 @@ function db_stop () {
     [ "$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
+    if [ ! -f /etc/myplc-release ] ; then
        service postgresql stop >& /dev/null
        check
        MESSAGE=$"Stopping PostgreSQL server"