Revision 8fa1cbc9 snf-cyclades-app/synnefo/ui/views.py
b/snf-cyclades-app/synnefo/ui/views.py | ||
---|---|---|
86 | 86 |
|
87 | 87 |
SUPPORT_SSH_OS_LIST = getattr(settings, "UI_SUPPORT_SSH_OS_LIST",) |
88 | 88 |
OS_CREATED_USERS = getattr(settings, "UI_OS_DEFAULT_USER_MAP") |
89 |
UNKNOWN_OS = getattr(settings, "UI_UNKNOWN_OS", "unknown") |
|
89 | 90 |
LOGOUT_URL = getattr(settings, "UI_LOGOUT_URL", '/im/authenticate') |
90 | 91 |
LOGIN_URL = getattr(settings, "UI_LOGIN_URL", '/im/login') |
91 | 92 |
AUTH_COOKIE_NAME = getattr(settings, "UI_AUTH_COOKIE_NAME", 'synnefo_user') |
... | ... | |
99 | 100 |
# Additional settings |
100 | 101 |
VM_NAME_TEMPLATE = getattr(settings, "VM_CREATE_NAME_TPL", "My {0} server") |
101 | 102 |
VM_HOSTNAME_FORMAT = getattr(settings, "UI_VM_HOSTNAME_FORMAT", |
102 |
'snf-%(id)s.vm.okeanos.grnet.gr')
|
|
103 |
'snf-%(id)s.vm.synnefo.org')
|
|
103 | 104 |
|
104 | 105 |
if isinstance(VM_HOSTNAME_FORMAT, basestring): |
105 | 106 |
VM_HOSTNAME_FORMAT = VM_HOSTNAME_FORMAT % {'id':'{0}'} |
... | ... | |
127 | 128 |
# extensions |
128 | 129 |
ENABLE_GLANCE = getattr(settings, 'UI_ENABLE_GLANCE', True) |
129 | 130 |
GLANCE_API_URL = getattr(settings, 'UI_GLANCE_API_URL', '/glance') |
130 |
FEEDBACK_CONTACTS = getattr(settings, "FEEDBACK_CONTACTS", [])
|
|
131 |
FEEDBACK_CONTACTS = getattr(settings, "FEEDBACK_CONTACTS", []) |
|
131 | 132 |
DIAGNOSTICS_UPDATE_INTERVAL = getattr(settings, |
132 | 133 |
'UI_DIAGNOSTICS_UPDATE_INTERVAL', 2000) |
133 | 134 |
|
... | ... | |
203 | 204 |
'flavors_disk_templates_info': json.dumps(FLAVORS_DISK_TEMPLATES_INFO), |
204 | 205 |
'support_ssh_os_list': json.dumps(SUPPORT_SSH_OS_LIST), |
205 | 206 |
'os_created_users': json.dumps(OS_CREATED_USERS), |
207 |
'unknown_os': json.dumps(UNKNOWN_OS), |
|
206 | 208 |
'userdata_keys_limit': json.dumps(MAX_SSH_KEYS_PER_USER), |
207 | 209 |
'use_glance': json.dumps(ENABLE_GLANCE), |
208 | 210 |
'glance_api_url': json.dumps(GLANCE_API_URL), |
... | ... | |
449 | 451 |
|
450 | 452 |
mail_subject_txt = 'Feedback from ' |
451 | 453 |
+ snf_settings.BRANDING_SERVICE_NAME +' application' |
452 |
mail_subject = unicode(_mail_subject_txt)
|
|
453 |
|
|
454 |
mail_subject = unicode(_mail_subject_txt) |
|
455 |
|
|
454 | 456 |
mail_context = {'message': message, 'data': data, 'email': email, |
455 | 457 |
'allow_data_send': allow_data_send, 'request': request} |
456 | 458 |
mail_content = render_to_string("feedback_mail.txt", mail_context) |
Also available in: Unified diff