From 31fabf2a477e790fc59ff8429800e116278d23b1 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 23 Dec 2018 23:40:14 -0500
Subject: [PATCH] Use account_root with VENV token in templates for full path

---
 src/templates/apache2/wsgi-both.conf  | 4 ++--
 src/templates/apache2/wsgi-http.conf  | 2 +-
 src/templates/apache2/wsgi-https.conf | 4 ++--
 src/templates/apache2/wsgi.conf       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/templates/apache2/wsgi-both.conf b/src/templates/apache2/wsgi-both.conf
index fb6bbb3..0595440 100644
--- a/src/templates/apache2/wsgi-both.conf
+++ b/src/templates/apache2/wsgi-both.conf
@@ -10,7 +10,7 @@
   %%CHAINLINE%%
 
   <IfModule mod_wsgi.c>
-    WSGIDaemonProcess %%fqdn%% python-home=%%VENV%% python-path=%%document_root%%/ socket-user=#%%UID%%
+    WSGIDaemonProcess %%fqdn%% python-home=%%account_root%%/%%VENV%% python-path=%%document_root%%/ socket-user=#%%UID%%
     WSGIProcessGroup %%fqdn%%
     WSGIScriptAlias / %%document_root%%/%%APP_SUBDIR%%/wsgi.py process-group=%%fqdn%%
   </IfModule>
@@ -35,7 +35,7 @@
   SetEnv LOGIN "%%UID%%-%%LOGIN%%"
 
   <IfModule mod_wsgi.c>
-    WSGIDaemonProcess %%fqdn%% python-home=%%VENV%% python-path=%%document_root%%/ socket-user=#%%UID%%
+    WSGIDaemonProcess %%fqdn%% python-home=%%account_root%%/%%VENV%% python-path=%%document_root%%/ socket-user=#%%UID%%
     WSGIProcessGroup %%fqdn%%
     WSGIScriptAlias / %%document_root%%/%%APP_SUBDIR%%/wsgi.py process-group=%%fqdn%%
   </IfModule>
diff --git a/src/templates/apache2/wsgi-http.conf b/src/templates/apache2/wsgi-http.conf
index 7eba0b1..b602b46 100644
--- a/src/templates/apache2/wsgi-http.conf
+++ b/src/templates/apache2/wsgi-http.conf
@@ -22,7 +22,7 @@
   AssignUserId #%%UID%% #%%GID%%
   SetEnv LOGIN "%%UID%%-%%LOGIN%%"
   <IfModule mod_wsgi.c>
-    WSGIDaemonProcess %%fqdn%% python-home=%%VENV%% python-path=%%document_root%%/ socket-user=#%%UID%%
+    WSGIDaemonProcess %%fqdn%% python-home=%%account_root%%/%%VENV%% python-path=%%document_root%%/ socket-user=#%%UID%%
     WSGIProcessGroup %%fqdn%%
     WSGIScriptAlias / %%document_root%%/%%APP_SUBDIR%%/wsgi.py process-group=%%fqdn%%
   </IfModule>
diff --git a/src/templates/apache2/wsgi-https.conf b/src/templates/apache2/wsgi-https.conf
index f7f7cc5..97ffdaa 100644
--- a/src/templates/apache2/wsgi-https.conf
+++ b/src/templates/apache2/wsgi-https.conf
@@ -10,7 +10,7 @@
   %%CHAINLINE%%
 
   <IfModule mod_wsgi.c>
-    WSGIDaemonProcess %%fqdn%% python-home=%%VENV%% python-path=%%document_root%%/ socket-user=#%%UID%%
+    WSGIDaemonProcess %%fqdn%% python-home=%%account_root%%/%%VENV%% python-path=%%document_root%%/ socket-user=#%%UID%%
     WSGIProcessGroup %%fqdn%%
     WSGIScriptAlias / %%document_root%%/%%APP_SUBDIR%%/wsgi.py process-group=%%fqdn%%
   </IfModule>
@@ -39,5 +39,5 @@
   RewriteEngine On
   RewriteCond %{REQUEST_FILENAME} !/cgi-bin/
   RewriteCond %{REQUEST_FILENAME} !/.well-known/acme-challenge/
-  RewriteRule ^/(.*)$ http://%%fqdn%%/$1 [R=301,L]
+  RewriteRule ^/(.*)$ https://%%fqdn%%/$1 [R=301,L]
 </Virtualhost>
diff --git a/src/templates/apache2/wsgi.conf b/src/templates/apache2/wsgi.conf
index 7eba0b1..b602b46 100644
--- a/src/templates/apache2/wsgi.conf
+++ b/src/templates/apache2/wsgi.conf
@@ -22,7 +22,7 @@
   AssignUserId #%%UID%% #%%GID%%
   SetEnv LOGIN "%%UID%%-%%LOGIN%%"
   <IfModule mod_wsgi.c>
-    WSGIDaemonProcess %%fqdn%% python-home=%%VENV%% python-path=%%document_root%%/ socket-user=#%%UID%%
+    WSGIDaemonProcess %%fqdn%% python-home=%%account_root%%/%%VENV%% python-path=%%document_root%%/ socket-user=#%%UID%%
     WSGIProcessGroup %%fqdn%%
     WSGIScriptAlias / %%document_root%%/%%APP_SUBDIR%%/wsgi.py process-group=%%fqdn%%
   </IfModule>