Make the template directory configurable

Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
Reviewed-by: Simo Sorce <simo@redhat.com>

diff --git a/examples/ipsilon.conf b/examples/ipsilon.conf
index d1755c2..eddde2f 100644 (file)
--- a/examples/ipsilon.conf
+++ b/examples/ipsilon.conf
@@ -1,5 +1,6 @@
 [global]
 debug = True
+template_dir = "templates"
 
 log.screen = True
 base.mount = "/idp"

diff --git a/ipsilon/ipsilon b/ipsilon/ipsilon
index 9700106..681600d 100755 (executable)
--- a/ipsilon/ipsilon
+++ b/ipsilon/ipsilon
@@ -60,7 +60,11 @@ admin_config = datastore.load_config()
 for option in admin_config:
     cherrypy.config[option] = admin_config[option]
 
-templates = os.path.join(cherrypy.config['base.dir'], 'templates')
+template_dir = cherrypy.config.get('template_dir', 'templates')
+if template_dir.startswith('/'):
+    templates = template_dir
+else:
+    templates = os.path.join(cherrypy.config['base.dir'], template_dir)
 template_env = Environment(loader=FileSystemLoader(templates))
 
 if __name__ == "__main__":

diff --git a/templates/install/ipsilon.conf b/templates/install/ipsilon.conf
index 99491db..83b9704 100644 (file)
--- a/templates/install/ipsilon.conf
+++ b/templates/install/ipsilon.conf
@@ -1,5 +1,6 @@
 [global]
 debug = ${debugging}
+template_dir = "templates"
 
 log.screen = ${debugging}
 base.mount = "/${instance}"