Commit 9215f222 authored by Daniel Stan's avatar Daniel Stan

suite de kludges au sujet du path

parent 3d06ffa4
......@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
from django.core.management.base import BaseCommand
from intranet.apps.digicode.models import Code
from apps.digicode.models import Code
class Command(BaseCommand):
help = u"Efface les codes périmés"
......
......@@ -4,7 +4,7 @@
import sys
from django.core.management.base import BaseCommand, CommandError
from intranet.apps.voip.models import Profile
from apps.voip.models import Profile
class Command(BaseCommand):
args = ''
......
......@@ -4,7 +4,7 @@
import sys
from django.core.management.base import BaseCommand, CommandError
from intranet.apps.voip.models import Profile
from apps.voip.models import Profile
class Command(BaseCommand):
args = ''
......
......@@ -4,7 +4,7 @@
import sys
from django.core.management.base import BaseCommand, CommandError
from intranet.apps.voip.models import Profile
from apps.voip.models import Profile
class Command(BaseCommand):
args = ''
......
......@@ -4,10 +4,14 @@
import os
# Imports des secrets (plus tard, mais pas en debug)
import sys
sys.path.append("/etc/crans/secrets")
if '/usr/scripts' not in sys.path:
sys.path.append('/usr/scripts')
if '/usr/local/django/intranet' not in sys.path:
sys.path.append('/usr/local/django/intranet')
import django
from django.utils.importlib import import_module
import gestion.secrets_new as secrets
conn_pool = import_module('conn_pool', 'intranet')
""" Liste d'applications désactivées """
......@@ -148,7 +152,7 @@ MEDIA_URL = ROOT_URL + 'media/'
if LOCATION != 'o2':
SECRET_KEY = "sYjlDBZUBSMnk"
else: # Ne marchera que sur o2
from secrets import django_secret_key as SECRET_KEY
SECRET_KEY = secrets.get('django_secret_key')
# List of callables that know how to import templates from various sources.
TEMPLATE_LOADERS = (
......
......@@ -4,7 +4,7 @@
from django.conf.urls import include, patterns, url
import settings
import django.contrib.auth.views
from utils.protectpost import protect
from bw_comp.protectpost import protect
from django.contrib import admin
admin.autodiscover()
......@@ -23,7 +23,7 @@ urlpatterns = patterns('',
login_url,
logout_url,
(r'^admin/', include(admin.site.urls)),
(r'^heartbeat$', 'utils.heartbeat.view'),
(r'^heartbeat$', 'bw_comp.heartbeat.view'),
)
if settings.DEV:
......
ATTENTION: ne pas utiliser ce dossier comme module python. Risque de conflit
avec /usr/scripts/utils
......@@ -3,8 +3,9 @@
CONFIG = {
'mode' : 'django',
'working_dir' : '/usr/local/django/intranet/',
'working_dir' : '/usr/local/django',
'args': (
'intranet',
'--log-level=info',
'--bind=unix://tmp/gunicorn-intranet.sock',
'--workers=1',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment