Make wellknowndir substitution work on Alias line as well.

[cascardo/ipsilon.git] / templates / install / idp.conf

diff --git a/templates/install/idp.conf b/templates/install/idp.conf
index 6d5c493..dcc8592 100644 (file)
--- a/templates/install/idp.conf
+++ b/templates/install/idp.conf
@@ -1,12 +1,25 @@
-Alias /idp/ui /usr/share/ipsilon/ui
-WSGIScriptAlias /idp /usr/sbin/ipsilon
-WSGIDaemonProcess idp user=ipsilon group=ipsilon
-WSGIProcessGroup idp
+Alias /${instance}/ui ${staticdir}/ui
+Alias /.well-known ${wellknowndir}
+WSGIScriptAlias /${instance} ${ipsilondir}/ipsilon
+WSGIDaemonProcess ${instance} user=${sysuser} group=${sysuser} home=${datadir} display-name=ipsilon-${instance}
+${wsgi_socket}
 
-<Directory /usr/sbin>
+<Location /${instance}>
+    WSGIProcessGroup ${instance}
+${sslrequiressl}
+</Location>
+
+<Directory ${ipsilondir}>
+    Require all granted
+</Directory>
+
+<Directory ${staticdir}>
     Require all granted
 </Directory>
 
-<Directory /usr/share/ipsilon>
+<Directory ${wellknowndir}>
     Require all granted
 </Directory>
+<Location /.well-known/browserid>
+    ForceType application/json
+</Location>