update localsettings + some cleanup

diff --git a/manage.py b/manage.py
index dea56f5..29702c0 100755 (executable)
--- a/manage.py
+++ b/manage.py
@@ -10,7 +10,7 @@ sys.path = [
 ] + sys.path
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "redakcja.localsettings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "redakcja.settings")
 
     from django.core.management import execute_from_command_line
 

diff --git a/redakcja/localsettings.sample b/redakcja/localsettings.sample
index d825589..f513c8a 100644 (file)
--- a/redakcja/localsettings.sample
+++ b/redakcja/localsettings.sample
@@ -1,4 +1,5 @@
-# 
+# -*- coding: utf-8 -*-
+#
 #  localsettings template for Platforma
 #
 #  Duplicate this file as localsettings.py and change it to your liking.
@@ -8,16 +9,23 @@
 #  or localsettings.sample instead.
 #
 
-# THIS IS REQUIRED
-from redakcja.settings import *
+import os.path
+
+from redakcja.settings.common import PROJECT_ROOT
+from redakcja.settings.compress import PIPELINE
 
 # Path to repository with managed documents
 CATALOGUE_REPO_PATH = '/srv/redakcja/books'
 
 LOGGING_CONFIG_FILE = "/srv/redakcja/logging.cfg.dev"
 
-STATIC_ROOT = '/srv/redakcja/static/'
-MEDIA_ROOT = '/srv/redakcja/media/'
+BASE_DIR = os.path.dirname(PROJECT_ROOT)
+
+STATIC_ROOT = os.path.join(BASE_DIR, 'var', 'static')
+MEDIA_ROOT = os.path.join(BASE_DIR, 'var', 'media')
+STATIC_URL = '/static/'
+MEDIA_URL = '/media/'
+
 
 # Subdirectory of MEDIA_ROOT containing images
 IMAGE_DIR = 'images/'
@@ -26,13 +34,19 @@ CAS_SERVER_URL = 'http://logowanie.nowoczesnapolska.org.pl/cas/'
 CAS_VERSION = '1'
 
 REDMINE_URL = 'http://redmine.nowoczesnapolska.org.pl/'
+
+
 DEBUG = True
 MAINTENANCE_MODE = False
-COMPRESS = False
+
+PIPELINE['PIPELINE_ENABLED'] = False
 
 APICLIENT_WL_CONSUMER_KEY = None
 APICLIENT_WL_CONSUMER_SECRET = None
 
-CELERY_ALWAYS_EAGER = False
+CELERY_ALWAYS_EAGER = True
+
+SECRET_KEY = 'very secret'
+ALLOWED_HOSTS = ['*']
 
-SECRET_KEY = ''
+EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'

diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py
index 52752cd..cad0951 100644 (file)
--- a/redakcja/settings/common.py
+++ b/redakcja/settings/common.py
@@ -9,7 +9,7 @@ DEBUG = False
 MAINTENANCE_MODE = False
 
 ADMINS = (
-    (u'Radek Czajka', 'radoslaw.czajka@nowoczesnapolska.org.pl'),
+    (u'Jan Szejko', 'jan.szejko@nowoczesnapolska.org.pl'),
 )
 
 MANAGERS = ADMINS

diff --git a/redakcja/wsgi.py b/redakcja/wsgi.py
index 10f0901..b00ec5c 100755 (executable)
--- a/redakcja/wsgi.py
+++ b/redakcja/wsgi.py
@@ -17,7 +17,7 @@ sys.path = [
 ] + sys.path
 
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "redakcja.localsettings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "redakcja.settings")
 
 # This application object is used by the development server
 # as well as any WSGI server configured to use this file.