From c217e26f73a6ffc2a8f515719362b01400f74796 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Mon, 12 Jun 2017 20:36:21 +0000 Subject: [PATCH] Update fmn Apache conf for staging Static files have moved from fmn.web to fmn, so this fixes the Apache httpd configuration to point to the new locations in staging. Signed-off-by: Jeremy Cline --- roles/notifs/frontend/templates/fmn.web.conf | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/roles/notifs/frontend/templates/fmn.web.conf b/roles/notifs/frontend/templates/fmn.web.conf index b99358d5de..13b72ba06b 100644 --- a/roles/notifs/frontend/templates/fmn.web.conf +++ b/roles/notifs/frontend/templates/fmn.web.conf @@ -1,4 +1,8 @@ -Alias /notifications/static /usr/share/fmn.web/static +{% if env == 'staging' %} +Alias /notifications/static /usr/share/fmn/static +{% else %} +Alias /notifications/static /usr/share/fmn/static +{% endif %} WSGIDaemonProcess fmn user=apache group=apache maximum-requests=1000 display-name=fmn processes={{ wsgi_procs }} threads={{ wsgi_threads }} WSGISocketPrefix run/wsgi @@ -6,7 +10,11 @@ WSGIRestrictStdout On WSGIRestrictSignal Off WSGIPythonOptimize 1 +{% if env == 'staging' %} +WSGIScriptAlias /notifications /usr/share/fmn/fmn.web.wsgi +{% else %} WSGIScriptAlias /notifications /usr/share/fmn.web/fmn.web.wsgi +{% endif %} WSGIProcessGroup fmn