Commit 3abceae1 authored by Christos Stavrakakis's avatar Christos Stavrakakis

pithos: remove redundant settings

Remove 'PITHOS_USER_CATALOG_URL' and 'PITHOS_USER_FEEDBACK_URL' and
'PITHOS_USER_LOGIN_URL' settings, since all of them can be derived from
'ASTAKOS_URL' setting.
parent 54b52bfc
......@@ -30,6 +30,8 @@ Pithos
------
* Remove PITHOS_AUTHENTICATION_USERS setting, which was used to override
astakos users.
* Remove 'PITHOS_USER_CATALOG_URL', 'PITHOS_USER_FEEDBACK_URL' and
'PITHOS_USER_LOGIN_URL' settings.
Tools
-----
......
......@@ -854,9 +854,6 @@ this options:
PITHOS_SERVICE_TOKEN = 'pithos_service_token22w=='
PITHOS_USER_CATALOG_URL = 'https://node1.example.com/user_catalogs'
PITHOS_USER_FEEDBACK_URL = 'https://node1.example.com/feedback'
PITHOS_USER_LOGIN_URL = 'https://node1.example.com/login'
PITHOS_QUOTAHOLDER_URL = 'https://node1.example.com/quotaholder/v'
PITHOS_QUOTAHOLDER_TOKEN = 'aExampleTokenJbFm12w'
......
......@@ -58,9 +58,6 @@ In `/etc/synnefo/pithos.conf` add:
.. code-block:: console
ASTAKOS_URL = 'https:/accounts.example.com/'
PITHOS_USER_CATALOG_URL = 'https://accounts.example.com/user_catalogs'
PITHOS_USER_FEEDBACK_URL = 'https://accounts.example.com/feedback'
PITHOS_USER_LOGIN_URL = 'https://accounts.example.com/login'
PITHOS_BACKEND_DB_CONNECTION = 'postgresql://synnefo:example_passw0rd@db.example.com:5432/snf_pithos'
PITHOS_BACKEND_BLOCK_PATH = '/srv/pithos/data'
......
......@@ -52,9 +52,6 @@ PITHOS_RADOS_POOL_BLOCKS None
PITHOS_RADOS_POOL_MAPS None RADOS pool to be used for maps storage
PITHOS_TRANSLATE_UUIDS False Enables a ui compatibility layer for the introduction of UUIDs in identity management.
PITHOS_PROXY_USER_SERVICES True Whether to proxy user feedback and catalog services
PITHOS_USER_CATALOG_URL \https://<astakos.host>/user_catalogs/ Astakos User Catalog URL
PITHOS_USER_FEEDBACK_URL \https://<astakos.host>/feedback/ Astakos User Feedback URL
PITHOS_USER_LOGIN_URL \https://<astakos.host>/login/ Astakos User Login URL
PITHOS_USE_QUOTAHOLDER True Enable quotaholder
PITHOS_QUOTAHOLDER_URL '' Quotaholder URL
PITHOS_QUOTAHOLDER_TOKEN '' Quotaholder token
......
......@@ -41,9 +41,6 @@
# 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://accounts.example.synnefo.org/user_catalogs/'
#PITHOS_USER_FEEDBACK_URL = 'https://accounts.example.synnefo.org/feedback/'
#PITHOS_USER_LOGIN_URL = 'https://accounts.example.synnefo.org/login/'
# Enable and configure quotaholder
#PITHOS_USE_QUOTAHOLDER = False
......
#coding=utf8
from django.conf import settings
from urlparse import urljoin
ASTAKOS_URL = getattr(settings, "ASTAKOS_URL",
"https://accounts.example.synnefo.org/")
......@@ -57,12 +58,9 @@ TRANSLATE_UUIDS = getattr(settings, 'PITHOS_TRANSLATE_UUIDS', False)
# the requests on its own.
PROXY_USER_SERVICES = getattr(settings, 'PITHOS_PROXY_USER_SERVICES', True)
USER_CATALOG_URL = getattr(settings, 'PITHOS_USER_CATALOG_URL',
'https://accounts.example.synnefo.org/user_catalogs/')
USER_FEEDBACK_URL = getattr(settings, 'PITHOS_USER_FEEDBACK_URL',
'https://accounts.example.synnefo.org/feedback/')
USER_LOGIN_URL = getattr(settings, 'PITHOS_USER_LOGIN_URL',
'https://accounts.example.synnefo.org/login/')
USER_CATALOG_URL = urljoin(ASTAKOS_URL, "user_catalogs")
USER_FEEDBACK_URL = urljoin(ASTAKOS_URL, "feedback")
USER_LOGIN_URL = urljoin(ASTAKOS_URL, "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