kosmos/chef
kosmos/chef
8
3
Fork 0
Code Issues 30 Pull Requests 3 Projects 2 Activity

Merge branch 'bugfix/80-xmpp_uploads_location' of kosmos/chef into master

Browse Source
This commit is contained in:
gregkare 2019-07-19 17:12:11 +00:00 committed by Gitea
commit 60a6a9da73
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
site-cookbooks/kosmos-ejabberd/metadata.rb
View File

@ -4,7 +4,7 @@ maintainer_email 'ops@kosmos.org'
license 'MIT' license 'MIT'
description 'Installs/Configures kosmos-ejabberd' description 'Installs/Configures kosmos-ejabberd'
long_description 'Installs/Configures kosmos-ejabberd' long_description 'Installs/Configures kosmos-ejabberd'
version '0.1.0' version '0.1.1'
chef_version '>= 12.14' if respond_to?(:chef_version) chef_version '>= 12.14' if respond_to?(:chef_version)
# The `issues_url` points to the location where issues for this cookbook are # The `issues_url` points to the location where issues for this cookbook are

9
site-cookbooks/kosmos-ejabberd/recipes/default.rb
View File

@ -111,14 +111,7 @@ end
# Set permissions for the upload folders # Set permissions for the upload folders
%w(xmpp.kosmos.org xmpp.5apps.com).each do |domain| %w(xmpp.kosmos.org xmpp.5apps.com).each do |domain|
directory "/var/www/#{domain}" do directory "/opt/ejabberd/uploads/#{domain}" do
owner "ejabberd"
group "ejabberd"
mode 0750
recursive true
end
directory "/var/www/#{domain}/uploads" do
owner "ejabberd" owner "ejabberd"
group "ejabberd" group "ejabberd"
mode 0750 mode 0750

2
site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb
View File

@ -208,7 +208,7 @@ modules:
urls: ["mailto:abuse@@HOST@"] urls: ["mailto:abuse@@HOST@"]
mod_bosh: {} mod_bosh: {}
mod_http_upload: mod_http_upload:
docroot: "/var/www/xmpp.@HOST@/uploads/" docroot: "/opt/ejabberd/uploads/xmpp.@HOST@/"
put_url: "https://xmpp.@HOST@:5443/upload" put_url: "https://xmpp.@HOST@:5443/upload"
thumbnail: false # otherwise needs the identify command from ImageMagick installed thumbnail: false # otherwise needs the identify command from ImageMagick installed
mod_last: {} mod_last: {}