From acb5a6627a88b62a56f586351166e918ab2a4b57 Mon Sep 17 00:00:00 2001 From: Tim Flink Date: Tue, 23 May 2017 04:17:48 +0000 Subject: [PATCH] trying to fix custom theme changes --- .../host_vars/upstreamfirst.fedorainfracloud.org | 4 ++-- .../upstreamfirst-frontend/templates/0_pagure.conf | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/inventory/host_vars/upstreamfirst.fedorainfracloud.org b/inventory/host_vars/upstreamfirst.fedorainfracloud.org index abb9fc82d3..0e05d493a2 100644 --- a/inventory/host_vars/upstreamfirst.fedorainfracloud.org +++ b/inventory/host_vars/upstreamfirst.fedorainfracloud.org @@ -91,8 +91,8 @@ pagure_ssh_host_sha256: 'SHA256:ggRdzg+ugyR6WIzeiuyASAdEHf+HG5yZqJJIu/YTtHI=' new_pagure_admin_groups: ['sysadmin-main', 'sysadmin-qa'] pagure_instance_name: "Upstream First Pagure" -pagure_theme_static_dir:'/var/www/upstreamfirst-paguretheme/static' -pagure_theme_template_dir:'/var/www/upstreamfirst-paguretheme/templates' +pagure_theme_static_dir: "/var/www/upstreamfirst-paguretheme/static" +pagure_theme_template_dir: "/var/www/upstreamfirst-paguretheme/templates" stunnel_service: "eventsource" stunnel_source_port: 8088 diff --git a/roles/pagure/upstreamfirst-frontend/templates/0_pagure.conf b/roles/pagure/upstreamfirst-frontend/templates/0_pagure.conf index 0ecbe9943a..2b1f1bf688 100644 --- a/roles/pagure/upstreamfirst-frontend/templates/0_pagure.conf +++ b/roles/pagure/upstreamfirst-frontend/templates/0_pagure.conf @@ -117,14 +117,14 @@ WSGIDaemonProcess paguredocs user=git group=git maximum-requests=1000 display-na SSLCipherSuite RC4-SHA:AES128-SHA:ALL:!ADH:!EXP:!LOW:!MD5:!SSLV2:!NULL SSLProtocol ALL -SSLv2 -# Configure static files so that a custom theme can override the defaults -# -RewriteCond "{{ pagure_theme_static_dir }}/$1" -f -RewriteRule "^/static/(.*)" "{{ pagure_theme_static_dir }}/$1" [L] + # Configure static files so that a custom theme can override the defaults -# Use the application default theme for files not customized + RewriteCond "{{ pagure_theme_static_dir }}/$1" -f + RewriteRule "^/static/(.*)" "{{ pagure_theme_static_dir }}/$1" [L] -RewriteRule "^/static/(.*)" "/usr/lib/python2.7/site-packages/pagure/static/$1" [L] + # Use the application default theme for files not customized + + RewriteRule "^/static/(.*)" "/usr/lib/python2.7/site-packages/pagure/static/$1" [L] WSGIProcessGroup paguredocs