X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=db-config;h=e572d5a694e1bec396fc3f06279662eb9de78052;hb=b8ada6d36e6e6359b8af7c951d10df89fa3c4514;hp=682962a4c4d293625ce424528257ad0df3003fc5;hpb=5353205e869c6fb938c4f97d26287271e9133c5f;p=myplc.git

diff --git a/db-config b/db-config
index 682962a..e572d5a 100755
--- a/db-config
+++ b/db-config
@@ -587,7 +587,7 @@ def main():
         plc_ticket_pubkey = '%KEY%'
 
     # Create/update system slices
-    default_slices = [
+    legacy_slices = [
         # XXX Required for old Node Manager
         {'name': "pl_conf",
          'description': "PlanetLab Slice Creation Service (SCS)",
@@ -609,7 +609,8 @@ def main():
          'attributes': [('cpu_share', "32"),
                         ('plc_slice_type', "VServerSlice"),
                         ('disk_max', "5000000")]},
-
+        ]
+    default_slices = [
          # PlanetFlow
         {'name': plc['slice_prefix'] + "_netflow",
          'description': "PlanetFlow Traffic Auditing Service",
@@ -624,7 +625,19 @@ def main():
                         ('proper_op', "bind_socket")]},
         ]
          
-
+    ### xxx - to review once new node manager rolls out
+    # if PLC_SLICE_PREFIX is left to default - this is meant for the public PL only
+    if plc['slice_prefix'] == 'pl':
+        # create both legacy slices together with netflow through default_slices
+        default_slices += legacy_slices
+    else:
+        # we use another slice prefix : disable legacy slices if already created
+        for legacy_slice in legacy_slices:
+            try:
+                DeleteSlice(legacy_slice['name'])
+            except:
+                pass
+    
     for default_slice in default_slices:
         slices = GetSlices([default_slice['name']])
         if slices:
@@ -649,6 +662,105 @@ def main():
             if (name, value) not in slice_attributes:
                 AddSliceAttribute(slice['name'], name, value)
 
+    # Load default message templates
+    message_templates = [
+        {'message_id': 'Verify account',
+         'subject': "Verify account registration",
+         'template': """
+Please verify that you registered for a %(PLC_NAME)s account with the
+username %(email)s by visiting:
+
+https://%(PLC_WWW_HOST)s:%(PLC_WWW_SSL_PORT)d/db/persons/register.php?id=%(person_id)d&key=%(verification_key)s
+
+If you did not register for a %(PLC_NAME)s account, please ignore this
+message, or contact %(PLC_NAME)s Support <%(PLC_MAIL_SUPPORT_ADDRESS)s>.
+"""
+         },
+
+        {'message_id': 'New administrator account',
+         'subject': "New administrator account registration from %(first_name)s %(last_name)s <%(email)s>",
+         'template': """
+%(first_name)s %(last_name)s <%(email)s> has signed up for a new
+administrator account.
+
+Only current %(PLC_NAME)s administrators may enable new administrator
+accounts. To deny the request or enable the account, visit:
+
+https://%(PLC_WWW_HOST)s:%(PLC_WWW_SSL_PORT)d/db/persons/index.php?id=%(person_id)d
+"""
+         },
+
+        {'message_id': 'New PI account',
+         'subject': "New PI account registration from %(first_name)s %(last_name)s <%(email)s> at %(site_name)s",
+         'template': """
+%(first_name)s %(last_name)s <%(email)s> has signed up for a new
+%(PLC_NAME) account at %(site_name)s and has requested a PI role. PIs
+are responsible for enabling user accounts, creating slices, and
+ensuring that all users abide by the %(PLC_NAME)s Acceptable Use
+Policy.
+
+Only %(PLC_NAME)s administrators may enable new PI accounts. If you
+are a PI at %(site_name)s, please respond and indicate whether this
+registration is acceptable.
+
+To view the request, visit:
+
+https://%(PLC_WWW_HOST)s:%(PLC_WWW_SSL_PORT)d/db/persons/index.php?id=%(person_id)d
+"""
+         },
+
+        {'message_id': 'New account',
+         'subject': "New account registration from %(first_name)s %(last_name)s <%(email)s> at %(site_name)s",
+         'template': """
+%(first_name)s %(last_name)s <%(email)s> has signed up for a new
+%(PLC_NAME) account at %(site_name)s and has requested the following
+roles: %(roles)s.
+
+To deny the request or enable the account, visit:
+
+https://%(PLC_WWW_HOST)s:%(PLC_WWW_SSL_PORT)d/db/persons/index.php?id=%(person_id)d
+"""
+         },
+
+        {'message_id': 'Password reset requested',
+         'subject': "Password reset requested",
+         'template': """
+Someone has requested that the password of your %(PLC_NAME)s account
+%(email)s be reset. If this person was you, you may continue with the
+reset by visiting:
+
+https://%(PLC_WWW_HOST)s:%(PLC_WWW_SSL_PORT)d/db/persons/reset_password.php?id=%(person_id)d&key=%(verification_key)s
+
+If you did not request that your password be reset, please contact
+%(PLC_NAME)s Support <%(PLC_MAIL_SUPPORT_ADDRESS)s>. Do not quote or
+otherwise include any of this text in any correspondence.
+"""
+         },
+
+        {'message_id': 'Password reset',
+         'subject': "Password reset",
+         'template': """
+The password of your %(PLC_NAME)s account %(email)s has been
+temporarily reset to:
+
+%(password)s
+
+Please change it at as soon as possible by visiting:
+
+https://%(PLC_WWW_HOST)s:%(PLC_WWW_SSL_PORT)d/db/persons/index.php?id=%(person_id)d
+
+If you did not request that your password be reset, please contact
+%(PLC_NAME)s Support <%(PLC_MAIL_SUPPORT_ADDRESS)s>. Do not quote or
+otherwise include any of this text in any correspondence.
+"""
+         },
+        ]
+
+    for template in message_templates:
+	messages = GetMessages([template['message_id']])
+	if not messages:
+            AddMessage(template)	
+
 if __name__ == '__main__':
     main()