X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Finit.d%2Fsfa;h=e2fdb1080ef2cad1471941f2b0a58d136ecc5fa1;hb=18317236953434dfa9ea41328fc21731039e55f1;hp=6e81c63e670686db9f1a06580a1fe6a82c9461e2;hpb=952322d76247f8991f3c2688ed7e1f5a22ca4572;p=sfa.git

diff --git a/sfa/init.d/sfa b/sfa/init.d/sfa
index 6e81c63e..e2fdb108 100755
--- a/sfa/init.d/sfa
+++ b/sfa/init.d/sfa
@@ -2,13 +2,11 @@
 #
 # sfa   Wraps PLCAPI into the SFA compliant API
 #
-# chkconfig: 2345 5 99
+# hopefully right after plc
+# chkconfig: 2345 61 39
 #
 # description:   Wraps PLCAPI into the SFA compliant API
 #
-# $Id$
-# $URL$
-#
 
 # Source config
 [ -f /etc/sfa/sfa_config ] && . /etc/sfa/sfa_config
@@ -63,24 +61,27 @@ start() {
     
     reload
 
-    if [ "$SFA_REGISTRY_ENABLED" ]; then
+    # install peer certs
+    action $"SFA installing peer certs" daemon /usr/bin/sfa-server.py -t -d $OPTIONS 
+
+    if [ "$SFA_REGISTRY_ENABLED" -eq 1 ]; then
         action $"SFA Registry" daemon /usr/bin/sfa-server.py -r -d $OPTIONS
     fi
 
-    if [ "$SFA_AGGREGATE_ENABLED" ]; then
+    if [ "$SFA_AGGREGATE_ENABLED" -eq 1 ]; then
         action $"SFA Aggregate" daemon /usr/bin/sfa-server.py -a -d $OPTIONS
     fi
         
-    if [ "$SFA_SM_ENABLED" ]; then
+    if [ "$SFA_SM_ENABLED" -eq 1 ]; then
         action "SFA SliceMgr" daemon /usr/bin/sfa-server.py -s -d $OPTIONS
     fi
 
-		if [ "$SFA_GENI_AGGREGATE_ENABLED" ]; then
-				action $"SFA GENI Aggregate" daemon /usr/bin/sfa-server.py -g -d $OPTIONS
-		fi
+    if [ "$SFA_FLASHPOLICY_ENABLED" -eq 1 ]; then
+        action "Flash Policy Server" daemon /usr/bin/sfa_flashpolicy.py --file="$SFA_FLASHPOLICY_CONFIG_FILE" --port=$SFA_FLASHPOLICY_PORT -d
+    fi
 
     RETVAL=$?
-    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sfa
+    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sfa-server.py
 
 }
 
@@ -88,7 +89,7 @@ stop() {
     action $"Shutting down SFA" killproc sfa-server.py
     RETVAL=$?
 
-    [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sfa
+    [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sfa-server.py
 }
 
 
@@ -98,13 +99,13 @@ case "$1" in
     reload) reload force ;;
     restart) stop; start ;;
     condrestart)
-	if [ -f /var/lock/subsys/sfa ]; then
+	if [ -f /var/lock/subsys/sfa-server.py ]; then
             stop
             start
 	fi
 	;;
     status)
-	status sfa
+	status sfa-server.py
 	RETVAL=$?
 	;;
     *)