Revision 68a81d58

b/snf-astakos-app/astakos/im/messages.py
139 139 
                                             inside the verification email.'
140 140 
NOTIFICATION_SENT                       =   'Your request for an account has been submitted successfully, and is now pending approval. \
141 141 
                                               You will be notified by email in the next few days. \
142 
                                               Thanks for your interest in ~okeanos! The GRNET team.'
142 
                                               Thanks for your interest!'
143 143 
ACTIVATION_SENT                         =   'An email containing your activation link has been sent to your email address.'
144 144 

  		





  145
  145
  
    
REGISTRATION_COMPLETED                  =   'Your registration completed successfully. You can now login to your new account!'


  		












  

    
      b/snf-branding/conf/20-snf-branding-app-settings.conf
    
  






  
  1
  
    
## Service and company names/urls


  		





  
  2
  
    
######################


  		





  
  3
  
    

  		





  
  4
  
    
#BRANDING_SERVICE_NAME = 'Synnefo'


  		





  
  5
  
    
#BRANDING_SERVICE_URL =	'http://www.synnefo.org/'


  		





  
  6
  
    
#BRANDING_COMPANY_NAME = 'GRNET'


  		





  
  7
  
    
#BRANDING_COMPANY_URL = 'https://www.grnet.gr/en/'


  		





  
  8
  
    

  		





  
  9
  
    
## Images


  		





  
  10
  
    
######################


  		





  
  11
  
    

  		





  
  12
  
    
# The default path to the folder that contains all branding images


  		





  
  13
  
    
#BRANDING_IMAGE_MEDIA_URL= MEDIA_URL + 'branding/images/'


  		





  
  14
  
    

  		





  
  15
  
    
# You can replace any image by providing its absolute path


  		





  
  16
  
    
# example: 'https://synnefo.org/uploads/images/my_image.png'


  		





  
  17
  
    
# The service favicon


  		





  
  18
  
    
#BRANDING_FAVICON_URL = '<path_to_image_folder>' + 'favicon.ico'


  		





  
  19
  
    

  		





  
  20
  
    
#Logo used in Dashboard pages (Astakos)


  		





  
  21
  
    
#BRANDING_DASHBOARD_LOGO_URL =  '<path_to_image_folder>' + 'dashboard_logo.png'


  		





  
  22
  
    

  		





  
  23
  
    
#Logo used in Compute pages (Cyclades)


  		





  
  24
  
    
#BRANDING_COMPUTE_LOGO_URL = '<path_to_image_folder>' + 'compute_logo.png'


  		





  
  25
  
    

  		





  
  26
  
    
#Logo used in Console page for VM (Cyclades)


  		





  
  27
  
    
#BRANDING_CONSOLE_LOGO_URL = '<path_to_image_folder>' + 'console_logo.png'


  		





  
  28
  
    

  		





  
  29
  
    
#Logo used in Storage pages (Pithos)


  		





  
  30
  
    
#BRANDING_STORAGE_LOGO_URL = '<path_to_image_folder>' + 'storage_logo.png'


  		





  
  31
  
    

  		





  
  32
  
    
## Copyright options


  		





  
  33
  
    
######################


  		





  
  34
  
    

  		





  
  35
  
    
# If True, Copyright message will appear at the footer of the Compute and 


  		





  
  36
  
    
# Dashboard UI 


  		





  
  37
  
    
#BRANDING_SHOW_COPYRIGHT = False 


  		





  
  38
  
    
#BRANDING_COPYRIGHT_PERIOD = '2011-<current_year>'


  		





  
  39
  
    

  		





  
  40
  
    
# Formal company name that appears in copyright message


  		





  
  41
  
    
#BRANDING_COMPANY_NAME_FORMAL = 'GRNET S.A.'


  		





  
  42
  
    
#BRANDING_COPYRIGHT_MESSAGE = 'Copyright (c) 2011-<current_year> GRNET S.A.'


  		





  
  43
  
    

  		





  
  44
  
    
## Footer links


  		





  
  45
  
    
######################


  		





  
  46
  
    

  		





  
  47
  
    
# If True, "about", "contact" and "support" links are displayed at the footer 


  		





  
  48
  
    
# of the Compute UI 


  		





  
  49
  
    
#BRANDING_SHOW_FOOTER_LINKS = False


  		





  
  50
  
    

  		





  
  51
  
    
#BRANDING_SERVICE_ABOUT_URL = 'https://synnefo.org/about'


  		





  
  52
  
    
#BRANDING_SERVICE_CONTACT_URL = 'https://synnefo.org/contact'


  		





  
  53
  
    
#BRANDING_SERVICE_SUPPORT_URL = 'https://synnefo.org/support'


  		





  
  54
  
    

  		





  
  55
  
    

  		












  

    
      b/snf-branding/synnefo_branding/settings.py
    
  






  2
  2
  
    
from synnefo.util.version import get_component_version


  		





  3
  3
  
    
import datetime


  		





  4
  4
  
    

  		





  
  5
  
    
## Service and company names/urls


  		





  
  6
  
    
######################


  		





  5
  7
  
    

  		





  6
  
  
    
COMPANY_NAME = getattr(settings, 'BRANDING_COMPANY_NAME', 'GRNET')


  		





  7
  
  
    
COMPANY_NAME_FORMAL = getattr(settings, 'BRANDING_COMPANY_NAME_FORMAL',


  		





  8
  
  
    
	                          'GRNET S.A.')


  		





  9
  
  
    
COMPANY_URL = getattr(settings, 'BRANDING_COMPANY_URL', 


  		





  10
  
  
    
					  'https://www.grnet.gr/en/')


  		





  11
  8
  
    
SERVICE_NAME = getattr(settings, 'BRANDING_SERVICE_NAME', 'Synnefo')


  		





  12
  9
  
    
SERVICE_URL = getattr(settings, 'BRANDING_SERVICE_URL', 


  		





  13
  10
  
    
					  'http://www.synnefo.org/')


  		





  
  11
  
    
COMPANY_NAME = getattr(settings, 'BRANDING_COMPANY_NAME', 'GRNET')


  		





  
  12
  
    
COMPANY_URL = getattr(settings, 'BRANDING_COMPANY_URL', 


  		





  
  13
  
    
					  'https://www.grnet.gr/en/')


  		





  
  14
  
    

  		





  
  15
  
    

  		





  
  16
  
    
## Images


  		





  
  17
  
    
######################


  		





  
  18
  
    

  		





  
  19
  
    
# The default path to the folder that contains all branding images


  		





  
  20
  
    
IMAGE_MEDIA_URL = getattr(settings, 'BRANDING_IMAGE_MEDIA_URL', 


  		





  
  21
  
    
						  settings.MEDIA_URL+'branding/images/')


  		





  
  22
  
    
 


  		





  
  23
  
    
# You can replace any image by providing its absolute path


  		





  
  24
  
    
# example: 'https://synnefo.org/uploads/images/my_image.png'


  		





  
  25
  
    
# The service favicon 


  		





  
  26
  
    
FAVICON_URL = getattr(settings, 'BRANDING_FAVICON_URL',


  		





  
  27
  
    
        	   		  IMAGE_MEDIA_URL+'favicon.ico')


  		





  
  28
  
    
# Logo used in Dashboard pages (Astakos)


  		





  
  29
  
    
DASHBOARD_LOGO_URL = getattr(settings, 'BRANDING_DASHBOARD_LOGO_URL', 


  		





  
  30
  
    
					 		 IMAGE_MEDIA_URL+'dashboard_logo.png')


  		





  
  31
  
    
# Logo used in Compute pages (Cyclades)


  		





  
  32
  
    
COMPUTE_LOGO_URL = getattr(settings, 'BRANDING_COMPUTE_LOGO_URL',


  		





  
  33
  
    
						   IMAGE_MEDIA_URL+'compute_logo.png')


  		





  
  34
  
    
# Logo used in Console page for VM (Cyclades)


  		





  
  35
  
    
CONSOLE_LOGO_URL = getattr(settings, 'BRANDING_CONSOLE_LOGO_URL',


  		





  
  36
  
    
						   IMAGE_MEDIA_URL+'console_logo.png')


  		





  
  37
  
    
# Logo used in Storage pages (Pithos)


  		





  
  38
  
    
STORAGE_LOGO_URL = getattr(settings, 'BRANDING_STORAGE_LOGO_URL',


  		





  
  39
  
    
						   IMAGE_MEDIA_URL+'storage_logo.png') 


  		





  14
  40
  
    

  		





  15
  
  
    
period_default = '2011-%s' % (datetime.datetime.now().year)


  		





  
  41
  
    
## Copyright options


  		





  
  42
  
    
######################


  		





  16
  43
  
    

  		





  
  44
  
    
# If True, Copyright message will appear at the footer of the Compute and 


  		





  
  45
  
    
# Dashboard UI 


  		





  
  46
  
    
SHOW_COPYRIGHT = getattr(settings, 'BRANDING_SHOW_COPYRIGHT', False)


  		





  
  47
  
    
copyright_period_default = '2011-%s' % (datetime.datetime.now().year)


  		





  17
  48
  
    
# Defaults to 2011-<current_year>


  		





  18
  49
  
    
COPYRIGHT_PERIOD = getattr(settings, 'BRANDING_COPYRIGHT_PERIOD', 


  		





  19
  
  
    
						   period_default)


  		





  20
  
  
    

  		





  21
  
  
    
copyright_message = 'Copyright (c) %s %s' % (COPYRIGHT_PERIOD, 


  		





  
  50
  
    
						   copyright_period_default)


  		





  
  51
  
    
# Formal company name appears in copyright message


  		





  
  52
  
    
COMPANY_NAME_FORMAL = getattr(settings, 'BRANDING_COMPANY_NAME_FORMAL',


  		





  
  53
  
    
	                          'GRNET S.A.')


  		





  
  54
  
    
copyright_message_default = 'Copyright (c) %s %s' % (COPYRIGHT_PERIOD, 


  		





  22
  55
  
    
											 COMPANY_NAME_FORMAL)


  		





  23
  
  
    

  		





  24
  
  
    
# Defaults to Copyright (c) 2011-<current_year>


  		





  
  56
  
    
# Defaults to Copyright (c) 2011-<current_year> GRNET S.A.


  		





  25
  57
  
    
COPYRIGHT_MESSAGE = getattr(settings, 'BRANDING_COPYRIGHT_MESSAGE', 


  		





  26
  
  
    
						    copyright_message)


  		





  
  58
  
    
						    copyright_message_default)


  		





  27
  59
  
    

  		





  28
  
  
    
# if True, copyright message is visible to footer


  		





  29
  
  
    
SHOW_COPYRIGHT = True


  		





  30
  60
  
    

  		





  
  61
  
    
## Footer links


  		





  
  62
  
    
######################


  		





  31
  63
  
    

  		





  32
  
  
    
IMAGE_MEDIA_URL = settings.MEDIA_URL+'branding/images/'


  		





  33
  
  
    
FAVICON_URL = getattr(settings, 'BRANDING_FAVICON_URL', 


  		





  34
  
  
    
			settings.MEDIA_URL+'branding/images/favicon.ico')


  		





  35
  
  
    

  		





  36
  
  
    
# Used in Dashboard pages (Astakos)


  		





  37
  
  
    
DASHBOARD_LOGO_URL = getattr(settings, 'BRANDING_DASHBOARD_LOGO_URL', 


  		





  38
  
  
    
					 settings.MEDIA_URL+'branding/images/dashboard_logo.png')


  		





  39
  
  
    
# Used in Compute pages (Cyclades)


  		





  40
  
  
    
COMPUTE_LOGO_URL = getattr(settings, 'BRANDING_COMPUTE_LOGO_URL',


  		





  41
  
  
    
					settings.MEDIA_URL+'branding/images/compute_logo.png')


  		





  42
  
  
    
# Used in Console page for VM (Cyclades)


  		





  43
  
  
    
CONSOLE_LOGO_URL = getattr(settings, 'BRANDING_CONSOLE_LOGO_URL',


  		





  44
  
  
    
					settings.MEDIA_URL+'branding/images/console_logo.png')


  		





  45
  
  
    
# Used in Storage pages (Pithos)


  		





  46
  
  
    
STORAGE_LOGO_URL = getattr(settings, 'BRANDING_STORAGE_LOGO_URL',


  		





  47
  
  
    
					settings.MEDIA_URL+'branding/images/storage_logo.png')


  		





  48
  
  
    
CLOUDBAR_HOME_ICON_URL = getattr(settings, 'CLOUDBAR_HOME_ICON_URL',


  		





  49
  
  
    
					settings.MEDIA_URL+'branding/images/cloudbar_home.png')


  		





  50
  
  
    

  		





  51
  
  
    
# if True, about, support and feeback links are displayed to Compute footer


  		





  52
  
  
    
EXTRA_FOOTER_LINKS = True


  		





  
  64
  
    
# If True, "about", "contact" and "support" links are displayed at the footer 


  		





  
  65
  
    
# of the Compute UI 


  		





  
  66
  
    
SHOW_FOOTER_LINKS = getattr(settings, 'BRANDING_SHOW_FOOTER_LINKS', True)


  		





  53
  67
  
    
SERVICE_ABOUT_URL = getattr(settings, 'BRANDING_SERVICE_ABOUT_URL', 


  		





  54
  
  
    
							 'https://okeanos.grnet.gr/about/what/ ')


  		





  
  68
  
    
							'https://synnefo.org/about')


  		





  55
  69
  
    
SERVICE_CONTACT_URL = getattr(settings, 'BRANDING_SERVICE_CONTACT_URL', 


  		





  56
  
  
    
							 'https://accounts.okeanos.grnet.gr/im/feedback ')


  		





  
  70
  
    
							 'https://synnefo.org/contact')


  		





  57
  71
  
    
SERVICE_SUPPORT_URL = getattr(settings, 'BRANDING_SERVICE_SUPPORT_URL', 


  		





  58
  
  
    
							 'https://okeanos.grnet.gr/support/general/ ')


  		





  
  72
  
    
							 'https://synnefo.org/support')


  		





  59
  73
  
    
 


  		





  60
  74
  
    
SYNNEFO_JS_LIB_VERSION = get_component_version('app')


  		












  

    
      b/snf-common/synnefo/settings/default/admins.py
    
  






  24
  24
  
    
DEFAULT_CHARSET = 'utf-8'


  		





  25
  25
  
    

  		





  26
  26
  
    
# Address to use for outgoing emails


  		





  27
  
  
    
DEFAULT_FROM_EMAIL = "~okeanos <no-reply@grnet.gr>"


  		





  
  27
  
    
DEFAULT_FROM_EMAIL = "synnefo <no-reply@synnefo.org>"


  		





  28
  28
  
    

  		





  29
  29
  
    
# Email where users can contact for support


  		





  30
  30
  
    
CONTACT_EMAIL = "support@synnefo.org"


  		












  

    
      b/snf-cyclades-app/synnefo/app_settings/default/api.py
    
  






  64
  64
  
    
APPEND_SLASH = False


  		





  65
  65
  
    

  		





  66
  66
  
    
# Fixed mapping of user VMs to a specific backend.


  		





  67
  
  
    
# e.g. BACKEND_PER_USER = {'example@okeanos.grnet.gr': 2}


  		





  
  67
  
    
# e.g. BACKEND_PER_USER = {'example@synnefo.org': 2}


  		





  68
  68
  
    
BACKEND_PER_USER = {}


  		





  69
  69
  
    

  		





  70
  70
  
    
# List of backend IDs used *only* for archipelago.


  		





  ......




  75
  75
  
    
MAX_VMS_PER_USER = 3


  		





  76
  76
  
    

  		





  77
  77
  
    
# Override maximum number of VMs for specific users.


  		





  78
  
  
    
# e.g. VMS_USER_QUOTA = {'user1@grnet.gr': 5, 'user2@grnet.gr': 10}


  		





  
  78
  
    
# e.g. VMS_USER_QUOTA = {'user1@synnefo.org': 5, 'user2@synnefo.org': 10}


  		





  79
  79
  
    
VMS_USER_QUOTA = {}


  		





  80
  80
  
    

  		





  81
  81
  
    
# Maximum number of networks a user is allowed to have.


  		





  82
  82
  
    
MAX_NETWORKS_PER_USER = 5


  		





  83
  83
  
    

  		





  84
  84
  
    
# Override maximum number of private networks for specific users.


  		





  85
  
  
    
# e.g. NETWORKS_USER_QUOTA = {'user1@grnet.gr': 5, 'user2@grnet.gr': 10}


  		





  
  85
  
    
# e.g. NETWORKS_USER_QUOTA = {'user1@synnefo.org': 5, 'user2@synnefo.org': 10}


  		





  86
  86
  
    
NETWORKS_USER_QUOTA = {}


  		





  87
  87
  
    

  		





  88
  88
  
    
# URL templates for the stat graphs.


  		





  89
  89
  
    
# The API implementation replaces '%s' with the encrypted backend id.


  		





  90
  90
  
    
# FIXME: For now we do not encrypt the backend id.


  		





  91
  
  
    
CPU_BAR_GRAPH_URL = 'http://stats.okeanos.grnet.gr/%s/cpu-bar.png'


  		





  92
  
  
    
CPU_TIMESERIES_GRAPH_URL = 'http://stats.okeanos.grnet.gr/%s/cpu-ts.png'


  		





  93
  
  
    
NET_BAR_GRAPH_URL = 'http://stats.okeanos.grnet.gr/%s/net-bar.png'


  		





  94
  
  
    
NET_TIMESERIES_GRAPH_URL = 'http://stats.okeanos.grnet.gr/%s/net-ts.png'


  		





  
  91
  
    
CPU_BAR_GRAPH_URL = 'http://stats.synnefo.org/%s/cpu-bar.png'


  		





  
  92
  
    
CPU_TIMESERIES_GRAPH_URL = 'http://stats.synnefo.org/%s/cpu-ts.png'


  		





  
  93
  
    
NET_BAR_GRAPH_URL = 'http://stats.synnefo.org/%s/net-bar.png'


  		





  
  94
  
    
NET_TIMESERIES_GRAPH_URL = 'http://stats.synnefo.org/%s/net-ts.png'


  		





  95
  95
  
    

  		





  96
  96
  
    
# Recommended refresh period for server stats


  		





  97
  97
  
    
STATS_REFRESH_PERIOD = 60


  		





  ......




  110
  110
  
    
DEFAULT_GANETI_DISK_TEMPLATE = 'drbd'


  		





  111
  111
  
    

  		





  112
  112
  
    
# The URL of an astakos instance that will be used for user authentication


  		





  113
  
  
    
ASTAKOS_URL = 'https://accounts.example.org/'


  		





  
  113
  
    
ASTAKOS_URL = 'https://accounts.synnefo.org/'


  		





  114
  114
  
    

  		





  115
  115
  
    
# Key for password encryption-decryption. After changing this setting, synnefo


  		





  116
  116
  
    
# will be unable to decrypt all existing Backend passwords. You will need to


  		





  ......




  125
  125
  
    
CYCLADES_ASTAKOS_SERVICE_TOKEN = ''


  		





  126
  126
  
    

  		





  127
  127
  
    
# Astakos user_catalogs endpoint


  		





  128
  
  
    
CYCLADES_USER_CATALOG_URL = 'https://<astakos domain>/user_catalogs'


  		





  
  128
  
    
CYCLADES_USER_CATALOG_URL = 'https://accounts.synnefo.org/user_catalogs'


  		





  129
  129
  
    

  		





  130
  130
  
    
# Let cyclades proxy user specific api calls to astakos, via self served


  		





  131
  131
  
    
# endpoints. Set this to False if you deploy cyclades-app/astakos-app on the


  		





  ......




  133
  133
  
    
CYCLADES_PROXY_USER_SERVICES = True


  		





  134
  134
  
    

  		





  135
  135
  
    
# Astakos user_catalogs endpoint


  		





  136
  
  
    
CYCLADES_USER_FEEDBACK_URL = 'https://accounts.example.synnefo.org/feedback'


  		





  
  136
  
    
CYCLADES_USER_FEEDBACK_URL = 'https://accounts.synnefo.org/feedback'


  		












  

    
      b/snf-cyclades-app/synnefo/app_settings/default/cloudbar.py
    
  






  1
  1
  
    
CLOUDBAR_ACTIVE = True


  		





  2
  
  
    
CLOUDBAR_LOCATION = 'https://accounts.okeanos.grnet.gr/static/im/cloudbar/'


  		





  
  2
  
    
CLOUDBAR_LOCATION = 'https://accounts.synnefo.org/static/im/cloudbar/'


  		





  3
  3
  
    
CLOUDBAR_COOKIE_NAME = '_pithos2_a'


  		





  4
  4
  
    
CLOUDBAR_ACTIVE_SERVICE = 'cloud'


  		





  5
  
  
    
CLOUDBAR_SERVICES_URL = 'https://accounts.okeanos.grnet.gr/im/get_services'


  		





  6
  
  
    
CLOUDBAR_MENU_URL = 'https://accounts.okeanos.grnet.gr/im/get_menu'


  		





  
  5
  
    
CLOUDBAR_SERVICES_URL = 'https://accounts.synnefo.org/im/get_services'


  		





  
  6
  
    
CLOUDBAR_MENU_URL = 'https://accounts.synnefo.org/im/get_menu'


  		





  
  7
  
    

  		





  7
  8
  
    

  		












  

    
      b/snf-cyclades-app/synnefo/app_settings/default/ui.py
    
  






  24
  24
  
    
# How often should the UI request changes from the API


  		





  25
  25
  
    
UI_UPDATE_INTERVAL = 5000


  		





  26
  26
  
    

  		





  27
  
  
    
# Milieconds to increase the interval after UI_UPDATE_INTERVAL_INCREASE_AFTER_CALLS_COUNT calls


  		





  
  27
  
    
# Milieconds to increase the interval after 


  		





  
  28
  
    
# UI_UPDATE_INTERVAL_INCREASE_AFTER_CALLS_COUNT calls


  		





  28
  29
  
    
# of recurrent api requests


  		





  29
  30
  
    
UI_UPDATE_INTERVAL_INCREASE = UI_UPDATE_INTERVAL / 4


  		





  30
  31
  
    
UI_UPDATE_INTERVAL_INCREASE_AFTER_CALLS_COUNT = 4


  		





  ......




  88
  89
  
    
VM_CREATE_NAME_TPL = "My {0} server"


  		





  89
  90
  
    

  		





  90
  91
  
    
# Template to use to build vm hostname


  		





  91
  
  
    
UI_VM_HOSTNAME_FORMAT = 'snf-%(id)s.vm.okeanos.grnet.gr'


  		





  
  92
  
    
UI_VM_HOSTNAME_FORMAT = 'snf-%(id)s.vm.synnefo.org'


  		





  92
  93
  
    

  		





  93
  94
  
    
# Name/description metadata for the available flavor disk templates


  		





  94
  95
  
    
# Dict key is the disk_template value as stored in database


  		





  ......




  199
  200
  
    
# a dict of image owner ids and their associate name


  		





  200
  201
  
    
# to be displayed on images list


  		





  201
  202
  
    
UI_SYSTEM_IMAGES_OWNERS = {


  		





  202
  
  
    
    'admin@synnefo.gr': 'system',


  		





  203
  
  
    
    'images@synnefo.gr': 'system'


  		





  
  203
  
    
    'admin@synnefo.org': 'system',


  		





  
  204
  
    
    'images@synnefo.org': 'system'


  		





  204
  205
  
    
}


  		





  205
  206
  
    

  		





  206
  207
  
    
# Astakos feedback endpoint. UI uses this setting to post error feedbacks


  		












Also available in:
  Unified diff