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

cleanup astakos settings

parent 56760959
......@@ -4,8 +4,6 @@ from django.conf import settings
# to be this many hours after their creation time.
AUTH_TOKEN_DURATION = getattr(settings, 'ASTAKOS_AUTH_TOKEN_DURATION', 30 * 24)
DEFAULT_USER_LEVEL = getattr(settings, 'ASTAKOS_DEFAULT_USER_LEVEL', 4)
INVITATIONS_PER_LEVEL = getattr(settings, 'ASTAKOS_INVITATIONS_PER_LEVEL', {
......@@ -18,7 +16,7 @@ INVITATIONS_PER_LEVEL = getattr(settings, 'ASTAKOS_INVITATIONS_PER_LEVEL', {
# Address to use for outgoing emails
DEFAULT_CONTACT_EMAIL = getattr(
settings, 'ASTAKOS_DEFAULT_CONTACT_EMAIL', 'support@cloud.grnet.gr')
settings, 'ASTAKOS_DEFAULT_CONTACT_EMAIL', 'support@synnefo.local')
SERVER_EMAIL = getattr(settings, 'SERVER_EMAIL', None)
ADMINS = getattr(settings, 'ADMINS', None)
......@@ -43,10 +41,10 @@ IM_STATIC_URL = getattr(settings, 'ASTAKOS_IM_STATIC_URL', '/static/im/')
MODERATION_ENABLED = getattr(settings, 'ASTAKOS_MODERATION_ENABLED', True)
# Set baseurl
BASEURL = getattr(settings, 'ASTAKOS_BASEURL', 'http://pithos.dev.grnet.gr')
BASEURL = getattr(settings, 'ASTAKOS_BASEURL', 'https://accounts.synnefo.local')
# Set service name
SITENAME = getattr(settings, 'ASTAKOS_SITENAME', 'GRNET Cloud')
SITENAME = getattr(settings, 'ASTAKOS_SITENAME', 'Synnefo Cloud')
# Set recaptcha keys
RECAPTCHA_PUBLIC_KEY = getattr(settings, 'ASTAKOS_RECAPTCHA_PUBLIC_KEY', '')
......@@ -165,44 +163,51 @@ QUOTAHOLDER_TOKEN = getattr(settings, 'ASTAKOS_QUOTAHOLDER_TOKEN', '')
# Set the cloud service properties
SERVICES = getattr(settings, 'ASTAKOS_SERVICES', {
'cyclades': {
'url': 'https://node1.example.com/ui/',
# # Specifying the key 'url' will overwrite it.
# # Use this to (re)set service URL.
# 'url': 'https://cyclades.synnefo.local/ui/',
# # order services in listings, cloudbar, etc.
# 'order' : 1
'resources': [{
'name':'disk',
'group':'compute',
'uplimit':30*1024*1024*1024,
'unit':'bytes',
'name': 'disk',
'group': 'compute',
'uplimit': 30*1024*1024*1024,
'unit': 'bytes',
'desc': 'Virtual machine disk size'
},{
'name':'cpu',
'group':'compute',
'uplimit':6,
}, {
'name': 'cpu',
'group': 'compute',
'uplimit': 6,
'desc': 'Number of virtual machine processors'
},{
'name':'ram',
'group':'compute',
'uplimit':6*1024*1024*1024,
'unit':'bytes',
}, {
'name': 'ram',
'group': 'compute',
'uplimit': 6*1024*1024*1024,
'unit': 'bytes',
'desc': 'Virtual machines'
},{
'name':'vm',
'group':'compute',
'uplimit':2,
}, {
'name': 'vm',
'group': 'compute',
'uplimit': 2,
'desc': 'Number of virtual machines'
},{
'name':'network.private',
'group':'network',
'uplimit':1,
}, {
'name': 'network.private',
'group': 'network',
'uplimit': 1,
'desc': 'Private networks'
}
]
},
'pithos+': {
'url': 'https://node2.example.com/ui/',
# # Use this to (re)set service URL.
# 'url': 'https://pithos.synnefo.local/ui/',
# # order services in listings, cloudbar, etc.
# 'order' : 2
'resources':[{
'name':'diskspace',
'group':'storage',
'uplimit':5 * 1024 * 1024 * 1024,
'unit':'bytes',
'name': 'diskspace',
'group': 'storage',
'uplimit': 5*1024*1024*1024,
'unit': 'bytes',
'desc': 'Pithos account diskspace'
}]
}
......
......@@ -13,7 +13,7 @@
#}
# Address to use for outgoing emails
#ASTAKOS_DEFAULT_CONTACT_EMAIL = 'support@cloud.grnet.gr'
#ASTAKOS_DEFAULT_CONTACT_EMAIL = 'support@synnefo.local'
#SERVER_EMAIL = None
#ADMINS = None
......@@ -39,10 +39,10 @@
#ASTAKOS_MODERATION_ENABLED = True
# Set baseurl
#ASTAKOS_BASEURL = 'http://pithos.dev.grnet.gr'
#ASTAKOS_BASEURL = 'https://accounts.synnefo.local'
# Set service name
#ASTAKOS_SITENAME = 'GRNET Cloud'
#ASTAKOS_SITENAME = 'Synnefo Cloud'
# Set recaptcha keys
# http://www.google.com/recaptcha/whyrecaptcha
......@@ -52,13 +52,6 @@
#ASTAKOS_RECAPTCHA_USE_SSL = True
#ASTAKOS_RECAPTCHA_ENABLED = False
# set AstakosUser fields to propagate in the billing system
#ASTAKOS_BILLING_FIELDS = ['is_active']
# Queue for billing.
#'rabbitmq://guest:guest@localhost:5672/astakos'
#ASTAKOS_QUEUE_CONNECTION = None
# Set where the user should be redirected after logout
#ASTAKOS_LOGOUT_NEXT = ''
......@@ -122,52 +115,56 @@
# Set the cloud service properties
# ASTAKOS_SERVICES = {
# 'cyclades': {
## 'url': 'https://node1.example.com/ui/',
## # Specifying the key 'url' will overwrite it.
## # Use this to (re)set service URL.
## 'url': 'https://cyclades.synnefo.local/ui/',
## # order services in listings, cloudbar, etc.
## 'order' : 1
# 'resources': [{
# 'name':'disk',
# 'group':'compute',
# 'uplimit':30*1024*1024*1024,
# 'unit':'bytes',
# 'name': 'disk',
# 'group': 'compute',
# 'uplimit': 30*1024*1024*1024,
# 'unit': 'bytes',
# 'desc': 'Virtual machine disk size'
# },{
# 'name':'cpu',
# 'group':'compute',
# 'uplimit':6,
# }, {
# 'name': 'cpu',
# 'group': 'compute',
# 'uplimit': 6,
# 'desc': 'Number of virtual machine processors'
# },{
# 'name':'ram',
# 'group':'compute',
# 'uplimit':6*1024*1024*1024,
# 'unit':'bytes',
# }, {
# 'name': 'ram',
# 'group': 'compute',
# 'uplimit': 6*1024*1024*1024,
# 'unit': 'bytes',
# 'desc': 'Virtual machines'
# },{
# 'name':'vm',
# 'group':'compute',
# 'uplimit':2,
# }, {
# 'name': 'vm',
# 'group': 'compute',
# 'uplimit': 2,
# 'desc': 'Number of virtual machines'
# },{
# 'name':'network.private',
# 'group':'network',
# 'uplimit':1,
# }, {
# 'name': 'network.private',
# 'group': 'network',
# 'uplimit': 1,
# 'desc': 'Private networks'
# }
# ]
# },
# 'pithos+': {
## 'url': 'https://node2.example.com/ui/',
## # Use this to (re)set service URL.
## 'url': 'https://pithos.synnefo.local/ui/',
## # order services in listings, cloudbar, etc.
## 'order' : 2
# 'resources':[{
# 'name':'diskspace',
# 'group':'storage',
# 'uplimit':5 * 1024 * 1024 * 1024,
# 'unit':'bytes',
# 'name': 'diskspace',
# 'group': 'storage',
# 'uplimit': 5*1024*1024*1024,
# 'unit': 'bytes',
# 'desc': 'Pithos account diskspace'
# }]
# }
#}
# Set the billing URI
#ASTAKOS_AQUARIUM_URL = ''
# Set how many objects should be displayed per page
#ASTAKOS_PAGINATE_BY = 10
# Set how many objects should be displayed per page in show all groups page
......@@ -274,18 +271,14 @@
#ASTAKOS_ACTIVATION_REDIRECT_URL = "/im/landing"
# If true, this enables a ui compatibility layer for the introduction of UUIDs
# in identity management. WARNING: Setting to True will break your installation.
#ASTAKOS_TRANSLATE_UUIDS = False
# UUIDs of users that can approve or deny project applications from the web.
# ASTAKOS_PROJECT_ADMINS = set() # e.g. set(['01234567-89ab-cdef-0123-456789abcdef'])
#
# If true, this enables a ui compatibility layer for the introduction
# of UUIDs in identity management.
# WARNING: Setting to True will break your installation.
# ASTAKOS_TRANSLATE_UUIDS = False
# UUIDs of users that can approve or deny project applications from the web.
# ASTAKOS_PROJECT_ADMINS = set() # e.g. set(['01234567-89ab-cdef-0123-456789abcdef'])
# OAuth2 Twitter credentials.
#ASTAKOS_TWITTER_KEY = ''
#ASTAKOS_TWITTER_SECRET = ''
......
#PITHOS_AUTHENTICATION_URL = 'http://<astakos.host>/im/authenticate/'
#PITHOS_AUTHENTICATION_URL = 'https://accounts.synnefo.local/im/authenticate/'
#PITHOS_AUTHENTICATION_USERS = {}
......@@ -40,9 +40,9 @@
# Set to False if snf astakos-app is running on the same machine, so it handles
# the requests on its own.
#PROXY_USER_SERVICES = True
#PITHOS_USER_CATALOG_URL = 'https://<astakos.host>/user_catalogs/'
#PITHOS_USER_FEEDBACK_URL = 'http://<astakos.host>/feedback/'
#PITHOS_USER_LOGIN_URL = 'http://<astakos.host>/login/'
#PITHOS_USER_CATALOG_URL = 'https://accounts.synnefo.local/user_catalogs/'
#PITHOS_USER_FEEDBACK_URL = 'http://accounts.synnefo.local/feedback/'
#PITHOS_USER_LOGIN_URL = 'http://accounts.synnefo.local/login/'
# Enable and configure quotaholder
#PITHOS_USE_QUOTAHOLDER = False
......
......@@ -2,7 +2,7 @@
from django.conf import settings
AUTHENTICATION_URL = getattr(settings, 'PITHOS_AUTHENTICATION_URL',
'https://<astakos.host>/im/authenticate/')
'https://accounts.synnefo.local/im/authenticate/')
AUTHENTICATION_USERS = getattr(settings, 'PITHOS_AUTHENTICATION_USERS', {})
COOKIE_NAME = getattr(settings, 'PITHOS_ASTAKOS_COOKIE_NAME', '_pithos2_a')
......@@ -54,11 +54,11 @@ TRANSLATE_UUIDS = getattr(settings, 'PITHOS_TRANSLATE_UUIDS', False)
PROXY_USER_SERVICES = getattr(settings, 'PITHOS_PROXY_USER_SERVICES', True)
USER_CATALOG_URL = getattr(settings, 'PITHOS_USER_CATALOG_URL',
'https://<astakos.host>/user_catalogs/')
'https://accounts.synnefo.local/user_catalogs/')
USER_FEEDBACK_URL = getattr(settings, 'PITHOS_USER_FEEDBACK_URL',
'https://<astakos.host>/feedback/')
'https://accounts.synnefo.local/feedback/')
USER_LOGIN_URL = getattr(settings, 'PITHOS_USER_LOGIN_URL',
'https://<astakos.host>/login/')
'https://accounts.synnefo.local/login/')
# Set the quota holder component URI
USE_QUOTAHOLDER = getattr(settings, 'PITHOS_USE_QUOTAHOLDER', False)
......
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