From 6d5911cc3c260290666549f19ba2d30e42e3f350 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Wed, 25 May 2022 16:58:17 -0700
Subject: [PATCH] ipsilon / staging: fixes for f36

The wsgi has changed from /usr/libexec/ipsilon/ipsilon.py to
/usr/libexec/ipsilon, so adjust wsgi and directory perms to handle that.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 roles/ipsilon/templates/httpd.conf.j2 | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/roles/ipsilon/templates/httpd.conf.j2 b/roles/ipsilon/templates/httpd.conf.j2
index 5f74a413bb..78125d475a 100644
--- a/roles/ipsilon/templates/httpd.conf.j2
+++ b/roles/ipsilon/templates/httpd.conf.j2
@@ -20,7 +20,11 @@ RewriteRule ^([a-z0-9_\.-]+)\.id\.fedoraproject\.org/.* /openid/id/$1/ [PT]
 {% endif %}
 
 
+{% if env == "staging" %}
+WSGIScriptAlias / /usr/libexec/ipsilon
+{% else %}
 WSGIScriptAlias / /usr/libexec/ipsilon/ipsilon.py
+{% endif %}
 WSGIDaemonProcess ipsilon user=ipsilon group=ipsilon home=/var/lib/ipsilon/root display-name=ipsilon processes=6 threads=2 maximum-requests=1000
 WSGISocketPrefix run/wsgi
 #WSGIRestrictStdout Off
@@ -36,9 +40,15 @@ WSGIApplicationGroup %{GLOBAL}
     WSGIProcessGroup ipsilon
 </Location>
 
+{% if env == "staging" %}
+<Directory /usr/libexec>
+    Require all granted
+</Directory>
+{% else %}
 <Directory /usr/libexec/ipsilon>
     Require all granted
 </Directory>
+{% endif %}
 
 <Directory /usr/share/ipsilon>
     Options +SymLinksIfOwnerMatch