dev/passerelle: better config files

home:entrouvert:cg14-dev/passerelle/cg14_config.py

@@ -2,6 +2,9 @@
 
 SECRET_KEY = file('/etc/passerelle/secret').read()
 
+LANGUAGE_CODE = 'fr-fr'
+TIME_ZONE = 'Europe/Paris'
+
 STATIC_ROOT = '/usr/share/passerelle/static'
 STATIC_URL = '/passerelle/static/'
 MEDIA_ROOT = '/var/lib/passerelle/media'
@@ -30,4 +33,11 @@ INSTALLED_APPS = (
     'gadjo',
 )
 
+# where to find templates for makorepost objects
+MAKO_TEMPLATES_DIRS = (
+    os.path.join(PACKAGE_PATH, 'apps', 'makorepost', 'templates.mako'),
+    os.path.join(PACKAGE_PATH, 'apps', 'solis', 'templates.mako'),
+)
+MAKO_TEMPLATES_MODULES = None  # store generated Mako module files in this directory (optional)
+
 execfile('/etc/passerelle/config.py')

home:entrouvert:cg14-dev/passerelle/config.py

@@ -5,10 +5,9 @@
 # values, see https://docs.djangoproject.com/en/1.7/ref/settings/
 # For more information on settings see
 # https://docs.djangoproject.com/en/1.7/topics/settings/
-
 # See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/
 
-# This file is sourced by "execfile" from /usr/lib/passerelle/redhat_config.py
+# This file is sourced by "execfile" from /usr/lib/passerelle/cg14_config.py
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = False
@@ -39,6 +38,3 @@ MANAGERS = ADMINS
 # DATABASES['default']['host'] = 'localhost'
 # DATABASES['default']['port'] = '5432'
 
-LANGUAGE_CODE = 'fr-fr'
-TIME_ZONE = 'Europe/Paris'
-

home:entrouvert:cg14-dev/passerelle/passerelle-manage

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 NAME=passerelle
-MANAGE="/usr/lib/$NAME/manage.py --config=/usr/lib/${NAME}/redhat_config.py"
+MANAGE="/usr/lib/$NAME/manage.py --config=/usr/lib/${NAME}/cg14_config.py"
 
 # check user
 if test x$1 = x"--forceuser"

home:entrouvert:cg14-dev/passerelle/passerelle.init

@@ -32,7 +32,7 @@ MANAGE=/usr/bin/${NAME}-manage
 lockfile=/var/lock/subsys/$NAME
 
 DJANGO_SETTINGS_MODULE=passerelle.settings
-DJANGO_CONFIG_FILE=/usr/lib/$NAME/debian_config.py
+DJANGO_CONFIG_FILE=/usr/lib/$NAME/cg14_config.py
 
 DAEMON_OPTIONS="--bind 127.0.0.1:8484 --workers=3"
 
@@ -56,7 +56,9 @@ do_migrate() {
 
 do_collectstatic() {
     echo "Collect static files..."
+    chown -R passerelle:passerelle /usr/share/passerelle/static
     $SCRIPTNAME manage collectstatic --noinput
+    chown -R root:root /usr/share/passerelle/static
 }
 
 start() {
@@ -71,6 +73,8 @@ start() {
         --pid $PIDFILE \
         --user $USER --group $GROUP \
         --error-logfile $LOGFILE \
+        --env DJANGO_SETTINGS_MODULE=$DJANGO_SETTINGS_MODULE \
+        --env DJANGO_CONFIG_FILE=$DJANGO_CONFIG_FILE \
         $DAEMON_OPTIONS \
         passerelle.wsgi:application
     retval=$?

home:entrouvert:cg14-dev/passerelle/passerelle.spec

@@ -27,12 +27,12 @@ Source4:        synchro-wcs-suivi.conf
 Source5:        synchro-cron.sh
 Source6:        wcs-au-quotidien.cron.d
 Source7:        passerelle-manage
-Source8:        redhat_config.py
+Source8:        cg14_config.py
 
 
 BuildArch:      noarch
 BuildRequires:  python2-devel python-django python-setuptools-devel
-Requires:       python-django python-South python-django-jsonresponse python-django-model-utils python-gunicorn python-Mako python-raven python-django-gadjo
+Requires:       python-django python-South python-django-jsonresponse python-django-model-utils python-gunicorn python-Mako python-raven python-django-gadjo python-requests
 
 %description
 Passerelle provides an uniform access to multiple data sources and services.
@@ -57,7 +57,7 @@ exit 0
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 install -d -m 0755 $RPM_BUILD_ROOT/usr/lib/passerelle
 mv $RPM_BUILD_ROOT/usr/bin/manage.py $RPM_BUILD_ROOT/usr/lib/passerelle/manage.py
-install -D -p -m 755 %{SOURCE8} $RPM_BUILD_ROOT/usr/lib/passerelle/redhat_config.py
+install -D -p -m 755 %{SOURCE8} $RPM_BUILD_ROOT/usr/lib/passerelle/cg14_config.py
 install -D -p -m 755 %{SOURCE7} $RPM_BUILD_ROOT/usr/bin/passerelle-manage
 install -d -m 0755 $RPM_BUILD_ROOT/etc/passerelle
 install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/passerelle/config.py
@@ -91,7 +91,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rc.d/init.d/passerelle
 /usr/bin/passerelle-manage
 /usr/lib/passerelle/manage.py
-/usr/lib/passerelle/redhat_config.py
+/usr/lib/passerelle/cg14_config.py
 /etc/passerelle/synchro-cron.sh
 /etc/passerelle/synchro-wcs-suivi.sh
 %config /etc/passerelle/config.py