From 2bf19529aed9bc545fadf60f06b4e8ee78483ca2 Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@redhat.com>
Date: Wed, 28 May 2014 22:34:33 -0400
Subject: Additional parametrization of template files

To allow for testing in a custom rootdir, and with a custom user.

Signed-off-by: Simo Sorce <simo@redhat.com>
---
 templates/install/idp.conf     | 10 +++++-----
 templates/install/ipsilon.conf |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'templates')

diff --git a/templates/install/idp.conf b/templates/install/idp.conf
index 4fe4204..6175ffe 100644
--- a/templates/install/idp.conf
+++ b/templates/install/idp.conf
@@ -1,15 +1,15 @@
-Alias /${instance}/ui /usr/share/ipsilon/ui
-WSGIScriptAlias /${instance} /usr/sbin/ipsilon
-WSGIDaemonProcess ${instance} user=ipsilon group=ipsilon home=${datadir}
+Alias /${instance}/ui ${staticdir}/ui
+WSGIScriptAlias /${instance} ${ipsilondir}/ipsilon
+WSGIDaemonProcess ${instance} user=${sysuser} group=${sysuser} home=${datadir}
 
 <Location /${instance}>
     WSGIProcessGroup ${instance}
 </Location>
 
-<Directory /usr/sbin>
+<Directory ${ipsilondir}>
     Require all granted
 </Directory>
 
-<Directory /usr/share/ipsilon>
+<Directory ${staticdir}>
     Require all granted
 </Directory>
diff --git a/templates/install/ipsilon.conf b/templates/install/ipsilon.conf
index 3c9226f..89e14f1 100644
--- a/templates/install/ipsilon.conf
+++ b/templates/install/ipsilon.conf
@@ -3,7 +3,7 @@ debug = False
 
 log.screen = False
 base.mount = "/${instance}"
-base.dir = "/usr/share/ipsilon"
+base.dir = "${staticdir}"
 admin.config.db = "${datadir}/adminconfig.sqlite"
 user.prefs.db = "${datadir}/userprefs.sqlite"
 
-- 
cgit