rename reload from plc.d/functions into plc_reload
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 27 Mar 2012 12:51:12 +0000 (14:51 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 27 Mar 2012 12:51:12 +0000 (14:51 +0200)
to avoid confusion with builtin /sbin/reload

plc.d/api
plc.d/postgresql

index 1cdd9ff..f54bfc8 100755 (executable)
--- a/plc.d/api
+++ b/plc.d/api
@@ -32,7 +32,7 @@ case "$1" in
            PLC_API_MAINTENANCE_PASSWORD=$(uuidgen)
            plc-config --category=plc_api --variable=maintenance_password --value="$PLC_API_MAINTENANCE_PASSWORD" --save=$local_config $local_config
         #service plc reload
-        reload force
+        plc_reload force
        fi
 
        # Make sure that all PLC servers are allowed to access the API
@@ -48,8 +48,8 @@ case "$1" in
         ) | 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
-    reload force
+        #service plc reload
+       plc_reload force
 
        result "$MESSAGE"
        ;;
index 989cd7e..1139af4 100755 (executable)
@@ -153,7 +153,7 @@ case "$1" in
            PLC_DB_PASSWORD=$(uuidgen)
            plc-config --category=plc_db --variable=password --value="$PLC_DB_PASSWORD" --save=$local_config $local_config
         #service plc reload
-        reload force
+        plc_reload force
        fi
        if ! psql -U $PLC_DB_USER -c "" template1 >/dev/null 2>&1 ; then
            psql -U postgres -c "CREATE USER $PLC_DB_USER PASSWORD '$PLC_DB_PASSWORD'" template1