Commit 84e1c931 authored by André Kerkhoff's avatar André Kerkhoff
Browse files

Make sure that {PROXY}{HOST} is set before installing plugins

parent 25156b66
......@@ -3,7 +3,7 @@ maintainer 'HPC'
maintainer_email 'hpc@gsi.de'
license 'All rights reserved'
description 'Installs/Configures Foswiki'
version '2.1.2'
version '2.1.3'
depends 'apache2', '< 6.0'
supports 'debian'
supports 'ubuntu'
......@@ -49,10 +49,18 @@ template "#{foswiki_dir('install')}/robots.txt" do
)
end
# Configure Foswiki
new_config = node['foswiki']['config'].dup || {}
new_config.keys.select { |k| k.end_with?('Dir') }.each do |key|
new_config[key] = new_config[key].gsub('{install}', install_dir)
end
unless new_config['PROXY'].nil? || new_config['PROXY']['HOST'].nil?
# Proxy is important to install plugins later
foswiki_configure '{PROXY}{HOST}' do
value new_config['PROXY']['HOST']
tools_dir tools_dir
end
end
foswiki_configure 'foswiki' do
config new_config
tools_dir tools_dir
......
Supports Markdown
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