more conventional notation for site and prefix as replaced by db-config

diff --git a/db-config b/db-config
index 46ade07..275b5a3 100755 (executable)
--- a/db-config
+++ b/db-config
@@ -537,7 +537,7 @@ def main():
             file = open(root + "/" + f, "ro")
             default_initscripts.append({"name": plc['slice_prefix'] + "_" + f,
                                         "enabled": True,
-                                        "script": file.read().replace("XXXSITEXXX", url).replace("XXXPREFIXXXX", plc['slice_prefix'])})
+                                        "script": file.read().replace("@SITE@", url).replace("@PREFIX@", plc['slice_prefix'])})
             file.close()
 
     # Get list of existing initscripts

diff --git a/plc_sliceinitscripts/sirius b/plc_sliceinitscripts/sirius
index 8dd41be..6cbf443 100644 (file)
--- a/plc_sliceinitscripts/sirius
+++ b/plc_sliceinitscripts/sirius
@@ -106,7 +106,9 @@ class Periodic:
 
 SLOTDURATION = ONEHOUR
 
-SCHEDULEURL = 'XXXSITEXXX/planetlab/sirius/schedule.txt'
+# instances of @SITE@ and @PREFIX@ below are replaced 
+# as appropriate by db-config
+SCHEDULEURL = '@SITE@/planetlab/sirius/schedule.txt'
 
 schedulelock = threading.Lock()
 
@@ -166,7 +168,7 @@ def updateloans():
     log('Current loans are %s' % loans)
 
     if DEBUGLEVEL < 2:
-        nodemanager.SetLoans('XXXPREFIXXXX_sirius', loans)
+        nodemanager.SetLoans('@PREFIX@_sirius', loans)
     log('Updated loans successfully')
 
     recipientcond.acquire()