config agenda PROD

diff --git a/auf_savoirs_en_partage/conf.py.edit b/auf_savoirs_en_partage/conf.py.edit
index dc78089..4e3fc3d 100644 (file)
--- a/auf_savoirs_en_partage/conf.py.edit
+++ b/auf_savoirs_en_partage/conf.py.edit
@@ -5,3 +5,5 @@ 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.
 ROA_API_KEY = ''
+
+CALENDRIER_URL = 'http://davin:davin@cal.ro.auf.org/caldav.php/davin/test/'

diff --git a/auf_savoirs_en_partage/savoirs/globals.py b/auf_savoirs_en_partage/savoirs/globals.py
index e14089d..c42b596 100644 (file)
--- a/auf_savoirs_en_partage/savoirs/globals.py
+++ b/auf_savoirs_en_partage/savoirs/globals.py
@@ -10,7 +10,6 @@ configuration = {
     'accueil_evenement': 10,
     'engin_recherche': 'sep',
     'google_xml': "http://www.savoirsenpartage.auf.org/recherche.xml?%s",
-    'calendrier': 'http://davin:davin@cal.ro.auf.org/caldav.php/davin/test/',
     'calendrier_publique': 'http://cal.ro.auf.org/caldav.php/davin/test/',
 }
 

diff --git a/auf_savoirs_en_partage/savoirs/lib/calendrier.py b/auf_savoirs_en_partage/savoirs/lib/calendrier.py
index f1b4426..7724606 100644 (file)
--- a/auf_savoirs_en_partage/savoirs/lib/calendrier.py
+++ b/auf_savoirs_en_partage/savoirs/lib/calendrier.py
@@ -1,12 +1,13 @@
 # -*- encoding: utf-8 -*-
 import caldav, datetime, time, pytz
 from savoirs.globals import configuration
+from settings import CALENDRIER_URL
 
 def evenements():
     rc = []
 
-    client = caldav.DAVClient(configuration['calendrier'])
-    cal = caldav.Calendar(client, url = configuration['calendrier'])
+    client = caldav.DAVClient(CALENDRIER_URL)
+    cal = caldav.Calendar(client, url = CALENDRIER_URL)
     start = datetime.datetime.now()
     events = cal.date_search(start)
 
@@ -21,13 +22,13 @@ def evenements():
 
 
 def evenement_info(uid):
-    client = caldav.DAVClient(configuration['calendrier'])
-    cal = caldav.Calendar(client, url = configuration['calendrier'])
+    client = caldav.DAVClient(CALENDRIER_URL)
+    cal = caldav.Calendar(client, url = CALENDRIER_URL)
     return cal.event(uid)
 
 def evenement_publie(event):
-    client = caldav.DAVClient(configuration['calendrier'])
-    cal = caldav.Calendar(client, url = configuration['calendrier'])
+    client = caldav.DAVClient(CALENDRIER_URL)
+    cal = caldav.Calendar(client, url = CALENDRIER_URL)
     e = caldav.Event(client, parent = cal, data = event.serialize()).save()
 
 def combine(when, tz):

diff --git a/auf_savoirs_en_partage/settings.py b/auf_savoirs_en_partage/settings.py
index da0d3d2..cca1879 100644 (file)
--- a/auf_savoirs_en_partage/settings.py
+++ b/auf_savoirs_en_partage/settings.py
@@ -26,9 +26,6 @@ MEDIA_URL = '/media/'
 # Examples: "http://foo.com/media/", "/media/".
 ADMIN_MEDIA_PREFIX = '/admin_media/'
 
-# Don't share this with anybody.
-SECRET_KEY = 'k5m_cyht&ipi!nbxng9-5zc!4_q84opflhsn#d3%^3=9gm44tt'
-
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.load_template_source',