Revision 9521d937
| b/docs/upgrade-0.13.rst | ||
|---|---|---|
| 244 | 244 |
|
| 245 | 245 |
QUOTAHOLDER_TOKEN = 'aExampleTokenJbFm12w' |
| 246 | 246 |
ASTAKOS_QUOTAHOLDER_TOKEN = 'aExampleTokenJbFm12w' |
| 247 |
ASTAKOS_QUOTAHOLDER_URL = 'https://accounts.synnefo.org/quotaholder/v' |
|
| 247 |
ASTAKOS_QUOTAHOLDER_URL = 'https://accounts.example.synnefo.org/quotaholder/v'
|
|
| 248 | 248 |
|
| 249 | 249 |
On the Cyclades host, edit ``/etc/synnefo/20-snf-cyclades-app-quotas.conf``: |
| 250 | 250 |
|
| 251 | 251 |
:: |
| 252 | 252 |
|
| 253 | 253 |
CYCLADES_USE_QUOTAHOLDER = True |
| 254 |
CYCLADES_QUOTAHOLDER_URL = 'https://accounts.synnefo.org/quotaholder/v' |
|
| 254 |
CYCLADES_QUOTAHOLDER_URL = 'https://accounts.example.synnefo.org/quotaholder/v'
|
|
| 255 | 255 |
CYCLADES_QUOTAHOLDER_TOKEN = 'aExampleTokenJbFm12w' |
| 256 | 256 |
|
| 257 | 257 |
On the Pithos host, edit ``/etc/synnefo/20-snf-pithos-app-settings.conf``: |
| 258 | 258 |
|
| 259 | 259 |
:: |
| 260 | 260 |
|
| 261 |
PITHOS_QUOTAHOLDER_URL = 'https://accounts.synnefo.org/quotaholder/v' |
|
| 261 |
PITHOS_QUOTAHOLDER_URL = 'https://accounts.example.synnefo.org/quotaholder/v'
|
|
| 262 | 262 |
PITHOS_QUOTAHOLDER_TOKEN = 'aExampleTokenJbFm12w' |
| 263 | 263 |
PITHOS_USE_QUOTAHOLDER = False # will set to True after migration |
| 264 | 264 |
|
| ... | ... | |
| 341 | 341 |
Cyclades, again in ``/etc/synnefo/20-snf-cyclades-app-vmapi.conf``. Make sure |
| 342 | 342 |
the domain is exaclty the same, so that no re-directs happen :: |
| 343 | 343 |
|
| 344 |
VMAPI_BASE_URL = "https://cyclades.synnefo.org" |
|
| 344 |
VMAPI_BASE_URL = "https://cyclades.example.synnefo.org"
|
|
| 345 | 345 |
|
| 346 | 346 |
.. note:: |
| 347 | 347 |
|
| ... | ... | |
| 361 | 361 |
access them for uuid-displayname translations. Edit on the Pithos host |
| 362 | 362 |
``/etc/synnefo/20-snf-pithos-app-settings.conf`` :: |
| 363 | 363 |
|
| 364 |
PITHOS_USER_CATALOG_URL = https://accounts.synnefo.org/user_catalogs/ |
|
| 365 |
PITHOS_USER_FEEDBACK_URL = https://accounts.synnefo.org/feedback/ |
|
| 366 |
PITHOS_USER_LOGIN_URL = https://accounts.synnefo.org/login/ |
|
| 364 |
PITHOS_USER_CATALOG_URL = https://accounts.example.synnefo.org/user_catalogs/
|
|
| 365 |
PITHOS_USER_FEEDBACK_URL = https://accounts.example.synnefo.org/feedback/
|
|
| 366 |
PITHOS_USER_LOGIN_URL = https://accounts.example.synnefo.org/login/
|
|
| 367 | 367 |
#PITHOS_PROXY_USER_SERVICES = True # Set False if astakos & pithos are on the same host |
| 368 | 368 |
|
| 369 | 369 |
|
| ... | ... | |
| 393 | 393 |
'cyclades': {
|
| 394 | 394 |
# # Specifying the key 'url' will overwrite it. |
| 395 | 395 |
# # Use this to (re)set service URL. |
| 396 |
# 'url': 'https://cyclades.synnefo.org/ui/', |
|
| 396 |
# 'url': 'https://cyclades.example.synnefo.org/ui/',
|
|
| 397 | 397 |
# # order services in listings, cloudbar, etc. |
| 398 | 398 |
# 'order' : 1 |
| 399 | 399 |
'resources': [{
|
| ... | ... | |
| 428 | 428 |
}, |
| 429 | 429 |
'pithos+': {
|
| 430 | 430 |
# # Use this to (re)set service URL. |
| 431 |
# 'url': 'https://pithos.synnefo.org/ui/', |
|
| 431 |
# 'url': 'https://pithos.example.synnefo.org/ui/',
|
|
| 432 | 432 |
# # order services in listings, cloudbar, etc. |
| 433 | 433 |
# 'order' : 2 |
| 434 | 434 |
'resources':[{
|
| b/snf-astakos-app/astakos/im/settings.py | ||
|---|---|---|
| 16 | 16 |
|
| 17 | 17 |
# Address to use for outgoing emails |
| 18 | 18 |
DEFAULT_CONTACT_EMAIL = getattr( |
| 19 |
settings, 'ASTAKOS_DEFAULT_CONTACT_EMAIL', 'support@synnefo.local')
|
|
| 19 |
settings, 'ASTAKOS_DEFAULT_CONTACT_EMAIL', 'support@example.synnefo.org')
|
|
| 20 | 20 |
|
| 21 | 21 |
SERVER_EMAIL = getattr(settings, 'SERVER_EMAIL', None) |
| 22 | 22 |
ADMINS = getattr(settings, 'ADMINS', None) |
| ... | ... | |
| 41 | 41 |
MODERATION_ENABLED = getattr(settings, 'ASTAKOS_MODERATION_ENABLED', True) |
| 42 | 42 |
|
| 43 | 43 |
# Set baseurl |
| 44 |
BASEURL = getattr(settings, 'ASTAKOS_BASEURL', 'https://accounts.synnefo.local')
|
|
| 44 |
BASEURL = getattr(settings, 'ASTAKOS_BASEURL', 'https://accounts.example.synnefo.org')
|
|
| 45 | 45 |
|
| 46 | 46 |
# Set service name |
| 47 | 47 |
SITENAME = getattr(settings, 'ASTAKOS_SITENAME', 'Synnefo Cloud') |
| ... | ... | |
| 165 | 165 |
'cyclades': {
|
| 166 | 166 |
# # Specifying the key 'url' will overwrite it. |
| 167 | 167 |
# # Use this to (re)set service URL. |
| 168 |
# 'url': 'https://cyclades.synnefo.local/ui/',
|
|
| 168 |
# 'url': 'https://cyclades.example.synnefo.org/ui/',
|
|
| 169 | 169 |
# # order services in listings, cloudbar, etc. |
| 170 | 170 |
# 'order' : 1 |
| 171 | 171 |
'resources': [{
|
| ... | ... | |
| 200 | 200 |
}, |
| 201 | 201 |
'pithos+': {
|
| 202 | 202 |
# # Use this to (re)set service URL. |
| 203 |
# 'url': 'https://pithos.synnefo.local/ui/',
|
|
| 203 |
# 'url': 'https://pithos.example.synnefo.org/ui/',
|
|
| 204 | 204 |
# # order services in listings, cloudbar, etc. |
| 205 | 205 |
# 'order' : 2 |
| 206 | 206 |
'resources':[{
|
| 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@synnefo.local'
|
|
| 16 |
#ASTAKOS_DEFAULT_CONTACT_EMAIL = 'support@example.synnefo.org'
|
|
| 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 = 'https://accounts.synnefo.local'
|
|
| 42 |
#ASTAKOS_BASEURL = 'https://accounts.example.synnefo.org'
|
|
| 43 | 43 |
|
| 44 | 44 |
# Set service name |
| 45 | 45 |
#ASTAKOS_SITENAME = 'Synnefo Cloud' |
| ... | ... | |
| 75 | 75 |
#ASTAKOS_GLOBAL_MESSAGES = [] |
| 76 | 76 |
|
| 77 | 77 |
# messages to display as extra actions in account forms |
| 78 |
# e.g. {'https://cms.synnefo.local/': 'Back to Synnefo'}
|
|
| 78 |
# e.g. {'https://cms.example.synnefo.org/': 'Back to Synnefo'}
|
|
| 79 | 79 |
#ASTAKOS_PROFILE_EXTRA_LINKS = [] |
| 80 | 80 |
|
| 81 | 81 |
# The number of unsuccessful login requests per minute allowed for a specific email |
| ... | ... | |
| 121 | 121 |
# 'cyclades': {
|
| 122 | 122 |
## # Specifying the key 'url' will overwrite it. |
| 123 | 123 |
## # Use this to (re)set service URL. |
| 124 |
## 'url': 'https://cyclades.synnefo.local/ui/',
|
|
| 124 |
## 'url': 'https://cyclades.example.synnefo.org/ui/',
|
|
| 125 | 125 |
## # order services in listings, cloudbar, etc. |
| 126 | 126 |
## 'order' : 1, |
| 127 | 127 |
# 'resources': [{
|
| ... | ... | |
| 156 | 156 |
# }, |
| 157 | 157 |
# 'pithos+': {
|
| 158 | 158 |
## # Use this to (re)set service URL. |
| 159 |
## 'url': 'https://pithos.synnefo.local/ui/',
|
|
| 159 |
## 'url': 'https://pithos.example.synnefo.org/ui/',
|
|
| 160 | 160 |
## # order services in listings, cloudbar, etc. |
| 161 | 161 |
## 'order' : 2, |
| 162 | 162 |
# 'resources':[{
|
| b/snf-cyclades-app/docs/_static/synnefo.nginx.conf | ||
|---|---|---|
| 1 | 1 |
server {
|
| 2 | 2 |
listen 80; |
| 3 | 3 |
|
| 4 |
server_name synnefo.local;
|
|
| 4 |
server_name example.synnefo.org;
|
|
| 5 | 5 |
|
| 6 | 6 |
root /var/lib/synnefo/; |
| 7 | 7 |
|
| b/snf-pithos-app/conf/20-snf-pithos-app-settings.conf | ||
|---|---|---|
| 1 |
#PITHOS_AUTHENTICATION_URL = 'https://accounts.synnefo.local/im/authenticate/'
|
|
| 1 |
#PITHOS_AUTHENTICATION_URL = 'https://accounts.example.synnefo.org/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://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/'
|
|
| 43 |
#PITHOS_USER_CATALOG_URL = 'https://accounts.example.synnefo.org/user_catalogs/'
|
|
| 44 |
#PITHOS_USER_FEEDBACK_URL = 'http://accounts.example.synnefo.org/feedback/'
|
|
| 45 |
#PITHOS_USER_LOGIN_URL = 'http://accounts.example.synnefo.org/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://accounts.synnefo.local/im/authenticate/')
|
|
| 5 |
'https://accounts.example.synnefo.org/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://accounts.synnefo.local/user_catalogs/')
|
|
| 57 |
'https://accounts.example.synnefo.org/user_catalogs/')
|
|
| 58 | 58 |
USER_FEEDBACK_URL = getattr(settings, 'PITHOS_USER_FEEDBACK_URL', |
| 59 |
'https://accounts.synnefo.local/feedback/')
|
|
| 59 |
'https://accounts.example.synnefo.org/feedback/')
|
|
| 60 | 60 |
USER_LOGIN_URL = getattr(settings, 'PITHOS_USER_LOGIN_URL', |
| 61 |
'https://accounts.synnefo.local/login/')
|
|
| 61 |
'https://accounts.example.synnefo.org/login/')
|
|
| 62 | 62 |
|
| 63 | 63 |
# Set the quota holder component URI |
| 64 | 64 |
USE_QUOTAHOLDER = getattr(settings, 'PITHOS_USE_QUOTAHOLDER', False) |
| b/snf-pithos-tools/README | ||
|---|---|---|
| 25 | 25 |
====================== ========================================================= |
| 26 | 26 |
PITHOS_USER Login user |
| 27 | 27 |
PITHOS_TOKEN Login token |
| 28 |
PITHOS_URL Pithos server (default: \https://pithos.okeanos.grnet.gr/v1)
|
|
| 28 |
PITHOS_URL Pithos server (default: \https://pithos.example.synnefo.org/v1)
|
|
| 29 | 29 |
PITHOS_SYNC_CONTAINER Container to sync with (default: pithos) |
| 30 | 30 |
====================== ========================================================= |
| b/snf-pithos-tools/pithos/tools/lib/util.py | ||
|---|---|---|
| 33 | 33 |
|
| 34 | 34 |
import os |
| 35 | 35 |
|
| 36 |
DEFAULT_URL = 'https://pithos.okeanos.grnet.gr/v1'
|
|
| 36 |
DEFAULT_URL = 'https://pithos.example.synnefo.org/v1'
|
|
| 37 | 37 |
DEFAULT_USER = 'test' |
| 38 | 38 |
DEFAULT_TOKEN = '0000' |
| 39 | 39 |
|
Also available in: Unified diff