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

Merge branch 'bugfix/153-update_ejabberd_20.03' of kosmos/chef into master

Browse Source
This commit is contained in:
Greg 2020-04-21 13:38:53 +00:00
commit ee13c3cbe9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
site-cookbooks/kosmos-ejabberd/attributes/default.rb
View File

@ -1,5 +1,5 @@
node.default["kosmos-ejabberd"]["version"] = "20.02" node.default["kosmos-ejabberd"]["version"] = "20.03"
node.default["kosmos-ejabberd"]["checksum"] = "2ecbf7025195afaa41996cb6f1c2b5fac661f2880238506a459779051129bc93" node.default["kosmos-ejabberd"]["checksum"] = "f0ccf1c47c3a30303140f08c887998ee34e731f34ea240d56748a68aa2a2e303"
node.override["tor"]["HiddenServices"]["ejabberd"] = { node.override["tor"]["HiddenServices"]["ejabberd"] = {
"HiddenServicePorts" => [ "HiddenServicePorts" => [

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

@ -38,7 +38,7 @@ package_checksum = node["kosmos-ejabberd"]["checksum"]
package_path = "#{Chef::Config['file_cache_path']}/ejabberd_#{ejabberd_version}-0_amd64.deb" package_path = "#{Chef::Config['file_cache_path']}/ejabberd_#{ejabberd_version}-0_amd64.deb"
remote_file package_path do remote_file package_path do
source "https://www.process-one.net/downloads/downloads-action.php?file=/ejabberd/#{ejabberd_version}/ejabberd_#{ejabberd_version}-0_amd64.deb" source "https://www.process-one.net/downloads/downloads-action.php?file=/#{ejabberd_version}/ejabberd_#{ejabberd_version}-0_amd64.deb"
checksum package_checksum checksum package_checksum
notifies :install, "dpkg_package[ejabberd]", :immediately notifies :install, "dpkg_package[ejabberd]", :immediately
end end
@ -122,7 +122,7 @@ hosts.each do |host|
execute "create db schema #{host[:sql_database]}" do execute "create db schema #{host[:sql_database]}" do
user "ejabberd" user "ejabberd"
command "psql #{host[:sql_database]}} < #{Chef::Config[:file_cache_path]}/pg.sql" command "psql #{host[:sql_database]} < #{Chef::Config[:file_cache_path]}/pg.sql"
action :nothing action :nothing
end end