X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Fconfig.py;h=908b6512ea8caf148d1d7c779a553d2389e7141d;hb=b62712ea1bb91c0ab746be38ceec429a90cab212;hp=61c22817e3a86672dbd514abfe158ae02f1fbade;hpb=4920497313e03cc832c29aaae13e45ca060ccc94;p=myslice.git

diff --git a/myslice/config.py b/myslice/config.py
index 61c22817..908b6512 100644
--- a/myslice/config.py
+++ b/myslice/config.py
@@ -18,13 +18,13 @@ class Config(object):
 
     # the OpenLab-wide backend as managed by UPMC
     # xxx production should probably use https of course
-    default_manifold_url = "http://test.myslice.info:7080/"
-    # the devel/unstable version runs on "http://dev.myslice.info:7080/"
+    default_manifold_url = "https://test.myslice.info:7080/"
+    # the devel/unstable version runs on "https://dev.myslice.info:7080/"
     # if you use a development backend running on this box, use "http://localhost:7080/"
-    # the INRIA setup is with "http://manifold.pl.sophia.inria.fr:7080/"
+    # the INRIA setup is with "https://manifold.pl.sophia.inria.fr:7080/"
 
     default_manifold_admin_user     = 'admin'
-    default_manifold_admin_password = 'admin'
+    default_manifold_admin_password = 'demo'
 
 
     def __init__ (self):
@@ -33,6 +33,8 @@ class Config(object):
         parser.set ('manifold', 'url', Config.default_manifold_url)
         parser.set ('manifold', 'admin_user', Config.default_manifold_admin_user)
         parser.set ('manifold', 'admin_password', Config.default_manifold_admin_password)
+        parser.add_section('googlemap')
+        parser.set ('googlemap','api_key', None)
         parser.read (os.path.join(ROOT,'myslice/myslice.ini'))
         self.config_parser=parser
 
@@ -43,6 +45,9 @@ class Config(object):
         return (self.config_parser.get('manifold','admin_user'),
                 self.config_parser.get('manifold','admin_password'))
 
+    def googlemap_api_key (self):
+        return self.config_parser.get('googlemap','api_key')
+
     # exporting these details to js
     def manifold_js_export (self):
         return "var MANIFOLD_URL = '%s';\n"%self.manifold_url();