Commit 49501ec6 authored by Giorgos Korfiatis's avatar Giorgos Korfiatis
Browse files

Remove deprecated quotaholder settings

Remove remaining astakos and pithos-related references of quotaholder
from settings and docs.
parent a0b9f620
......@@ -39,6 +39,9 @@ astakos.
Project and ProjectMembership, previously needed for syncing; removed
state PROJECT_DEACTIVATED from ProjectMembership.
* Removed settings ASTAKOS_QUOTAHOLDER_URL, ASTAKOS_QUOTAHOLDER_TOKEN,
and ASTAKOS_QUOTAHOLDER_POOLSIZE.
* Service and resource specification and handling:
* Specified a format for defining resources a service exposes. Migrated
......
......@@ -631,20 +631,6 @@ method, read the relative :ref:`section <shibboleth-auth>`.
MIDDLEWARE_CLASSES.remove('django.middleware.csrf.CsrfViewMiddleware')
TEMPLATE_CONTEXT_PROCESSORS.remove('django.core.context_processors.csrf')
Since version 0.13 you need to configure some basic settings for the new *Quota*
feature.
Specifically:
Edit ``/etc/synnefo/20-snf-astakos-app-settings.conf``:
.. code-block:: console
QUOTAHOLDER_URL = 'https://node1.example.com/quotaholder/v'
QUOTAHOLDER_TOKEN = 'aExampleTokenJbFm12w'
ASTAKOS_QUOTAHOLDER_TOKEN = 'aExampleTokenJbFm12w'
ASTAKOS_QUOTAHOLDER_URL = 'https://node1.example.com/quotaholder/v'
Enable Pooling
--------------
......@@ -855,10 +841,6 @@ this options:
PITHOS_SERVICE_TOKEN = 'pithos_service_token22w=='
PITHOS_QUOTAHOLDER_URL = 'https://node1.example.com/quotaholder/v'
PITHOS_QUOTAHOLDER_TOKEN = 'aExampleTokenJbFm12w'
PITHOS_USE_QUOTAHOLDER = True
# Set to False if astakos & pithos are on the same host
#PITHOS_PROXY_USER_SERVICES = True
......
......@@ -70,9 +70,6 @@ In `/etc/synnefo/astakos.conf` add:
ASTAKOS_EMAIL_CHANGE_EMAIL_SUBJECT = 'Email change on %s' % ASTAKOS_SITENAME
ASTAKOS_PASSWORD_RESET_EMAIL_SUBJECT = 'Password reset on %s' % ASTAKOS_SITENAME
ASTAKOS_QUOTAHOLDER_TOKEN = '1234'
ASTAKOS_QUOTAHOLDER_URL = 'https://qh.example.com/quotaholder/v'
EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend'
ASTAKOS_SERVICES = {
'cyclades': {
......
......@@ -65,12 +65,8 @@ In `/etc/synnefo/pithos.conf` add:
PITHOS_UPDATE_MD5 = False
PITHOS_SERVICE_TOKEN = 'XXXXXXXXXXX'
PITHOS_QUOTAHOLDER_TOKEN = '1234'
PITHOS_QUOTAHOLDER_URL = 'https://qh.example.com/quotaholder/v'
# Set False if astakos & pithos are on the same node
PITHOS_PROXY_USER_SERVICES = True
PITHOS_USE_QUOTAHOLDER = True
Install pithos web UI with:
......
......@@ -160,11 +160,6 @@ PROJECT_MEMBERSHIP_LEAVE_REQUEST_SUBJECT = getattr(
settings, 'ASTAKOS_PROJECT_MEMBERSHIP_LEAVE_REQUEST_SUBJECT',
'%s testing project membership leave request (%%(name)s)' % SITENAME)
# Set the quota holder component URI
QUOTAHOLDER_URL = getattr(settings, 'ASTAKOS_QUOTAHOLDER_URL', '')
QUOTAHOLDER_TOKEN = getattr(settings, 'ASTAKOS_QUOTAHOLDER_TOKEN', '')
QUOTAHOLDER_POOLSIZE = getattr(settings, 'ASTAKOS_QUOTAHOLDER_POOLSIZE', 50)
# Set how many objects should be displayed per page
PAGINATE_BY = getattr(settings, 'ASTAKOS_PAGINATE_BY', 8)
......
......@@ -18,13 +18,7 @@ DATABASES = {
HOST = 'http://127.0.0.1'
QUOTAHOLDER_URL = HOST + ':8008/quotaholder/v'
QUOTAHOLDER_TOKEN = 'token'
ASTAKOS_URL = HOST + ':8000/astakos/api/authenticate'
ASTAKOS_BASEURL = HOST + ':8000/'
ASTAKOS_IM_MODULES = ['local']
ASTAKOS_RECAPTCHA_ENABLED = False
ASTAKOS_QUOTAHOLDER_URL = HOST + ':8008/quotaholder/v'
ASTAKOS_QUOTAHOLDER_TOKEN = 'token'
......@@ -102,21 +102,6 @@
#ASTAKOS_PROJECT_SUSPENSION_SUBJECT = '%s project suspended (%%(name)s)' % SITENAME
#ASTAKOS_PROJECT_MEMBERSHIP_CHANGE_SUBJECT = '%s project membership changed (%%(name)s)' % SITENAME
# Set the quotaholder component URI and token
#ASTAKOS_QUOTAHOLDER_URL = ''
#ASTAKOS_QUOTAHOLDER_TOKEN = ''
#
# Tune the size of the quotaholder http client connection pool.
# This limits the number of concurrent requests to quotaholder.
# If quotaholder is installed in the same system as astakos,
# This must be at most half the synnefo_poolsize for the django database
#ASTAKOS_QUOTAHOLDER_POOLSIZE = 50
# Setup quotaholder URL and token when snf-quotaholder-app is installed
# in the same server as astakos (recommended)
#QUOTAHOLDER_URL = ''
#QUOTAHOLDER_TOKEN = ''
# Set the cloud service properties
#ASTAKOS_SERVICES = {
# 'cyclades': {
......
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