create planetlab4 db with unicode encoding and owned by pgsqluser

[myplc.git] / db-config

diff --git a/db-config b/db-config
index e186cd2..4f994a6 100755 (executable)
--- a/db-config
+++ b/db-config
@@ -127,7 +127,7 @@ def main():
          'file_owner': 'root',
          'file_group': 'root',
          'preinstall_cmd': '',
-         'postinstall_cmd': '',
+         'postinstall_cmd': '/bin/chmod 700 /root/.ssh',
          'error_cmd': '',
          'ignore_cmd_errors': False,
          'always_update': False},
@@ -138,7 +138,7 @@ def main():
          'file_owner': 'site_admin',
          'file_group': 'site_admin',
          'preinstall_cmd': 'grep -q site_admin /etc/passwd',
-         'postinstall_cmd': '',
+         'postinstall_cmd': '/bin/chmod 700 /home/site_admin/.ssh',
          'error_cmd': '',
          'ignore_cmd_errors': False,
          'always_update': False},
@@ -149,7 +149,7 @@ def main():
          'file_owner': 'pl_admin',
          'file_group': 'pl_admin',
          'preinstall_cmd': 'grep -q pl_admin /etc/passwd',
-         'postinstall_cmd': '',
+         'postinstall_cmd': '/bin/chmod 700 /home/pl_admin/.ssh',
          'error_cmd': '',
          'ignore_cmd_errors': False,
          'always_update': False},
@@ -484,9 +484,14 @@ def main():
          'description': "Type of slice (e.g. vserver)",
          'min_role_id': 20},
 
+        # System slice
+        {'name': "system",
+         'description': "Is a default system slice (1) or not (0 or unset)",
+         'min_role_id': 10},
+
         # Slice enabled (1) or suspended (0)
         {'name': "enabled",
-         'description': "Slice enabled (1) or suspended (0)",
+         'description': "Slice enabled (1 or unset) or suspended (0)",
          'min_role_id': 10},
 
         # Slice reference image
@@ -603,7 +608,7 @@ def main():
          'instantiation': "plc-instantiated",
          # Renew forever
          'expires': sys.maxint,
-         'attributes': {'vref': "planetflow"}},
+         'attributes': {'system': "1", 'vref': "planetflow"}},
         ]
 
     for default_slice in default_slices: