svn-keywords

[myplc.git] / plc.d / api

diff --git a/plc.d/api b/plc.d/api
index 1b9bc03..4061b8d 100755 (executable)
--- a/plc.d/api
+++ b/plc.d/api
@@ -1,6 +1,8 @@
 #!/bin/bash
+# $Id$
+# $URL$
 #
-# priority: 450
+# priority: 800
 #
 # Configure the API. Must be done after SSL certificates are generated
 # and before the API web server is brought up.
@@ -8,12 +10,11 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: api,v 1.6 2007/01/18 18:44:18 mlhuang Exp $
-#
 
 # Source function library and configuration
 . /etc/plc.d/functions
 . /etc/planetlab/plc_config
+local_config=/etc/planetlab/configs/site.xml
 
 # Be verbose
 set -x
@@ -31,27 +32,24 @@ case "$1" in
        # password.
        if [ -z "$PLC_API_MAINTENANCE_PASSWORD" ] ; then
            PLC_API_MAINTENANCE_PASSWORD=$(uuidgen)
-           plc-config --category=plc_api --variable=maintenance_password --value="$PLC_API_MAINTENANCE_PASSWORD" --save
+           plc-config --category=plc_api --variable=maintenance_password --value="$PLC_API_MAINTENANCE_PASSWORD" --save=$local_config $local_config
+           service plc reload
        fi
 
        # Make sure that all PLC servers are allowed to access the API
        # through the maintenance account.
-       for server in API BOOT WWW ; do
-           hostname=PLC_${server}_HOST
-           ip=$(gethostbyname ${!hostname})
-           if [ -n "$ip" ] ; then
-               if [ -z "$PLC_API_MAINTENANCE_SOURCES" ] ; then
-                   PLC_API_MAINTENANCE_SOURCES=$ip
-               else
-                   PLC_API_MAINTENANCE_SOURCES="$PLC_API_MAINTENANCE_SOURCES $ip"
-               fi
-           fi
-       done
-       plc-config --category=plc_api --variable=maintenance_sources --value="$PLC_API_MAINTENANCE_SOURCES" --save
-
-       # Bootstrap the DB
-       db-config
-       check
+       PLC_API_MAINTENANCE_SOURCES=($((
+           for ip in $PLC_API_MAINTENANCE_SOURCES ; do
+               echo $ip
+           done
+           for server in API BOOT WWW ; do
+               hostname=PLC_${server}_HOST
+               gethostbyname ${!hostname}
+           done
+        ) | sort -u))
+       PLC_API_MAINTENANCE_SOURCES=${PLC_API_MAINTENANCE_SOURCES[*]}
+       plc-config --category=plc_api --variable=maintenance_sources --value="$PLC_API_MAINTENANCE_SOURCES" --save=$local_config $local_config
+       service plc reload
 
        result "$MESSAGE"
        ;;