From ac9e413a080b36761b7fd8de5b67dddc6cfd1256 Mon Sep 17 00:00:00 2001
From: Sergio Oliveira <sergio@tracy.com.br>
Date: Thu, 27 Aug 2015 22:38:27 -0300
Subject: [PATCH] Updated colab settings

---
 colab/colab.spec | 151 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------
 1 file changed, 91 insertions(+), 60 deletions(-)

diff --git a/colab/colab.spec b/colab/colab.spec
index ac0ac62..f742464 100644
--- a/colab/colab.spec
+++ b/colab/colab.spec
@@ -94,72 +94,103 @@ if ! id colab; then
   useradd --system --gid colab  --home-dir /usr/lib/colab --no-create-home colab
 fi
 
-if [ ! -f /etc/colab/settings.yaml ]; then
+if [ ! -f /etc/colab/settings.py ]; then
   SECRET_KEY=$(openssl rand -hex 32)
-  cat > /etc/colab/settings.yaml <<EOF
-## Set to false in production
-DEBUG: true
-TEMPLATE_DEBUG: true
-
-## System admins
-ADMINS: &admin
-  -
-    - John Foo
-    - john@example.com
-  -
-    - Mary Bar
-    - mary@example.com
-
-MANAGERS: *admin
-
-COLAB_FROM_ADDRESS: '"Colab" <noreply@example.com>'
-SERVER_EMAIL: '"Colab" <noreply@example.com>'
-
-EMAIL_HOST: localhost
-EMAIL_PORT: 25
-EMAIL_SUBJECT_PREFIX: '[colab]'
-
-SECRET_KEY: '$SECRET_KEY'
-
-SITE_URL: 'http://localhost:8001/'
-BROWSERID_AUDIENCES:
-  - http://localhost:8001
-#  - http://example.com
-#  - https://example.org
-#  - http://example.net
-
-ALLOWED_HOSTS:
-  - localhost
-#  - example.com
-#  - example.org
-#  - example.net
-
-## Disable indexing
-ROBOTS_NOINDEX: false
-
-## Disable browser id authentication
-#  BROWSERID_ENABLED: true
+  cat > /etc/colab/settings.py <<EOF
+
+# Set to false in production
+DEBUG = True
+TEMPLATE_DEBUG = True
+
+# System admins
+ADMINS = [['John Foo', 'john@example.com'], ['Mary Bar', 'mary@example.com']]
+
+MANAGERS = ADMINS
+
+COLAB_FROM_ADDRESS = '"Colab" <noreply@example.com>'
+SERVER_EMAIL = '"Colab" <noreply@example.com>'
+
+EMAIL_HOST = 'localhost'
+EMAIL_PORT = 25
+EMAIL_SUBJECT_PREFIX = '[colab]'
+
+SECRET_KEY = '$(openssl rand -hex 32)'
+
+ALLOWED_HOSTS = [
+    'localhost',
+#    'example.com',
+#    'example.org',
+#    'example.net',
+]
+
+# Database settings
+#
+#     When DEBUG is True colab will create the DB on
+#     the repository root. In case of production settings
+#     (DEBUG False) the DB settings must be set.
+#
+# DATABASES = {
+#     'default': {
+#         'ENGINE': 'django.db.backends.sqlite3',
+#         'NAME': '/path/to/colab.sqlite3',
+#     }
+# }
+
+# Disable indexing
+ROBOTS_NOINDEX = False
+
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': True,
+
+    'formatters': {
+        'colab': '[colab] (%(name)s) %(levelname)s: %(message)s',
+        'verbose': '%(asctime)s (%(name)s) %(levelname)s: %(message)s',
+    },
+
+    'handlers': {
+        'null': {
+            'level': 'DEBUG',
+            'class': 'logging.NullHandler',
+        },
+        'syslog': {
+            'level': 'WARNING',
+            'class': 'logging.handlers.SysLogHandler',
+            'formatter': 'colab',
+            'address': '/dev/log',
+        },
+        'file': {
+            'level': 'DEBUG',
+            'class': 'logging.handlers.TimedRotatingFileHandler',
+            'filename': '/var/log/colab/colab.log',
+            'interval': 24,  # 24 hours
+            'backupCount': 7,  # keep last 7 backups
+            'encoding': 'UTF-8',
+            'formatter': 'verbose',
+        },
+    },
+
+    'loggers': {
+        'django': {
+            'handlers': ['file', 'syslog'],
+            'propagate': False,
+        },
+        'revproxy': {
+            'handlers': ['file', 'syslog'],
+            'propagate': False,
+            'level': 'ERROR',
+        },
+    },
+}
+
 EOF
-  chown root:colab /etc/colab/settings.yaml
-  chmod 0640 /etc/colab/settings.yaml
+
+  chown root:colab /etc/colab/settings.py
+  chmod 0640 /etc/colab/settings.py
 fi
 
 mkdir -p /etc/colab/settings.d
 
-if [ ! -f /etc/colab/settings.d/00-database.yaml ]; then
-  cat > /etc/colab/settings.d/00-database.yaml <<EOF
-DATABASES:
-  default:
-    ENGINE: django.db.backends.postgresql_psycopg2
-    NAME: colab
-    USER: colab
-    HOST: localhost
-    PORT: 5432
-EOF
-  chown root:colab /etc/colab/settings.d/00-database.yaml
-  chmod 0640 /etc/colab/settings.d/00-database.yaml
-fi
-
 # only applies if there is a local PostgreSQL server
 if [ -x /usr/bin/postgres ]; then
 
--
libgit2 0.21.2