Revision 77a345fc
| b/snf-astakos-app/astakos/im/settings.py | ||
|---|---|---|
| 4 | 4 |
# to be this many hours after their creation time. |
| 5 | 5 |
AUTH_TOKEN_DURATION = getattr(settings, 'ASTAKOS_AUTH_TOKEN_DURATION', 30 * 24) |
| 6 | 6 |
|
| 7 |
|
|
| 8 |
|
|
| 9 | 7 |
DEFAULT_USER_LEVEL = getattr(settings, 'ASTAKOS_DEFAULT_USER_LEVEL', 4) |
| 10 | 8 |
|
| 11 | 9 |
INVITATIONS_PER_LEVEL = getattr(settings, 'ASTAKOS_INVITATIONS_PER_LEVEL', {
|
| ... | ... | |
| 18 | 16 |
|
| 19 | 17 |
# Address to use for outgoing emails |
| 20 | 18 |
DEFAULT_CONTACT_EMAIL = getattr( |
| 21 |
settings, 'ASTAKOS_DEFAULT_CONTACT_EMAIL', 'support@cloud.grnet.gr')
|
|
| 19 |
settings, 'ASTAKOS_DEFAULT_CONTACT_EMAIL', 'support@synnefo.local')
|
|
| 22 | 20 |
|
| 23 | 21 |
SERVER_EMAIL = getattr(settings, 'SERVER_EMAIL', None) |
| 24 | 22 |
ADMINS = getattr(settings, 'ADMINS', None) |
| ... | ... | |
| 43 | 41 |
MODERATION_ENABLED = getattr(settings, 'ASTAKOS_MODERATION_ENABLED', True) |
| 44 | 42 |
|
| 45 | 43 |
# Set baseurl |
| 46 |
BASEURL = getattr(settings, 'ASTAKOS_BASEURL', 'http://pithos.dev.grnet.gr')
|
|
| 44 |
BASEURL = getattr(settings, 'ASTAKOS_BASEURL', 'https://accounts.synnefo.local')
|
|
| 47 | 45 |
|
| 48 | 46 |
# Set service name |
| 49 |
SITENAME = getattr(settings, 'ASTAKOS_SITENAME', 'GRNET Cloud')
|
|
| 47 |
SITENAME = getattr(settings, 'ASTAKOS_SITENAME', 'Synnefo Cloud')
|
|
| 50 | 48 |
|
| 51 | 49 |
# Set recaptcha keys |
| 52 | 50 |
RECAPTCHA_PUBLIC_KEY = getattr(settings, 'ASTAKOS_RECAPTCHA_PUBLIC_KEY', '') |
| ... | ... | |
| 165 | 163 |
# Set the cloud service properties |
| 166 | 164 |
SERVICES = getattr(settings, 'ASTAKOS_SERVICES', {
|
| 167 | 165 |
'cyclades': {
|
| 168 |
'url': 'https://node1.example.com/ui/', |
|
| 166 |
# # Specifying the key 'url' will overwrite it. |
|
| 167 |
# # Use this to (re)set service URL. |
|
| 168 |
# 'url': 'https://cyclades.synnefo.local/ui/', |
|
| 169 |
# # order services in listings, cloudbar, etc. |
|
| 170 |
# 'order' : 1 |
|
| 169 | 171 |
'resources': [{
|
| 170 |
'name':'disk', |
|
| 171 |
'group':'compute', |
|
| 172 |
'uplimit':30*1024*1024*1024, |
|
| 173 |
'unit':'bytes', |
|
| 172 |
'name': 'disk',
|
|
| 173 |
'group': 'compute',
|
|
| 174 |
'uplimit': 30*1024*1024*1024,
|
|
| 175 |
'unit': 'bytes',
|
|
| 174 | 176 |
'desc': 'Virtual machine disk size' |
| 175 |
},{
|
|
| 176 |
'name':'cpu', |
|
| 177 |
'group':'compute', |
|
| 178 |
'uplimit':6, |
|
| 177 |
}, {
|
|
| 178 |
'name': 'cpu',
|
|
| 179 |
'group': 'compute',
|
|
| 180 |
'uplimit': 6,
|
|
| 179 | 181 |
'desc': 'Number of virtual machine processors' |
| 180 |
},{
|
|
| 181 |
'name':'ram', |
|
| 182 |
'group':'compute', |
|
| 183 |
'uplimit':6*1024*1024*1024, |
|
| 184 |
'unit':'bytes', |
|
| 182 |
}, {
|
|
| 183 |
'name': 'ram',
|
|
| 184 |
'group': 'compute',
|
|
| 185 |
'uplimit': 6*1024*1024*1024,
|
|
| 186 |
'unit': 'bytes',
|
|
| 185 | 187 |
'desc': 'Virtual machines' |
| 186 |
},{
|
|
| 187 |
'name':'vm', |
|
| 188 |
'group':'compute', |
|
| 189 |
'uplimit':2, |
|
| 188 |
}, {
|
|
| 189 |
'name': 'vm',
|
|
| 190 |
'group': 'compute',
|
|
| 191 |
'uplimit': 2,
|
|
| 190 | 192 |
'desc': 'Number of virtual machines' |
| 191 |
},{
|
|
| 192 |
'name':'network.private', |
|
| 193 |
'group':'network', |
|
| 194 |
'uplimit':1, |
|
| 193 |
}, {
|
|
| 194 |
'name': 'network.private',
|
|
| 195 |
'group': 'network',
|
|
| 196 |
'uplimit': 1,
|
|
| 195 | 197 |
'desc': 'Private networks' |
| 196 | 198 |
} |
| 197 | 199 |
] |
| 198 | 200 |
}, |
| 199 | 201 |
'pithos+': {
|
| 200 |
'url': 'https://node2.example.com/ui/', |
|
| 202 |
# # Use this to (re)set service URL. |
|
| 203 |
# 'url': 'https://pithos.synnefo.local/ui/', |
|
| 204 |
# # order services in listings, cloudbar, etc. |
|
| 205 |
# 'order' : 2 |
|
| 201 | 206 |
'resources':[{
|
| 202 |
'name':'diskspace', |
|
| 203 |
'group':'storage', |
|
| 204 |
'uplimit':5 * 1024 * 1024 * 1024,
|
|
| 205 |
'unit':'bytes', |
|
| 207 |
'name': 'diskspace',
|
|
| 208 |
'group': 'storage',
|
|
| 209 |
'uplimit': 5*1024*1024*1024,
|
|
| 210 |
'unit': 'bytes',
|
|
| 206 | 211 |
'desc': 'Pithos account diskspace' |
| 207 | 212 |
}] |
| 208 | 213 |
} |
| b/snf-astakos-app/conf/20-snf-astakos-app-settings.conf | ||
|---|---|---|
| 13 | 13 |
#} |
| 14 | 14 |
|
| 15 | 15 |
# Address to use for outgoing emails |
| 16 |
#ASTAKOS_DEFAULT_CONTACT_EMAIL = 'support@cloud.grnet.gr'
|
|
| 16 |
#ASTAKOS_DEFAULT_CONTACT_EMAIL = 'support@synnefo.local'
|
|
| 17 | 17 |
|
| 18 | 18 |
#SERVER_EMAIL = None |
| 19 | 19 |
#ADMINS = None |
| ... | ... | |
| 39 | 39 |
#ASTAKOS_MODERATION_ENABLED = True |
| 40 | 40 |
|
| 41 | 41 |
# Set baseurl |
| 42 |
#ASTAKOS_BASEURL = 'http://pithos.dev.grnet.gr'
|
|
| 42 |
#ASTAKOS_BASEURL = 'https://accounts.synnefo.local'
|
|
| 43 | 43 |
|
| 44 | 44 |
# Set service name |
| 45 |
#ASTAKOS_SITENAME = 'GRNET Cloud'
|
|
| 45 |
#ASTAKOS_SITENAME = 'Synnefo Cloud'
|
|
| 46 | 46 |
|
| 47 | 47 |
# Set recaptcha keys |
| 48 | 48 |
# http://www.google.com/recaptcha/whyrecaptcha |
| ... | ... | |
| 52 | 52 |
#ASTAKOS_RECAPTCHA_USE_SSL = True |
| 53 | 53 |
#ASTAKOS_RECAPTCHA_ENABLED = False |
| 54 | 54 |
|
| 55 |
# set AstakosUser fields to propagate in the billing system |
|
| 56 |
#ASTAKOS_BILLING_FIELDS = ['is_active'] |
|
| 57 |
|
|
| 58 |
# Queue for billing. |
|
| 59 |
#'rabbitmq://guest:guest@localhost:5672/astakos' |
|
| 60 |
#ASTAKOS_QUEUE_CONNECTION = None |
|
| 61 |
|
|
| 62 | 55 |
# Set where the user should be redirected after logout |
| 63 | 56 |
#ASTAKOS_LOGOUT_NEXT = '' |
| 64 | 57 |
|
| ... | ... | |
| 122 | 115 |
# Set the cloud service properties |
| 123 | 116 |
# ASTAKOS_SERVICES = {
|
| 124 | 117 |
# 'cyclades': {
|
| 125 |
## 'url': 'https://node1.example.com/ui/', |
|
| 118 |
## # Specifying the key 'url' will overwrite it. |
|
| 119 |
## # Use this to (re)set service URL. |
|
| 120 |
## 'url': 'https://cyclades.synnefo.local/ui/', |
|
| 121 |
## # order services in listings, cloudbar, etc. |
|
| 122 |
## 'order' : 1 |
|
| 126 | 123 |
# 'resources': [{
|
| 127 |
# 'name':'disk', |
|
| 128 |
# 'group':'compute', |
|
| 129 |
# 'uplimit':30*1024*1024*1024, |
|
| 130 |
# 'unit':'bytes', |
|
| 124 |
# 'name': 'disk',
|
|
| 125 |
# 'group': 'compute',
|
|
| 126 |
# 'uplimit': 30*1024*1024*1024,
|
|
| 127 |
# 'unit': 'bytes',
|
|
| 131 | 128 |
# 'desc': 'Virtual machine disk size' |
| 132 |
# },{
|
|
| 133 |
# 'name':'cpu', |
|
| 134 |
# 'group':'compute', |
|
| 135 |
# 'uplimit':6, |
|
| 129 |
# }, {
|
|
| 130 |
# 'name': 'cpu',
|
|
| 131 |
# 'group': 'compute',
|
|
| 132 |
# 'uplimit': 6,
|
|
| 136 | 133 |
# 'desc': 'Number of virtual machine processors' |
| 137 |
# },{
|
|
| 138 |
# 'name':'ram', |
|
| 139 |
# 'group':'compute', |
|
| 140 |
# 'uplimit':6*1024*1024*1024, |
|
| 141 |
# 'unit':'bytes', |
|
| 134 |
# }, {
|
|
| 135 |
# 'name': 'ram',
|
|
| 136 |
# 'group': 'compute',
|
|
| 137 |
# 'uplimit': 6*1024*1024*1024,
|
|
| 138 |
# 'unit': 'bytes',
|
|
| 142 | 139 |
# 'desc': 'Virtual machines' |
| 143 |
# },{
|
|
| 144 |
# 'name':'vm', |
|
| 145 |
# 'group':'compute', |
|
| 146 |
# 'uplimit':2, |
|
| 140 |
# }, {
|
|
| 141 |
# 'name': 'vm',
|
|
| 142 |
# 'group': 'compute',
|
|
| 143 |
# 'uplimit': 2,
|
|
| 147 | 144 |
# 'desc': 'Number of virtual machines' |
| 148 |
# },{
|
|
| 149 |
# 'name':'network.private', |
|
| 150 |
# 'group':'network', |
|
| 151 |
# 'uplimit':1, |
|
| 145 |
# }, {
|
|
| 146 |
# 'name': 'network.private',
|
|
| 147 |
# 'group': 'network',
|
|
| 148 |
# 'uplimit': 1,
|
|
| 152 | 149 |
# 'desc': 'Private networks' |
| 153 | 150 |
# } |
| 154 | 151 |
# ] |
| 155 | 152 |
# }, |
| 156 | 153 |
# 'pithos+': {
|
| 157 |
## 'url': 'https://node2.example.com/ui/', |
|
| 154 |
## # Use this to (re)set service URL. |
|
| 155 |
## 'url': 'https://pithos.synnefo.local/ui/', |
|
| 156 |
## # order services in listings, cloudbar, etc. |
|
| 157 |
## 'order' : 2 |
|
| 158 | 158 |
# 'resources':[{
|
| 159 |
# 'name':'diskspace', |
|
| 160 |
# 'group':'storage', |
|
| 161 |
# 'uplimit':5 * 1024 * 1024 * 1024,
|
|
| 162 |
# 'unit':'bytes', |
|
| 159 |
# 'name': 'diskspace',
|
|
| 160 |
# 'group': 'storage',
|
|
| 161 |
# 'uplimit': 5*1024*1024*1024,
|
|
| 162 |
# 'unit': 'bytes',
|
|
| 163 | 163 |
# 'desc': 'Pithos account diskspace' |
| 164 | 164 |
# }] |
| 165 | 165 |
# } |
| 166 | 166 |
#} |
| 167 | 167 |
|
| 168 |
# Set the billing URI |
|
| 169 |
#ASTAKOS_AQUARIUM_URL = '' |
|
| 170 |
|
|
| 171 | 168 |
# Set how many objects should be displayed per page |
| 172 | 169 |
#ASTAKOS_PAGINATE_BY = 10 |
| 173 | 170 |
# Set how many objects should be displayed per page in show all groups page |
| ... | ... | |
| 274 | 271 |
|
| 275 | 272 |
#ASTAKOS_ACTIVATION_REDIRECT_URL = "/im/landing" |
| 276 | 273 |
|
| 277 |
# If true, this enables a ui compatibility layer for the introduction of UUIDs |
|
| 278 |
# in identity management. WARNING: Setting to True will break your installation. |
|
| 279 |
#ASTAKOS_TRANSLATE_UUIDS = False |
|
| 280 |
|
|
| 281 |
# UUIDs of users that can approve or deny project applications from the web. |
|
| 282 |
# ASTAKOS_PROJECT_ADMINS = set() # e.g. set(['01234567-89ab-cdef-0123-456789abcdef']) |
|
| 283 |
# |
|
| 284 | 274 |
# If true, this enables a ui compatibility layer for the introduction |
| 285 | 275 |
# of UUIDs in identity management. |
| 286 | 276 |
# WARNING: Setting to True will break your installation. |
| 287 | 277 |
# ASTAKOS_TRANSLATE_UUIDS = False |
| 288 | 278 |
|
| 279 |
# UUIDs of users that can approve or deny project applications from the web. |
|
| 280 |
# ASTAKOS_PROJECT_ADMINS = set() # e.g. set(['01234567-89ab-cdef-0123-456789abcdef']) |
|
| 281 |
|
|
| 289 | 282 |
# OAuth2 Twitter credentials. |
| 290 | 283 |
#ASTAKOS_TWITTER_KEY = '' |
| 291 | 284 |
#ASTAKOS_TWITTER_SECRET = '' |
| b/snf-pithos-app/conf/20-snf-pithos-app-settings.conf | ||
|---|---|---|
| 1 |
#PITHOS_AUTHENTICATION_URL = 'http://<astakos.host>/im/authenticate/'
|
|
| 1 |
#PITHOS_AUTHENTICATION_URL = 'https://accounts.synnefo.local/im/authenticate/'
|
|
| 2 | 2 |
|
| 3 | 3 |
#PITHOS_AUTHENTICATION_USERS = {}
|
| 4 | 4 |
|
| ... | ... | |
| 40 | 40 |
# Set to False if snf astakos-app is running on the same machine, so it handles |
| 41 | 41 |
# the requests on its own. |
| 42 | 42 |
#PROXY_USER_SERVICES = True |
| 43 |
#PITHOS_USER_CATALOG_URL = 'https://<astakos.host>/user_catalogs/'
|
|
| 44 |
#PITHOS_USER_FEEDBACK_URL = 'http://<astakos.host>/feedback/'
|
|
| 45 |
#PITHOS_USER_LOGIN_URL = 'http://<astakos.host>/login/'
|
|
| 43 |
#PITHOS_USER_CATALOG_URL = 'https://accounts.synnefo.local/user_catalogs/'
|
|
| 44 |
#PITHOS_USER_FEEDBACK_URL = 'http://accounts.synnefo.local/feedback/'
|
|
| 45 |
#PITHOS_USER_LOGIN_URL = 'http://accounts.synnefo.local/login/'
|
|
| 46 | 46 |
|
| 47 | 47 |
# Enable and configure quotaholder |
| 48 | 48 |
#PITHOS_USE_QUOTAHOLDER = False |
| b/snf-pithos-app/pithos/api/settings.py | ||
|---|---|---|
| 2 | 2 |
from django.conf import settings |
| 3 | 3 |
|
| 4 | 4 |
AUTHENTICATION_URL = getattr(settings, 'PITHOS_AUTHENTICATION_URL', |
| 5 |
'https://<astakos.host>/im/authenticate/')
|
|
| 5 |
'https://accounts.synnefo.local/im/authenticate/')
|
|
| 6 | 6 |
AUTHENTICATION_USERS = getattr(settings, 'PITHOS_AUTHENTICATION_USERS', {})
|
| 7 | 7 |
|
| 8 | 8 |
COOKIE_NAME = getattr(settings, 'PITHOS_ASTAKOS_COOKIE_NAME', '_pithos2_a') |
| ... | ... | |
| 54 | 54 |
PROXY_USER_SERVICES = getattr(settings, 'PITHOS_PROXY_USER_SERVICES', True) |
| 55 | 55 |
|
| 56 | 56 |
USER_CATALOG_URL = getattr(settings, 'PITHOS_USER_CATALOG_URL', |
| 57 |
'https://<astakos.host>/user_catalogs/')
|
|
| 57 |
'https://accounts.synnefo.local/user_catalogs/')
|
|
| 58 | 58 |
USER_FEEDBACK_URL = getattr(settings, 'PITHOS_USER_FEEDBACK_URL', |
| 59 |
'https://<astakos.host>/feedback/')
|
|
| 59 |
'https://accounts.synnefo.local/feedback/')
|
|
| 60 | 60 |
USER_LOGIN_URL = getattr(settings, 'PITHOS_USER_LOGIN_URL', |
| 61 |
'https://<astakos.host>/login/')
|
|
| 61 |
'https://accounts.synnefo.local/login/')
|
|
| 62 | 62 |
|
| 63 | 63 |
# Set the quota holder component URI |
| 64 | 64 |
USE_QUOTAHOLDER = getattr(settings, 'PITHOS_USE_QUOTAHOLDER', False) |
Also available in: Unified diff