sys.maxint is 2^63-1 on 64-bit architectures, which is too large for an int.

[myplc.git] / db-config

diff --git a/db-config b/db-config
index a8ff3a7..5083b58 100755 (executable)
--- a/db-config
+++ b/db-config
@@ -393,7 +393,7 @@ def main():
 
         # sudo configuration
         {'enabled': True,
-         'source': 'PlanetLabConf/sudoers',
+         'source': 'PlanetLabConf/sudoers.php',
          'dest': '/etc/sudoers',
          'file_permissions': '440',
          'file_owner': 'root',
@@ -511,8 +511,8 @@ def main():
 
         # CoDemux
         {'name': "codemux",
-         'description': "Demux HTTP between slices using localhost ports. Value in the form 'host, localhost port'."
-         'min_role_id': 10}
+         'description': "Demux HTTP between slices using localhost ports. Value in the form 'host, localhost port'.",
+         'min_role_id': 10},
 
         ]
 
@@ -537,7 +537,7 @@ def main():
             file = open(root + "/" + f, "ro")
             default_initscripts.append({"name": plc['slice_prefix'] + "_" + f,
                                         "enabled": True,
-                                        "script": file.read()})
+                                        "script": file.read().replace("XXXSITEXXX", url).replace("XXXPREFIXXXX", plc['slice_prefix'])})
             file.close()
 
     # Get list of existing initscripts
@@ -554,13 +554,9 @@ def main():
          'name' : "ifname",
          'description': "Set interface name, instead of eth0 or the like",
          'min_role_id' : 40},
-        {'category' : "general",
-         'name' : "driver",
-         'description': "Use this to specify an alternate driver",
-         'min_role_id' : 40 },
-        {'category' : "general",
+        {'category' : "Multihome",
          'name' : "alias",
-         'description': "Allows to reuse an interface as eth0:alias",
+         'description': "Specifies that the network is used for multihoming",
          'min_role_id' : 40},
 
         {'category' : "hidden",
@@ -610,7 +606,7 @@ def main():
          'url': url,
          'instantiation': "plc-instantiated",
          # Renew forever (minus one day, work around date conversion weirdness)
-         'expires': sys.maxint - (60 * 60 * 24),
+         'expires': 0x7fffffff - (60 * 60 * 24),
          'attributes': [('system', "1"),
                         ('vref', "planetflow"),
                         ('proper_op', "open file=/etc/passwd, flags=r"),
@@ -622,7 +618,7 @@ def main():
          'url': url,
          'instantiation': "plc-instantiated",
          # Renew forever (minus one day, work around date conversion weirdness)
-         'expires': sys.maxint - (60 * 60 * 24),
+         'expires': 0x7fffffff - (60 * 60 * 24),
          'attributes': [('system', "1"),
                         ('net_min_rate', "2000"),
                         ('cpu_pct', "25"),