summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérôme Schneider <jschneider@entrouvert.com>2015-02-17 17:21:03 (GMT)
committerJérôme Schneider <jschneider@entrouvert.com>2015-02-17 17:21:03 (GMT)
commit4bb518ff98aee238ab9fe2492eac59fb6532b579 (patch)
tree00766c096f0bf96b162dc72b30a87bb74b9ded49
parent3faac4f2b08ab46ec05289c8c8f8788504c5f08a (diff)
downloadcombo-wip/debian.zip
combo-wip/debian.tar.gz
combo-wip/debian.tar.bz2
debian/multitenant/debian_config.py: fixes, add mellon and addwip/debian
hobo.agent.common
-rw-r--r--debian/multitenant/debian_config.py18
1 files changed, 11 insertions, 7 deletions
diff --git a/debian/multitenant/debian_config.py b/debian/multitenant/debian_config.py
index deda07b..1ac0242 100644
--- a/debian/multitenant/debian_config.py
+++ b/debian/multitenant/debian_config.py
@@ -2,12 +2,14 @@
import os
+from django.conf import global_settings
+
ETC_DIR = '/etc/combo-multitenant'
VAR_DIR = '/var/lib/combo-multitenant'
STATIC_ROOT = os.path.join(VAR_DIR, 'collected-static')
-STATICFILES_DIRS = (os.path.join(VAR_DIR, 'static'),) + STATICFILES_DIRS
-TEMPLATE_DIRS = (os.path.join(VAR_DIR, 'templates'),) + TEMPLATE_DIRS
+STATICFILES_DIRS = (os.path.join(VAR_DIR, 'static'),)
+TEMPLATE_DIRS = (os.path.join(VAR_DIR, 'templates'),)
LOCALE_PATHS = (os.path.join(VAR_DIR, 'locale'),) + LOCALE_PATHS
DATABASES = {
@@ -17,6 +19,10 @@ DATABASES = {
}
}
+DATABASE_ROUTERS = (
+ 'tenant_schemas.routers.TenantSyncRouter',
+)
+
TENANT_BASE = os.path.join(VAR_DIR, 'tenants')
TENANT_MODEL = 'multitenant.Tenant'
TENANT_TEMPLATE_DIRS = (TENANT_BASE,)
@@ -31,13 +37,11 @@ SHARED_APPS = (
'django.contrib.admin',
)
-TENANT_APPS = INSTALLED_APPS
+INSTALLED_APPS += ('mellon',)
-INSTALLED_APPS = ('hobo.multitenant',) + INSTALLED_APPS
+TENANT_APPS = INSTALLED_APPS
-DATABASE_ROUTERS = (
- 'tenant_schemas.routers.TenantSyncRouter',
-)
+INSTALLED_APPS = ('hobo.multitenant', 'hobo.agent.common') + INSTALLED_APPS
TEMPLATE_LOADERS = ('hobo.multitenant.template_loader.FilesystemLoader',) + global_settings.TEMPLATE_LOADERS