remove all refrences to level1_auth

[sfa.git] / sfa / init.d / sfa

diff --git a/sfa/init.d/sfa b/sfa/init.d/sfa
index 4b77177..b3b041c 100755 (executable)
--- a/sfa/init.d/sfa
+++ b/sfa/init.d/sfa
@@ -29,14 +29,14 @@ reload ()
        /etc/sfa/configs/site.xml
     )
     for file in "${files[@]}" ; do
-       if [ -n "$force" -o $file -nt /etc/sfa/plc_config.xml ] ; then
-           tmp=$(mktemp /tmp/plc_config.xml.XXXXXX)
+       if [ -n "$force" -o $file -nt /etc/sfa/sfa_config.xml ] ; then
+           tmp=$(mktemp /tmp/sfa_config.xml.XXXXXX)
            plc-config --xml "${files[@]}" >$tmp
            if [ $? -eq 0 ] ; then
-               mv $tmp /etc/sfa/plc_config.xml
-               chmod 444 /etc/sfa/plc_config.xml
+               mv $tmp /etc/sfa/sfa_config.xml
+               chmod 444 /etc/sfa/sfa_config.xml
            else
-               echo "PLC: Warning: Invalid configuration file(s) detected"
+               echo "SFA: Warning: Invalid configuration file(s) detected"
                rm -f $tmp
            fi
            break
@@ -44,51 +44,46 @@ reload ()
     done
 
     # Convert configuration to various formats
-    if [ -n "$force" -o /etc/sfa/plc_config.xml -nt /etc/sfa/plc_config ] ; then
-       plc-config --shell >/etc/sfa/plc_config
+    if [ -n "$force" -o /etc/sfa/sfa_config.xml -nt /etc/sfa/sfa_config ] ; then
+       plc-config --shell /etc/sfa/sfa_config.xml >/etc/sfa/sfa_config
     fi
-    if [ -n "$force" -o /etc/sfa/plc_config.xml -nt /etc/sfa/plc_config.py ] ; then
-       plc-config --python >/etc/sfa/plc_config.py
-    fi
-    if [ -n "$force" -o /etc/sfa/plc_config.xml -nt /etc/sfa/php/plc_config.php ] ; then
-       mkdir -p /etc/sfa/php
-       plc-config --php >/etc/sfa/php/plc_config.php
+    if [ -n "$force" -o /etc/sfa/sfa_config.xml -nt /etc/sfa/sfa_config.py ] ; then
+       plc-config --python /etc/sfa/sfa_config.xml >/etc/sfa/sfa_config.py
     fi
+#    if [ -n "$force" -o /etc/sfa/sfa_config.xml -nt /etc/sfa/php/sfa_config.php ] ; then
+#      mkdir -p /etc/sfa/php
+#      plc-config --php  /etc/sfa/sfa_config.xml >/etc/sfa/php/sfa_config.php
+#    fi
+
+    # [re]generate the sfa_component_config
+    gen-sfa-cm-config.py        
 }
 
 start() {
     
     reload
 
-    echo -n $"Starting SFA:  "
-
     if [ "$SFA_REGISTRY_ENABLED" ]; then
-        echo "Registry"
-        daemon /usr/bin/sfa-server.py -r -d $OPTIONS
+        action $"SFA Registry" daemon /usr/bin/sfa-server.py -r -d $OPTIONS
     fi
 
     if [ "$SFA_AGGREGATE_ENABLED" ]; then
-        echo "Aggregate"
-        daemon /usr/bin/sfa-server.py -a -d $OPTIONS
+        action $"SFA Aggregate" daemon /usr/bin/sfa-server.py -a -d $OPTIONS
     fi
         
     if [ "$SFA_SM_ENABLED" ]; then
-        echo "SliceMgr"
-        daemon /usr/bin/sfa-server.py -s -d $OPTIONS
+        action "SFA SliceMgr" daemon /usr/bin/sfa-server.py -s -d $OPTIONS
     fi
 
     RETVAL=$?
-    echo
     [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sfa
 
 }
 
 stop() {
-    echo -n $"Shutting down SFA: "
-    killproc sfa-server.py
+    action $"Shutting down SFA" killproc sfa-server.py
     RETVAL=$?
 
-    echo
     [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sfa
 }