Commit 0f3d4d67 authored by Georgios D. Tsoukalas's avatar Georgios D. Tsoukalas
Browse files

Rename synnefo.local -> example.synnefo.org

As determined by a spontaneous committee, based on

- .local is used

- 'example' strongly hints to configuration action

- synnefo.org is under control.
parent f515c50c
...@@ -244,21 +244,21 @@ On the Astakos host, edit ``/etc/synnefo/20-snf-astakos-app-settings.conf``: ...@@ -244,21 +244,21 @@ On the Astakos host, edit ``/etc/synnefo/20-snf-astakos-app-settings.conf``:
QUOTAHOLDER_TOKEN = 'aExampleTokenJbFm12w' QUOTAHOLDER_TOKEN = 'aExampleTokenJbFm12w'
ASTAKOS_QUOTAHOLDER_TOKEN = 'aExampleTokenJbFm12w' ASTAKOS_QUOTAHOLDER_TOKEN = 'aExampleTokenJbFm12w'
ASTAKOS_QUOTAHOLDER_URL = 'https://accounts.synnefo.org/quotaholder/v' ASTAKOS_QUOTAHOLDER_URL = 'https://accounts.example.synnefo.org/quotaholder/v'
On the Cyclades host, edit ``/etc/synnefo/20-snf-cyclades-app-quotas.conf``: On the Cyclades host, edit ``/etc/synnefo/20-snf-cyclades-app-quotas.conf``:
:: ::
CYCLADES_USE_QUOTAHOLDER = True CYCLADES_USE_QUOTAHOLDER = True
CYCLADES_QUOTAHOLDER_URL = 'https://accounts.synnefo.org/quotaholder/v' CYCLADES_QUOTAHOLDER_URL = 'https://accounts.example.synnefo.org/quotaholder/v'
CYCLADES_QUOTAHOLDER_TOKEN = 'aExampleTokenJbFm12w' CYCLADES_QUOTAHOLDER_TOKEN = 'aExampleTokenJbFm12w'
On the Pithos host, edit ``/etc/synnefo/20-snf-pithos-app-settings.conf``: On the Pithos host, edit ``/etc/synnefo/20-snf-pithos-app-settings.conf``:
:: ::
PITHOS_QUOTAHOLDER_URL = 'https://accounts.synnefo.org/quotaholder/v' PITHOS_QUOTAHOLDER_URL = 'https://accounts.example.synnefo.org/quotaholder/v'
PITHOS_QUOTAHOLDER_TOKEN = 'aExampleTokenJbFm12w' PITHOS_QUOTAHOLDER_TOKEN = 'aExampleTokenJbFm12w'
PITHOS_USE_QUOTAHOLDER = False # will set to True after migration PITHOS_USE_QUOTAHOLDER = False # will set to True after migration
...@@ -341,7 +341,7 @@ On the Pithos host, edit ``/etc/synnefo/20-snf-pithos-app-settings.conf``: ...@@ -341,7 +341,7 @@ On the Pithos host, edit ``/etc/synnefo/20-snf-pithos-app-settings.conf``:
Cyclades, again in ``/etc/synnefo/20-snf-cyclades-app-vmapi.conf``. Make sure Cyclades, again in ``/etc/synnefo/20-snf-cyclades-app-vmapi.conf``. Make sure
the domain is exaclty the same, so that no re-directs happen :: the domain is exaclty the same, so that no re-directs happen ::
VMAPI_BASE_URL = "https://cyclades.synnefo.org" VMAPI_BASE_URL = "https://cyclades.example.synnefo.org"
.. note:: .. note::
...@@ -361,9 +361,9 @@ On the Pithos host, edit ``/etc/synnefo/20-snf-pithos-app-settings.conf``: ...@@ -361,9 +361,9 @@ On the Pithos host, edit ``/etc/synnefo/20-snf-pithos-app-settings.conf``:
access them for uuid-displayname translations. Edit on the Pithos host access them for uuid-displayname translations. Edit on the Pithos host
``/etc/synnefo/20-snf-pithos-app-settings.conf`` :: ``/etc/synnefo/20-snf-pithos-app-settings.conf`` ::
PITHOS_USER_CATALOG_URL = https://accounts.synnefo.org/user_catalogs/ PITHOS_USER_CATALOG_URL = https://accounts.example.synnefo.org/user_catalogs/
PITHOS_USER_FEEDBACK_URL = https://accounts.synnefo.org/feedback/ PITHOS_USER_FEEDBACK_URL = https://accounts.example.synnefo.org/feedback/
PITHOS_USER_LOGIN_URL = https://accounts.synnefo.org/login/ PITHOS_USER_LOGIN_URL = https://accounts.example.synnefo.org/login/
#PITHOS_PROXY_USER_SERVICES = True # Set False if astakos & pithos are on the same host #PITHOS_PROXY_USER_SERVICES = True # Set False if astakos & pithos are on the same host
...@@ -393,7 +393,7 @@ First, set the corresponding values on the following dict in ...@@ -393,7 +393,7 @@ First, set the corresponding values on the following dict in
'cyclades': { 'cyclades': {
# # Specifying the key 'url' will overwrite it. # # Specifying the key 'url' will overwrite it.
# # Use this to (re)set service URL. # # Use this to (re)set service URL.
# 'url': 'https://cyclades.synnefo.org/ui/', # 'url': 'https://cyclades.example.synnefo.org/ui/',
# # order services in listings, cloudbar, etc. # # order services in listings, cloudbar, etc.
# 'order' : 1 # 'order' : 1
'resources': [{ 'resources': [{
...@@ -428,7 +428,7 @@ First, set the corresponding values on the following dict in ...@@ -428,7 +428,7 @@ First, set the corresponding values on the following dict in
}, },
'pithos+': { 'pithos+': {
# # Use this to (re)set service URL. # # Use this to (re)set service URL.
# 'url': 'https://pithos.synnefo.org/ui/', # 'url': 'https://pithos.example.synnefo.org/ui/',
# # order services in listings, cloudbar, etc. # # order services in listings, cloudbar, etc.
# 'order' : 2 # 'order' : 2
'resources':[{ 'resources':[{
......
...@@ -16,7 +16,7 @@ INVITATIONS_PER_LEVEL = getattr(settings, 'ASTAKOS_INVITATIONS_PER_LEVEL', { ...@@ -16,7 +16,7 @@ INVITATIONS_PER_LEVEL = getattr(settings, 'ASTAKOS_INVITATIONS_PER_LEVEL', {
# Address to use for outgoing emails # Address to use for outgoing emails
DEFAULT_CONTACT_EMAIL = getattr( DEFAULT_CONTACT_EMAIL = getattr(
settings, 'ASTAKOS_DEFAULT_CONTACT_EMAIL', 'support@synnefo.local') settings, 'ASTAKOS_DEFAULT_CONTACT_EMAIL', 'support@example.synnefo.org')
SERVER_EMAIL = getattr(settings, 'SERVER_EMAIL', None) SERVER_EMAIL = getattr(settings, 'SERVER_EMAIL', None)
ADMINS = getattr(settings, 'ADMINS', None) ADMINS = getattr(settings, 'ADMINS', None)
...@@ -41,7 +41,7 @@ IM_STATIC_URL = getattr(settings, 'ASTAKOS_IM_STATIC_URL', '/static/im/') ...@@ -41,7 +41,7 @@ IM_STATIC_URL = getattr(settings, 'ASTAKOS_IM_STATIC_URL', '/static/im/')
MODERATION_ENABLED = getattr(settings, 'ASTAKOS_MODERATION_ENABLED', True) MODERATION_ENABLED = getattr(settings, 'ASTAKOS_MODERATION_ENABLED', True)
# Set baseurl # Set baseurl
BASEURL = getattr(settings, 'ASTAKOS_BASEURL', 'https://accounts.synnefo.local') BASEURL = getattr(settings, 'ASTAKOS_BASEURL', 'https://accounts.example.synnefo.org')
# Set service name # Set service name
SITENAME = getattr(settings, 'ASTAKOS_SITENAME', 'Synnefo Cloud') SITENAME = getattr(settings, 'ASTAKOS_SITENAME', 'Synnefo Cloud')
...@@ -165,7 +165,7 @@ SERVICES = getattr(settings, 'ASTAKOS_SERVICES', { ...@@ -165,7 +165,7 @@ SERVICES = getattr(settings, 'ASTAKOS_SERVICES', {
'cyclades': { 'cyclades': {
# # Specifying the key 'url' will overwrite it. # # Specifying the key 'url' will overwrite it.
# # Use this to (re)set service URL. # # Use this to (re)set service URL.
# 'url': 'https://cyclades.synnefo.local/ui/', # 'url': 'https://cyclades.example.synnefo.org/ui/',
# # order services in listings, cloudbar, etc. # # order services in listings, cloudbar, etc.
# 'order' : 1 # 'order' : 1
'resources': [{ 'resources': [{
...@@ -200,7 +200,7 @@ SERVICES = getattr(settings, 'ASTAKOS_SERVICES', { ...@@ -200,7 +200,7 @@ SERVICES = getattr(settings, 'ASTAKOS_SERVICES', {
}, },
'pithos+': { 'pithos+': {
# # Use this to (re)set service URL. # # Use this to (re)set service URL.
# 'url': 'https://pithos.synnefo.local/ui/', # 'url': 'https://pithos.example.synnefo.org/ui/',
# # order services in listings, cloudbar, etc. # # order services in listings, cloudbar, etc.
# 'order' : 2 # 'order' : 2
'resources':[{ 'resources':[{
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#} #}
# Address to use for outgoing emails # Address to use for outgoing emails
#ASTAKOS_DEFAULT_CONTACT_EMAIL = 'support@synnefo.local' #ASTAKOS_DEFAULT_CONTACT_EMAIL = 'support@example.synnefo.org'
#SERVER_EMAIL = None #SERVER_EMAIL = None
#ADMINS = None #ADMINS = None
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#ASTAKOS_MODERATION_ENABLED = True #ASTAKOS_MODERATION_ENABLED = True
# Set baseurl # Set baseurl
#ASTAKOS_BASEURL = 'https://accounts.synnefo.local' #ASTAKOS_BASEURL = 'https://accounts.example.synnefo.org'
# Set service name # Set service name
#ASTAKOS_SITENAME = 'Synnefo Cloud' #ASTAKOS_SITENAME = 'Synnefo Cloud'
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
#ASTAKOS_GLOBAL_MESSAGES = [] #ASTAKOS_GLOBAL_MESSAGES = []
# messages to display as extra actions in account forms # messages to display as extra actions in account forms
# e.g. {'https://cms.synnefo.local/': 'Back to Synnefo'} # e.g. {'https://cms.example.synnefo.org/': 'Back to Synnefo'}
#ASTAKOS_PROFILE_EXTRA_LINKS = [] #ASTAKOS_PROFILE_EXTRA_LINKS = []
# The number of unsuccessful login requests per minute allowed for a specific email # The number of unsuccessful login requests per minute allowed for a specific email
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
# 'cyclades': { # 'cyclades': {
## # Specifying the key 'url' will overwrite it. ## # Specifying the key 'url' will overwrite it.
## # Use this to (re)set service URL. ## # Use this to (re)set service URL.
## 'url': 'https://cyclades.synnefo.local/ui/', ## 'url': 'https://cyclades.example.synnefo.org/ui/',
## # order services in listings, cloudbar, etc. ## # order services in listings, cloudbar, etc.
## 'order' : 1, ## 'order' : 1,
# 'resources': [{ # 'resources': [{
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
# }, # },
# 'pithos+': { # 'pithos+': {
## # Use this to (re)set service URL. ## # Use this to (re)set service URL.
## 'url': 'https://pithos.synnefo.local/ui/', ## 'url': 'https://pithos.example.synnefo.org/ui/',
## # order services in listings, cloudbar, etc. ## # order services in listings, cloudbar, etc.
## 'order' : 2, ## 'order' : 2,
# 'resources':[{ # 'resources':[{
......
server { server {
listen 80; listen 80;
server_name synnefo.local; server_name example.synnefo.org;
root /var/lib/synnefo/; root /var/lib/synnefo/;
......
#PITHOS_AUTHENTICATION_URL = 'https://accounts.synnefo.local/im/authenticate/' #PITHOS_AUTHENTICATION_URL = 'https://accounts.example.synnefo.org/im/authenticate/'
#PITHOS_AUTHENTICATION_USERS = {} #PITHOS_AUTHENTICATION_USERS = {}
...@@ -40,9 +40,9 @@ ...@@ -40,9 +40,9 @@
# Set to False if snf astakos-app is running on the same machine, so it handles # Set to False if snf astakos-app is running on the same machine, so it handles
# the requests on its own. # the requests on its own.
#PROXY_USER_SERVICES = True #PROXY_USER_SERVICES = True
#PITHOS_USER_CATALOG_URL = 'https://accounts.synnefo.local/user_catalogs/' #PITHOS_USER_CATALOG_URL = 'https://accounts.example.synnefo.org/user_catalogs/'
#PITHOS_USER_FEEDBACK_URL = 'http://accounts.synnefo.local/feedback/' #PITHOS_USER_FEEDBACK_URL = 'http://accounts.example.synnefo.org/feedback/'
#PITHOS_USER_LOGIN_URL = 'http://accounts.synnefo.local/login/' #PITHOS_USER_LOGIN_URL = 'http://accounts.example.synnefo.org/login/'
# Enable and configure quotaholder # Enable and configure quotaholder
#PITHOS_USE_QUOTAHOLDER = False #PITHOS_USE_QUOTAHOLDER = False
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
from django.conf import settings from django.conf import settings
AUTHENTICATION_URL = getattr(settings, 'PITHOS_AUTHENTICATION_URL', AUTHENTICATION_URL = getattr(settings, 'PITHOS_AUTHENTICATION_URL',
'https://accounts.synnefo.local/im/authenticate/') 'https://accounts.example.synnefo.org/im/authenticate/')
AUTHENTICATION_USERS = getattr(settings, 'PITHOS_AUTHENTICATION_USERS', {}) AUTHENTICATION_USERS = getattr(settings, 'PITHOS_AUTHENTICATION_USERS', {})
COOKIE_NAME = getattr(settings, 'PITHOS_ASTAKOS_COOKIE_NAME', '_pithos2_a') COOKIE_NAME = getattr(settings, 'PITHOS_ASTAKOS_COOKIE_NAME', '_pithos2_a')
...@@ -54,11 +54,11 @@ TRANSLATE_UUIDS = getattr(settings, 'PITHOS_TRANSLATE_UUIDS', False) ...@@ -54,11 +54,11 @@ TRANSLATE_UUIDS = getattr(settings, 'PITHOS_TRANSLATE_UUIDS', False)
PROXY_USER_SERVICES = getattr(settings, 'PITHOS_PROXY_USER_SERVICES', True) PROXY_USER_SERVICES = getattr(settings, 'PITHOS_PROXY_USER_SERVICES', True)
USER_CATALOG_URL = getattr(settings, 'PITHOS_USER_CATALOG_URL', USER_CATALOG_URL = getattr(settings, 'PITHOS_USER_CATALOG_URL',
'https://accounts.synnefo.local/user_catalogs/') 'https://accounts.example.synnefo.org/user_catalogs/')
USER_FEEDBACK_URL = getattr(settings, 'PITHOS_USER_FEEDBACK_URL', USER_FEEDBACK_URL = getattr(settings, 'PITHOS_USER_FEEDBACK_URL',
'https://accounts.synnefo.local/feedback/') 'https://accounts.example.synnefo.org/feedback/')
USER_LOGIN_URL = getattr(settings, 'PITHOS_USER_LOGIN_URL', USER_LOGIN_URL = getattr(settings, 'PITHOS_USER_LOGIN_URL',
'https://accounts.synnefo.local/login/') 'https://accounts.example.synnefo.org/login/')
# Set the quota holder component URI # Set the quota holder component URI
USE_QUOTAHOLDER = getattr(settings, 'PITHOS_USE_QUOTAHOLDER', False) USE_QUOTAHOLDER = getattr(settings, 'PITHOS_USE_QUOTAHOLDER', False)
......
...@@ -25,6 +25,6 @@ Connection options can be set via environmental variables: ...@@ -25,6 +25,6 @@ Connection options can be set via environmental variables:
====================== ========================================================= ====================== =========================================================
PITHOS_USER Login user PITHOS_USER Login user
PITHOS_TOKEN Login token PITHOS_TOKEN Login token
PITHOS_URL Pithos server (default: \https://pithos.okeanos.grnet.gr/v1) PITHOS_URL Pithos server (default: \https://pithos.example.synnefo.org/v1)
PITHOS_SYNC_CONTAINER Container to sync with (default: pithos) PITHOS_SYNC_CONTAINER Container to sync with (default: pithos)
====================== ========================================================= ====================== =========================================================
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
import os import os
DEFAULT_URL = 'https://pithos.okeanos.grnet.gr/v1' DEFAULT_URL = 'https://pithos.example.synnefo.org/v1'
DEFAULT_USER = 'test' DEFAULT_USER = 'test'
DEFAULT_TOKEN = '0000' DEFAULT_TOKEN = '0000'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment