Use account_root with VENV token in templates for full path

This commit is contained in:
Kienan Stewart 2018-12-23 23:40:14 -05:00
parent cabe395393
commit 31fabf2a47
4 changed files with 6 additions and 6 deletions

View File

@ -10,7 +10,7 @@
%%CHAINLINE%% %%CHAINLINE%%
<IfModule mod_wsgi.c> <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%% WSGIProcessGroup %%fqdn%%
WSGIScriptAlias / %%document_root%%/%%APP_SUBDIR%%/wsgi.py process-group=%%fqdn%% WSGIScriptAlias / %%document_root%%/%%APP_SUBDIR%%/wsgi.py process-group=%%fqdn%%
</IfModule> </IfModule>
@ -35,7 +35,7 @@
SetEnv LOGIN "%%UID%%-%%LOGIN%%" SetEnv LOGIN "%%UID%%-%%LOGIN%%"
<IfModule mod_wsgi.c> <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%% WSGIProcessGroup %%fqdn%%
WSGIScriptAlias / %%document_root%%/%%APP_SUBDIR%%/wsgi.py process-group=%%fqdn%% WSGIScriptAlias / %%document_root%%/%%APP_SUBDIR%%/wsgi.py process-group=%%fqdn%%
</IfModule> </IfModule>

View File

@ -22,7 +22,7 @@
AssignUserId #%%UID%% #%%GID%% AssignUserId #%%UID%% #%%GID%%
SetEnv LOGIN "%%UID%%-%%LOGIN%%" SetEnv LOGIN "%%UID%%-%%LOGIN%%"
<IfModule mod_wsgi.c> <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%% WSGIProcessGroup %%fqdn%%
WSGIScriptAlias / %%document_root%%/%%APP_SUBDIR%%/wsgi.py process-group=%%fqdn%% WSGIScriptAlias / %%document_root%%/%%APP_SUBDIR%%/wsgi.py process-group=%%fqdn%%
</IfModule> </IfModule>

View File

@ -10,7 +10,7 @@
%%CHAINLINE%% %%CHAINLINE%%
<IfModule mod_wsgi.c> <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%% WSGIProcessGroup %%fqdn%%
WSGIScriptAlias / %%document_root%%/%%APP_SUBDIR%%/wsgi.py process-group=%%fqdn%% WSGIScriptAlias / %%document_root%%/%%APP_SUBDIR%%/wsgi.py process-group=%%fqdn%%
</IfModule> </IfModule>
@ -39,5 +39,5 @@
RewriteEngine On RewriteEngine On
RewriteCond %{REQUEST_FILENAME} !/cgi-bin/ RewriteCond %{REQUEST_FILENAME} !/cgi-bin/
RewriteCond %{REQUEST_FILENAME} !/.well-known/acme-challenge/ RewriteCond %{REQUEST_FILENAME} !/.well-known/acme-challenge/
RewriteRule ^/(.*)$ http://%%fqdn%%/$1 [R=301,L] RewriteRule ^/(.*)$ https://%%fqdn%%/$1 [R=301,L]
</Virtualhost> </Virtualhost>

View File

@ -22,7 +22,7 @@
AssignUserId #%%UID%% #%%GID%% AssignUserId #%%UID%% #%%GID%%
SetEnv LOGIN "%%UID%%-%%LOGIN%%" SetEnv LOGIN "%%UID%%-%%LOGIN%%"
<IfModule mod_wsgi.c> <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%% WSGIProcessGroup %%fqdn%%
WSGIScriptAlias / %%document_root%%/%%APP_SUBDIR%%/wsgi.py process-group=%%fqdn%% WSGIScriptAlias / %%document_root%%/%%APP_SUBDIR%%/wsgi.py process-group=%%fqdn%%
</IfModule> </IfModule>