Revision c08b1f79

b/snf-pithos-app/README
32 32
===============================  =================================================  ============================================================
33 33
PITHOS_AUTHENTICATION_URL        \https://<astakos.host>/im/authenticate/           Astakos Authentication URL
34 34
PITHOS_AUTHENTICATION_USERS      A dictionary of sample users (token to username)   Set to empty or None to disable
35
PITHOS_COOKIE_NAME               _pithos2_a                                         Cookie name to retrieve fallback token
35
PITHOS_ASTAKOS_COOKIE_NAME       _pithos2_a                                         Cookie name to retrieve fallback token
36 36
PITHOS_BACKEND_DB_MODULE         pithos.backends.lib.sqlalchemy
37 37
PITHOS_BACKEND_DB_CONNECTION     sqlite:////tmp/pithos-backend.db                   SQLAlchemy database connection string
38 38
PITHOS_BACKEND_BLOCK_MODULE      pithos.backends.lib.hashfiler
b/snf-pithos-app/conf/20-snf-pithos-app-settings.conf
1 1
#PITHOS_AUTHENTICATION_URL = 'http://<astakos.host>/im/authenticate/'
2 2

  
3
# Set local users, or a remote host. To disable local users set them to None.
4
#sample_users = {
5
    #'0000': 'test',
6
    #'0001': 'testuser2',
7
#}
8

  
9 3
#PITHOS_AUTHENTICATION_USERS = {}
10 4

  
11 5
# Cookie name to search for fallback token
......
20 14
#PITHOS_BACKEND_BLOCK_PATH = '/tmp/pithos-data/'
21 15
#PITHOS_BACKEND_BLOCK_UMASK = 0o022
22 16

  
23
# Queue for billing.
24
#
25
#PITHOS_BACKEND_QUEUE_MODULE = None
26
# Example: 'pithos.backends.lib.rabbitmq'
27
#
28
#PITHOS_BACKEND_QUEUE_HOSTS = None
29
# Example: ['ammq://guest:guest@localhost:5672/']
30
#
31
#PITHOS_BACKEND_QUEUE_EXHANGE = 'pithos'
32

  
33 17
# Default setting for new accounts.
34 18
#PITHOS_BACKEND_QUOTA = 50 * 1024 * 1024 * 1024
35 19
#PITHOS_BACKEND_VERSIONING = 'auto'
......
56 40
# Set to False if snf astakos-app is running on the same machine, so it handles
57 41
# the requests on its own.
58 42
#PROXY_USER_SERVICES = True
59
#USER_CATALOG_URL = 'https://<astakos.host>/user_catalogs/'
43
#PITHOS_USER_CATALOG_URL = 'https://<astakos.host>/user_catalogs/'
60 44
#PITHOS_USER_FEEDBACK_URL = 'http://<astakos.host>/feedback/'
61 45
#PITHOS_USER_LOGIN_URL = 'http://<astakos.host>/login/'
62 46

  
63 47
# Enable and configure quotaholder
64
#PITHOS_USE_QUOTAHOLDER = True
65
#PITHOS_QUOTAHOLDER_UR = ''
48
#PITHOS_USE_QUOTAHOLDER = False
49
#PITHOS_QUOTAHOLDER_URL = ''
66 50
#PITHOS_QUOTAHOLDER_TOKEN = ''
b/snf-pithos-app/pithos/api/settings.py
1 1
#coding=utf8
2 2
from django.conf import settings
3 3

  
4
# Set local users, or a remote host. To disable local users set them to None.
5
sample_users = {
6
    '0000': 'test',
7
    '0001': 'verigak',
8
    '0002': 'chazapis',
9
    '0003': 'gtsouk',
10
    '0004': 'papagian',
11
    '0005': 'louridas',
12
    '0006': 'chstath',
13
    '0007': 'pkanavos',
14
    '0008': 'mvasilak',
15
    '0009': 'διογένης'
16
}
17

  
18 4
AUTHENTICATION_URL = getattr(settings, 'PITHOS_AUTHENTICATION_URL',
19 5
                             'https://<astakos.host>/im/authenticate/')
20 6
AUTHENTICATION_USERS = getattr(settings, 'PITHOS_AUTHENTICATION_USERS', {})
21 7

  
22
COOKIE_NAME = getattr(settings, 'ASTAKOS_COOKIE_NAME', '_pithos2_a')
8
COOKIE_NAME = getattr(settings, 'PITHOS_ASTAKOS_COOKIE_NAME', '_pithos2_a')
23 9

  
24 10
# SQLAlchemy (choose SQLite/MySQL/PostgreSQL).
25 11
BACKEND_DB_MODULE = getattr(
......
75 61
                         'https://<astakos.host>/login/')
76 62

  
77 63
# Set the quota holder component URI
78
USE_QUOTAHOLDER = getattr(settings, 'PITHOS_USE_QUOTAHOLDER', True)
64
USE_QUOTAHOLDER = getattr(settings, 'PITHOS_USE_QUOTAHOLDER', False)
79 65
QUOTAHOLDER_URL = getattr(settings, 'PITHOS_QUOTAHOLDER_URL', '')
80 66
QUOTAHOLDER_TOKEN = getattr(settings, 'PITHOS_QUOTAHOLDER_TOKEN', '')

Also available in: Unified diff