Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use helper functions for host-related attributes that are currently derived #81

Merged
merged 1 commit into from Nov 18, 2015
Merged

Use helper functions for host-related attributes that are currently derived #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Expand Up @@ -8,6 +8,9 @@
[[GH-26]](https://github.com/parallels-cookbooks/confluence/pull/26)
* Create database connection helper.
[[GH-61]](https://github.com/parallels-cookbooks/confluence/pull/61)
* Converted `virtual_host_name` and `virtual_host_alias` derived attrs
into helper methods for templates, etc.
[[GH-81]](https://github.com/parallels-cookbooks/confluence/pull/81)

## 1.7.1

Expand Down
6 changes: 4 additions & 2 deletions attributes/default.rb
View file
Open in desktop
Expand Up @@ -34,8 +34,10 @@
default['confluence']['apache2']['access_log'] = ''
default['confluence']['apache2']['error_log'] = ''
default['confluence']['apache2']['port'] = 80
default['confluence']['apache2']['virtual_host_name'] = node['fqdn']
default['confluence']['apache2']['virtual_host_alias'] = node['hostname']

# Defaults are automatically selected from fqdn and hostname via helper functions
default['confluence']['apache2']['virtual_host_name'] = nil
default['confluence']['apache2']['virtual_host_alias'] = nil

default['confluence']['apache2']['ssl']['access_log'] = ''
default['confluence']['apache2']['ssl']['chain_file'] = ''
Expand Down
9 changes: 9 additions & 0 deletions libraries/helpers.rb
View file
Open in desktop
Expand Up @@ -36,6 +36,14 @@ def confluence_version
end
end

def confluence_virtual_host_name
node['confluence']['apache2']['virtual_host_name'] || node['fqdn']
end

def confluence_virtual_host_alias
node['confluence']['apache2']['virtual_host_alias'] || node['hostname']
end

# rubocop:disable Metrics/AbcSize
def confluence_database_connection
settings = merge_confluence_settings
Expand Down Expand Up @@ -270,3 +278,4 @@ def confluence_checksum_map

::Chef::Recipe.send(:include, Confluence::Helpers)
::Chef::Resource.send(:include, Confluence::Helpers)
::Chef::Mixin::Template::TemplateContext.send(:include, Confluence::Helpers)
2 changes: 1 addition & 1 deletion recipes/apache2.rb
View file
Open in desktop
Expand Up @@ -25,4 +25,4 @@
include_recipe 'apache2::mod_proxy_http'
include_recipe 'apache2::mod_ssl'

web_app node['confluence']['apache2']['virtual_host_alias']
web_app confluence_virtual_host_alias
2 changes: 1 addition & 1 deletion templates/default/server.xml.erb
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@
compressableMimeType="text/html,text/xml,text/plain,text/css,application/json,application/javascript,application/x-javascript"
secure="true"
scheme="https"
proxyName="<%= node['confluence']['apache2']['virtual_host_name'] %>"
proxyName="<%= confluence_virtual_host_name %>"
proxyPort="<%= node['confluence']['apache2']['ssl']['port'] %>"
redirectPort="<%= node['confluence']['apache2']['ssl']['port'] %>"
/>
Expand Down
18 changes: 8 additions & 10 deletions templates/default/web_app.conf.erb
View file
Open in desktop
Expand Up @@ -3,12 +3,11 @@
# Local modifications will be overwritten by Chef.
#
<VirtualHost *:<%= node['confluence']['apache2']['port'] %>>
<% unless node['confluence']['apache2']['virtual_host_name'].empty? -%>
ServerName <%= node['confluence']['apache2']['virtual_host_name'] %>
<% unless confluence_virtual_host_name.nil? || confluence_virtual_host_name.empty? -%>
ServerName <%= confluence_virtual_host_name %>
<% end -%>
<% unless node['confluence']['apache2']['virtual_host_alias'].empty? -%>
<% virtual_host_aliases = node['confluence']['apache2']['virtual_host_alias'].kind_of?(Array) ? node['confluence']['apache2']['virtual_host_alias'] : [ node['confluence']['apache2']['virtual_host_alias'] ] -%>
<% virtual_host_aliases.each do |virtual_host_alias| -%>
<% unless confluence_virtual_host_alias.empty? -%>
<% Array(confluence_virtual_host_alias).each do |virtual_host_alias| -%>
ServerAlias <%= virtual_host_alias %>
<% end -%>
<% end -%>
Expand All @@ -24,12 +23,11 @@
</VirtualHost>

<VirtualHost *:<%= node['confluence']['apache2']['ssl']['port'] %>>
<% unless node['confluence']['apache2']['virtual_host_name'].empty? -%>
ServerName <%= node['confluence']['apache2']['virtual_host_name'] %>
<% unless confluence_virtual_host_name.nil? || confluence_virtual_host_name.empty? -%>
ServerName <%= confluence_virtual_host_name %>
<% end -%>
<% unless node['confluence']['apache2']['virtual_host_alias'].empty? -%>
<% virtual_host_aliases = node['confluence']['apache2']['virtual_host_alias'].kind_of?(Array) ? node['confluence']['apache2']['virtual_host_alias'] : [ node['confluence']['apache2']['virtual_host_alias'] ] -%>
<% virtual_host_aliases.each do |virtual_host_alias| -%>
<% unless confluence_virtual_host_alias.empty? -%>
<% Array(confluence_virtual_host_alias).each do |virtual_host_alias| -%>
ServerAlias <%= virtual_host_alias %>
<% end -%>
<% end -%>
Expand Down