Skip to content

Commit

Permalink
make this working
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelSp committed Jun 4, 2015
1 parent 7f9ce9c commit 661b706
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@

postgresql_connection_info = {
:host => 'localhost',
:port => node['postgresql']['config']['port'],
:port => node['owncloud']['config']['dbport'],
:username => 'postgres',
:password => node['postgresql']['password']['postgres']
}
Expand Down Expand Up @@ -329,7 +329,7 @@
template 'autoconfig.php' do
path ::File.join(node['owncloud']['dir'], 'config', 'autoconfig.php')
source 'autoconfig.php.erb'
if node['owncloud']['skip_permissions'] == false
unless node['owncloud']['skip_permissions']
owner node[web_server]['user']
group node[web_server]['group']
mode 00640
Expand Down Expand Up @@ -370,6 +370,7 @@
[ node['owncloud']['server_name'], node['owncloud']['server_aliases'] ].flatten.each do |domain|
cookbook_config['trusted_domains'] << domain unless cookbook_config['trusted_domains'].include?(domain)
end
cookbook_config['dbhost'] = "#{cookbook_config['dbhost']}:#{cookbook_config['dbport']}"
config.merge(cookbook_config)
config.write
unless Chef::Config[:solo]
Expand Down

0 comments on commit 661b706

Please sign in to comment.