X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=db-config;h=6a949417cb2dc68e6540c114d9c99b4b7781cc03;hb=refs%2Fheads%2Fplanetlab-4_0-branch;hp=618fc610c4c15c7f9ce30c6f9b73ea0ae7d7f0c7;hpb=cb1c71c3059e8b09b3b8b7e70baa39641afd5859;p=myplc.git diff --git a/db-config b/db-config index 618fc61..6a94941 100755 --- a/db-config +++ b/db-config @@ -7,7 +7,7 @@ # Mark Huang # Copyright (C) 2006 The Trustees of Princeton University # -# $Id: db-config,v 1.12 2006/12/12 16:33:45 thierry Exp $ +# $Id: db-config,v 1.21 2007/02/02 19:56:21 mlhuang Exp $ # from plc_config import PLCConfiguration @@ -516,31 +516,37 @@ def main(): 'min_role_id': 10}, # Bandwidth limits - {'name': "net_min", - 'description': "Minimum bandwidth (bps)", + {'name': "net_min_rate", + 'description': "Minimum bandwidth (kbps)", 'min_role_id': 10}, - {'name': "net_max", - 'description': "Maximum bandwidth (bps)", + {'name': "net_max_rate", + 'description': "Maximum bandwidth (kbps)", 'min_role_id': 10}, - {'name': "net_avg", - 'description': "Average bandwidth (bps)", + {'name': "net_i2_min_rate", + 'description': "Minimum bandwidth over I2 routes (kbps)", 'min_role_id': 10}, - {'name': "net_share", - 'description': "Number of bandwidth shares", + {'name': "net_i2_max_rate", + 'description': "Maximum bandwidth over I2 routes (kbps)", 'min_role_id': 10}, - {'name': "net2_min", - 'description': "Minimum bandwidth over routes exempt from node bandwidth limits (bps)", + {'name': "net_max_kbyte", + 'description': "Maximum daily network Tx KByte limit.", 'min_role_id': 10}, - {'name': "net2_max", - 'description': "Maximum bandwidth over routes exempt from node bandwidth limits (bps)", + {'name': "net_thresh_kbyte", + 'description': "KByte limit before warning and throttling.", 'min_role_id': 10}, - {'name': "net2_avg", - 'description': "Average bandwidth over routes exempt from node bandwidth limits (bps)", + {'name': "net_i2_max_kbyte", + 'description': "Maximum daily network Tx KByte limit to I2 hosts.", 'min_role_id': 10}, - {'name': "net2_share", - 'description': "Number of bandwidth shares over routes exempt from node bandwidth limits", + {'name': "net_i2_thresh_kbyte", + 'description': "KByte limit to I2 hosts before warning and throttling.", 'min_role_id': 10}, - + {'name': "net_share", + 'description': "Number of bandwidth shares", + 'min_role_id': 10}, + {'name': "net_i2_share", + 'description': "Number of bandwidth shares over I2 routes", + 'min_role_id': 10}, + # Disk quota {'name': "disk_max", 'description': "Disk quota (1k disk blocks)", @@ -575,17 +581,6 @@ def main(): else: UpdateSliceAttributeType(default_attribute_type['name'], default_attribute_type) - # Get contents of SSL public certificate used for signing slice tickets - try: - plc_ticket_pubkey = "" - for line in file(plc_ma_sa['ca_ssl_key_pub']): - # Skip comments - if line[0:5] != "-----": - # XXX The embedded newlines matter, do not strip()! - plc_ticket_pubkey += line - except: - plc_ticket_pubkey = '%KEY%' - # Create/update system slices legacy_slices = [ # XXX Required for old Node Manager @@ -597,7 +592,7 @@ def main(): 'expires': sys.maxint, 'attributes': [('plc_slice_type', "VServerSlice"), ('plc_agent_version', "1.0"), - ('plc_ticket_pubkey', plc_ticket_pubkey)]}, + ('plc_ticket_pubkey', "")]}, # XXX Required for old Node Manager {'name': "pl_conf_vserverslice", @@ -662,85 +657,237 @@ def main(): if (name, value) not in slice_attributes: AddSliceAttribute(slice['name'], name, value) - # Load default email templates - email_templates = [ - {'message_id': 'JOIN_REQUEST_APPROVED', - 'subject': "Your request to join PlanetLab has been approved", - 'template': """ - Your request to join PlanetLab has been approved! - - At this point PI and tech contact accounts have been created - and enabled. You will not be able to create slices until at - least one node is up and running correctly. To use these - accounts, you must first reset your password to obtain a - new one. Once logged in, please change your password. - - Instructions for setting up your nodes can be found at: - http://%s/consortium/setup_procedure.php - - Please direct any questions to PlanetLab Support, thank you! - - %s - http://%s - """ - }, - {'message_id': 'JOIN_REQUEST_APPROVED_PL', - 'subject': "The join request for %s has been approved", - 'template':""" - The join request for %s has been approved. - - To view the details of this site, visit: - https://%s/db/sites/detail.php?site_id=%d - """ - }, - {'message_id': 'ACCOUNT_REGISTERED', - 'subject': "New account registration from %s at %s", - 'template': """ - %s has signed up for a new PlanetLab account at %s, but - has not yet been enabled. The following roles have been - requested:%s - - If this account includes a PI role, we require an email from - the current PI at that site indicating this is acceptable. - If this account includes Admin role, another PlanetLab administrator - will have to enable the account. For User and Tech roles, any site PI - can enable the account. - - If this account is registered at a site that does not have a PI, - this email is also being sent to PlanetLab support for further - followup. - - To view details and enable this account, visit: - https://%s/db/accounts/detail.php?person_id=%s - - %s - http://%s - """ - }, - {'message_id': 'PASSWORD_RESET_INITIATE', - 'subject': "PlanetLab password reset", - 'template': """ - Someone initiated a password reset on your PlanetLab account. If this - was you, you may continue with the reset, by visiting: - - https://%s/db/login/reset_passwd.php?key=%s&id=%s - - If this was not you, please contact PlanetLab support about this - request. Please do not share the above link with anyone, as it can be - used to gain access to your account. If responding to support, delete - the link before sending. Thank you. - - %s - http://%s - """ - } - ] - - for template in email_templates: + installfailed = """ +Once the node meets these requirements, please reinitiate the install +by visiting: + +https://%(PLC_WWW_HOST)s:%(PLC_WWW_SSL_PORT)d/db/nodes/?id=%(node_id)d + +Click the Reinstall link, then reboot the node. + +If you have already performed this step and are still receiving this +message, please reply so that we may investigate the problem. +""" + + # 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 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)s 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)s 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. +""" + }, + + # Boot Manager messages + {'message_id': "installfinished", + 'subject': "%(hostname)s completed installation", + 'template': """ +%(hostname)s just completed installation. + +The node should be usable in a couple of minutes if installation was +successful. +""" + }, + + {'message_id': "insufficientdisk", + 'subject': "%(hostname)s does not have sufficient disk space", + 'template': """ +%(hostname)s failed to boot because it does not have sufficent disk +space, or because its disk controller was not recognized. + +Please replace the current disk or disk controller or install +additional disks to meet the current hardware requirements. +""" + installfailed + }, + + {'message_id': "insufficientmemory", + 'subject': "%(hostname)s does not have sufficient memory", + 'template': """ +%(hostname)s failed to boot because it does not have sufficent +memory. + +Please install additional memory to meet the current hardware +requirements. +""" + installfailed + }, + + {'message_id': "authfail", + 'subject': "%(hostname)s failed to authenticate", + 'template': +""" +%(hostname)s failed to authenticate for the following reason: + +%(fault)s + +The most common reason for authentication failure is that the +authentication key stored in the node configuration file, does not +match the key on record. Regenerate the node configuration file by +visiting: + +https://%(PLC_WWW_HOST)s:%(PLC_WWW_SSL_PORT)d/db/nodes/?id=%(node_id)d + +Click the Configuration File link, and save the downloaded file as +plnode.txt on either a floppy disk or a USB flash drive. Click the +Boot link, then reboot the node. + +If you have already performed this step and are still receiving this +message, please reply so that we may investigate the problem. +""" + }, + + {'message_id': "notinstalled", + 'subject': "%(hostname)s is not installed", + 'template': +""" +%(hostname)s failed to boot because it has either never been +installed, or the installation is corrupt. + +Please check if the hard drive has failed, and replace it if so. After +doing so, visit: + +https://%(PLC_WWW_HOST)s:%(PLC_WWW_SSL_PORT)d/db/nodes/?id=%(node_id)d + +Click the Reinstall link, then reboot the node. + +If you have already performed this step and are still receiving this +message, please reply so that we may investigate the problem. +""" + }, + + {'message_id': "hostnamenotresolve", + 'subject': "%(hostname)s does not resolve", + 'template': +""" +%(hostname)s failed to boot because its hostname does not resolve, or +does resolve but does not match its configured IP address. + +Please check the network settings for the node, especially its +hostname, IP address, and DNS servers, by visiting: + +https://%(PLC_WWW_HOST)s:%(PLC_WWW_SSL_PORT)d/db/nodes/?id=%(node_id)d + +Correct any errors, click the Reinstall link, then reboot the node. + +If you have already performed this step and are still receiving this +message, please reply so that we may investigate the problem. +""" + }, + + # XXX N.B. I don't think these are necessary, since there's no + # way that the Boot Manager would even be able to contact the + # API to send these messages. + + {'message_id': "noconfig", + 'subject': "%(hostname)s does not have a configuration file", + 'template': """ +%(hostname)s failed to boot because it could not find a PlanetLab +configuration file. To create this file, visit: + +https://%(PLC_WWW_HOST)s:%(PLC_WWW_SSL_PORT)d/db/nodes/?id=%(node_id)d + +Click the Configuration File link, and save the downloaded file as +plnode.txt on either a floppy disk or a USB flash drive. Click the +Reinstall link, then reboot the node. + +If you have already performed this step and are still receiving this +message, please reply so that we may investigate the problem. +""" + }, + + {'message_id': "nodetectednetwork", + 'subject': "%(hostname)s has unsupported network hardware", + 'template': +""" + +%(hostname)s failed to boot because it has network hardware that is +unsupported by the current production kernel. If it has booted +successfully in the past, please try re-installing it by visiting: + +https://%(PLC_WWW_HOST)s:%(PLC_WWW_SSL_PORT)d/db/nodes/?id=%(node_id)d + +Click the Reinstall link, then reboot the node. + +If you have already performed this step and are still receiving this +message, please reply so that we may investigate the problem. +""" + }, + ] + + for template in message_templates: messages = GetMessages([template['message_id']]) if not messages: - AddMessage(template) - + AddMessage(template) if __name__ == '__main__': main()