From daf4fb052cdcd72f97067309a39a0b9e08afcd71 Mon Sep 17 00:00:00 2001 From: Kostas Papadimitriou Date: Wed, 18 Jan 2012 19:02:05 +0200 Subject: [PATCH] Extend snf-common default settings --- snf-pithos-app/pithos/api/settings.py | 23 +++++++++++++++++++++++ snf-pithos-app/pithos/synnefo_settings.py | 3 +++ snf-pithos-app/pithos/ui/settings.py | 2 ++ snf-pithos-app/setup.py | 1 + snf-pithos-backend/pithos/backends/settings.py | 11 +++++++++++ 5 files changed, 40 insertions(+) create mode 100644 snf-pithos-app/pithos/api/settings.py create mode 100644 snf-pithos-app/pithos/ui/settings.py create mode 100644 snf-pithos-backend/pithos/backends/settings.py diff --git a/snf-pithos-app/pithos/api/settings.py b/snf-pithos-app/pithos/api/settings.py new file mode 100644 index 0000000..57f5a78 --- /dev/null +++ b/snf-pithos-app/pithos/api/settings.py @@ -0,0 +1,23 @@ +#coding=utf8 + +USE_X_FORWARDED_HOST = False + +# Either set local users here, or a remote host. +# To disable local users set to None. +AUTHENTICATION_USERS = { + '0000': 'test', + '0001': 'verigak', + '0002': 'chazapis', + '0003': 'gtsouk', + '0004': 'papagian', + '0005': 'louridas', + '0006': 'chstath', + '0007': 'pkanavos', + '0008': 'mvasilak', + '0009': 'διογένης' +} + +# Where astakos is hosted. +AUTHENTICATION_HOST = '127.0.0.1:10000' + +TEST = False diff --git a/snf-pithos-app/pithos/synnefo_settings.py b/snf-pithos-app/pithos/synnefo_settings.py index d9b3aa4..b926700 100644 --- a/snf-pithos-app/pithos/synnefo_settings.py +++ b/snf-pithos-app/pithos/synnefo_settings.py @@ -13,3 +13,6 @@ synnefo_middlewares = [ 'pithos.middleware.SecureMiddleware', 'pithos.middleware.UserMiddleware' ] + +from pithos.api.settings import * +from pithos.ui.settings import * diff --git a/snf-pithos-app/pithos/ui/settings.py b/snf-pithos-app/pithos/ui/settings.py new file mode 100644 index 0000000..22c0a52 --- /dev/null +++ b/snf-pithos-app/pithos/ui/settings.py @@ -0,0 +1,2 @@ +FEEDBACK_FROM_EMAIL = 'Pithos ' +FEEDBACK_CONTACT_EMAIL = 'support@pithos.grnet.gr' diff --git a/snf-pithos-app/setup.py b/snf-pithos-app/setup.py index 46f0208..a890c5f 100644 --- a/snf-pithos-app/setup.py +++ b/snf-pithos-app/setup.py @@ -195,6 +195,7 @@ setup( 'console_scripts': [ ], 'synnefo': [ + 'default_settings = pithos.synnefo_settings', 'web_apps = pithos.synnefo_settings:synnefo_installed_apps', 'web_middleware = pithos.synnefo_settings:synnefo_middlewares', 'urls = pithos.synnefo_settings:synnefo_urls' diff --git a/snf-pithos-backend/pithos/backends/settings.py b/snf-pithos-backend/pithos/backends/settings.py new file mode 100644 index 0000000..72459d2 --- /dev/null +++ b/snf-pithos-backend/pithos/backends/settings.py @@ -0,0 +1,11 @@ +# SQLAlchemy (choose SQLite/MySQL/PostgreSQL). +BACKEND_DB_MODULE = 'pithos.backends.lib.sqlalchemy' +BACKEND_DB_CONNECTION = 'sqlite:///' + join(PROJECT_PATH, 'backend.db') + +# Block storage. +BACKEND_BLOCK_MODULE = 'pithos.backends.lib.hashfiler' +BACKEND_BLOCK_PATH = join(PROJECT_PATH, 'data/') + +# Default setting for new accounts. +BACKEND_QUOTA = 50 * 1024 * 1024 * 1024 +BACKEND_VERSIONING = 'auto' -- 1.7.10.4