chg: allow domain-vhosts of motion container

[infra.git] / modules / motion / templates / nginx.epp

diff --git a/modules/motion/templates/nginx.epp b/modules/motion/templates/nginx.epp
index 36dbfa6b708998f49a7901d027cefc75697d8a9f..1bcee0d65798e2eafbe4b8945e3744173c407253 100644 (file)
--- a/modules/motion/templates/nginx.epp
+++ b/modules/motion/templates/nginx.epp
@@ -22,19 +22,18 @@ server {
         root /data/challenge;
     }
 }
-<%=inline_epp(file('motion/user_map.epp', 'motion/user_map.template.epp'), {container => $container})%>
-log_format <%=$container%>-cert '$date_gmt $ssl_client_serial:$ssl_client_i_dn;$<%=$container%>_user_role';
 server {
+
     listen       0.0.0.0:443 ssl;
     server_name  <%=$domain%>;
     gzip         on;
     ssl_certificate <%=$cert_stem%>.crt;
     ssl_certificate_key <%=$cert_stem%>.key;
 
-    ssl_client_certificate /etc/ssl/<%=$container%>-roots.pem;
+    ssl_client_certificate /etc/ssl/<%=$name%>-roots.pem;
     ssl_verify_client on;
     ssl_verify_depth 4;
-    access_log /tmp/<%=$container%>-certs.log <%=$container%>-cert;
+    access_log /tmp/<%=$name%>-certs.log motion-cert;
 
     location / {
         fastcgi_param  QUERY_STRING       $query_string;
@@ -48,7 +47,7 @@ server {
         fastcgi_param  SERVER_NAME        $host;
         fastcgi_param  SERVER_PORT        '443';
         fastcgi_param  SERVER_PROTOCOL    'https';
-        fastcgi_param  USER_ROLES         $<%=$container%>_user_role;
+        fastcgi_param  USER_ROLES         $motion_user_role;
         fastcgi_pass  <%=$socket%>;
 
     <% if($protected != 'no') { %>