From 62b05e9c226f0a65a1df6f83dfae85b028cff0f8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C5=81ukasz=20Rekucki?= <lrekucki@gmail.com>
Date: Tue, 8 Jun 2010 13:59:48 +0200
Subject: [PATCH] Seettings cleanup.

---
 .../localsettings.sample                      | 15 +++++++--
 redakcja/manage.py                            | 32 ++++++++++---------
 redakcja/settings/__init__.py                 |  7 +---
 redakcja/settings/common.py                   | 19 +++--------
 .../compress.py}                              |  0
 5 files changed, 34 insertions(+), 39 deletions(-)
 rename localsettings.sample => redakcja/localsettings.sample (53%)
 rename redakcja/{compress_settings.py => settings/compress.py} (100%)

diff --git a/localsettings.sample b/redakcja/localsettings.sample
similarity index 53%
rename from localsettings.sample
rename to redakcja/localsettings.sample
index c174cf92..6f99ddd3 100644
--- a/localsettings.sample
+++ b/redakcja/localsettings.sample
@@ -8,11 +8,20 @@
 #  or localsettings.sample instead.
 #
 
+# THIS IS REQUIRED
+from redakcja.settings import *
+
 # Path to repository with managed documents
-REPOSITORY_PATH = '/home/user/repository'
+WIKI_REPOSITORY_PATH = '/home/lrekucki/projekty/fundacja/books'
+
+LOGGING_CONFIG_FILE = "/home/lrekucki/projekty/fundacja/redakcja/logging.cfg.dev"
+
+STATIC_ROOT = '/home/lrekucki/projekty/fundacja/redakcja/redakcja/static/'
+MEDIA_ROOT = '/home/lrekucki/projekty/fundacja/media/'
 
 # Subdirectory of STATIC_ROOT containing images
 IMAGE_DIR = 'images'
 
-CAS_SERVICE_URL = 'http://stigma.nowoczesnapolska.org.pl/cas/'
-
+CAS_SERVER_URL = 'http://logowanie.wolnelektury.pl/cas/'
+DEBUG = True
+COMPRESS = False
\ No newline at end of file
diff --git a/redakcja/manage.py b/redakcja/manage.py
index 4c118422..28b571d4 100755
--- a/redakcja/manage.py
+++ b/redakcja/manage.py
@@ -1,23 +1,25 @@
 #!/usr/bin/env python
 from django.core.management import execute_manager
-try:
-    import settings  # Assumed to be in the same directory.
-except ImportError:
-    import sys
-    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
-    sys.exit(1)
 
-if __name__ == "__main__":
-    # Append lib and apps directories to PYTHONPATH
-    import os
-    import sys
+import logging
+import sys
+import os
+
+logging.basicConfig(level=logging.DEBUG, stream=sys.stderr)
 
-    PROJECT_ROOT = os.path.realpath(os.path.dirname(__file__))
-    sys.path += [os.path.realpath(os.path.join(*x)) for x in (
+PROJECT_ROOT = os.path.realpath(os.path.dirname(__file__))
+sys.path += [os.path.realpath(os.path.join(*x)) for x in (
+        (PROJECT_ROOT, '..'),
         (PROJECT_ROOT, '..', 'apps'),
         (PROJECT_ROOT, '..', 'lib')
-    )]
-
+)]
 
+try:
+    import localsettings  # Assumed to be in the same directory.
+except ImportError:
+    logging.exception("Failed to import settings")
+    import sys
+    sys.exit(1)
 
-    execute_manager(settings)
+if __name__ == "__main__":
+    execute_manager(localsettings)
diff --git a/redakcja/settings/__init__.py b/redakcja/settings/__init__.py
index d3f9d7c5..6f1c094e 100644
--- a/redakcja/settings/__init__.py
+++ b/redakcja/settings/__init__.py
@@ -1,5 +1,5 @@
 from __future__ import absolute_import
-from .common import *
+from redakcja.settings.common import *
 
 DATABASE_ENGINE = 'sqlite3'    # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
 DATABASE_NAME = PROJECT_ROOT + '/dev.sqlite'             # Or path to database file if using sqlite3.
@@ -8,11 +8,6 @@ DATABASE_PASSWORD = ''         # Not used with sqlite3.
 DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
 DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
 
-try:
-    from localsettings import *
-except ImportError:
-    pass
-
 try:
     LOGGING_CONFIG_FILE
 except NameError:
diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py
index 377a4d50..9689f729 100644
--- a/redakcja/settings/common.py
+++ b/redakcja/settings/common.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import
 import os.path
 
 PROJECT_ROOT = os.path.realpath(os.path.dirname(os.path.dirname(__file__)))
@@ -102,8 +103,6 @@ FIREPYTHON_LOGGER_NAME = "fnp"
 # CAS_SERVER_URL = "http://cas.fnp.pl/
 CAS_LOGOUT_COMPLETELY = True
 
-from compress_settings import *
-
 INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -139,17 +138,7 @@ WL_API_CONFIG = {
     "AUTH_PASSWD": "platforma",
 }
 
-# Import localsettings file, which may override settings defined here
-
-from localsettings import *
-
 try:
-    import logging
-    if os.path.isfile(LOGGING_CONFIG_FILE):
-        import logging.config
-        logging.config.fileConfig(LOGGING_CONFIG_FILE)
-    else:
-        import sys
-        logging.basicConfig(stream=sys.stderr)
-except ImportError as exc:
-    raise
+    from redakcja.settings.compress import *
+except ImportError:
+    pass
diff --git a/redakcja/compress_settings.py b/redakcja/settings/compress.py
similarity index 100%
rename from redakcja/compress_settings.py
rename to redakcja/settings/compress.py
-- 
2.20.1