--- manifests/servergroups/proxy.pp | 1 + modules/httpd/manifests/init.pp | 3 ++- modules/httpd/templates/mailman-proxy.conf.erb | 2 ++ 3 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/manifests/servergroups/proxy.pp b/manifests/servergroups/proxy.pp index a6c742e..ceea9cb 100644 --- a/manifests/servergroups/proxy.pp +++ b/manifests/servergroups/proxy.pp @@ -510,6 +510,7 @@ class proxy { httpd::mailman-proxy { "admin.fedoraproject.org/mailman": website => "admin.fedoraproject.org", path => "/mailman", + iconpath => "/icons", proxyurl => "http://collab1.fedoraproject.org", }
diff --git a/modules/httpd/manifests/init.pp b/modules/httpd/manifests/init.pp index a6e61c4..5bc7849 100644 --- a/modules/httpd/manifests/init.pp +++ b/modules/httpd/manifests/init.pp @@ -412,7 +412,8 @@ define httpd::nagios-proxy($website) { define httpd::mailman-proxy( $website, $path, - $proxyurl + $iconpath, + $proxyurl, ) { file { "/etc/httpd/conf.d/$website/mailman.conf": owner => "root", diff --git a/modules/httpd/templates/mailman-proxy.conf.erb b/modules/httpd/templates/mailman-proxy.conf.erb index a66c885..995e7a9 100644 --- a/modules/httpd/templates/mailman-proxy.conf.erb +++ b/modules/httpd/templates/mailman-proxy.conf.erb @@ -1,2 +1,4 @@ +ProxyPass <%= iconpath %> <%= proxyurl %>/icons +ProxyPassReverse <%= iconpath %> <%= proxyurl %>/icons ProxyPass <%= path %> <%= proxyurl %>/mailman ProxyPassReverse <%= path %> <%= proxyurl %>/mailman
infrastructure@lists.fedoraproject.org