Commit 5b2e24dd authored by André Kerkhoff's avatar André Kerkhoff
Browse files

Add alias for favicon in Apache

parent 7d795c9d
......@@ -5,6 +5,7 @@ default['foswiki']['apache']['cert_chain_file'] = nil
default['foswiki']['apache']['cert_file'] = nil
default['foswiki']['apache']['cert_key_file'] = nil
default['foswiki']['apache']['custom_log'] = 'combined'
default['foswiki']['apache']['favicon'] = '/System/ProjectLogos/favicon.ico'
default['foswiki']['apache']['fcgid_max_request_len'] = 10240000
default['foswiki']['apache']['http_port'] = 80
default['foswiki']['apache']['https_port'] = 443
......
......@@ -3,7 +3,7 @@ maintainer 'HPC'
maintainer_email 'hpc@gsi.de'
license 'All rights reserved'
description 'Installs/Configures Foswiki'
version '2.2.14'
version '2.2.15'
depends 'apache2', '< 6.0'
supports 'debian'
supports 'ubuntu'
......@@ -18,6 +18,9 @@ dirs = {}
%w(data install locales pub script template tools).each do |dir|
dirs[dir] = foswiki_dir(dir)
end
if apache_conf['favicon']
favicon_path = foswiki_dir('pub') + apache_conf['favicon']
end
pub_url_path = node['foswiki']['config']['PubUrlPath']
script_url_path = node['foswiki']['config']['ScriptUrlPath']
script_url_path_view = node['foswiki']['config']['ScriptUrlPaths']['view']
......@@ -31,6 +34,7 @@ web_app apache_conf['server_name'] do
cert_key_file apache_conf['cert_key_file']
custom_log apache_conf['custom_log']
data_dir dirs['data']
favicon favicon_path
fcgid_max_request_len apache_conf['fcgid_max_request_len']
http_port apache_conf['http_port']
https_port apache_conf['https_port']
......
......@@ -51,6 +51,9 @@
# must also be specified in an Alias statement, and must not conflict with a web name.
#Alias <%= @params[:pub_url_path] %> "<%= @params[:pub_dir] %>"
<% if @params[:favicon] -%>
Alias /favicon.ico "<%= @params[:favicon] %>"
<% end -%>
Alias /robots.txt "<%= @params[:install_dir] %>/robots.txt"
# Add aliases for any other files that must be read at the root level. eg.
# Alias /google[somehashkey].html "<%= @params[:install_dir] %>/google[somehashkey].html"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment