4 Commits

3 changed files with 48 additions and 26 deletions

View File

@@ -8,15 +8,21 @@
"automatic": {
"fqdn": "ejabberd-3",
"os": "linux",
"os_version": "5.4.0-1026-kvm",
"os_version": "5.4.0-1051-kvm",
"hostname": "ejabberd-3",
"ipaddress": "192.168.122.93",
"roles": [
"ejabberd",
"postgresql_client"
],
"recipes": [
"kosmos-base",
"kosmos-base::default",
"kosmos_postgresql::hostsfile",
"kosmos-ejabberd",
"kosmos-ejabberd::default",
"kosmos-ejabberd::letsencrypt",
"kosmos-ejabberd::backup",
"apt::default",
"timezone_iii::default",
"timezone_iii::debian",
@@ -30,19 +36,25 @@
"postfix::_common",
"postfix::_attributes",
"postfix::sasl_auth",
"hostname::default"
"hostname::default",
"kosmos-ejabberd::firewall",
"tor-full::default",
"kosmos-base::letsencrypt",
"backup::default",
"logrotate::default"
],
"platform": "ubuntu",
"platform_version": "20.04",
"cloud": null,
"chef_packages": {
"ohai": {
"version": "15.12.0",
"ohai_root": "/opt/chef/embedded/lib/ruby/gems/2.6.0/gems/ohai-15.12.0/lib/ohai"
},
"chef": {
"version": "15.15.1",
"chef_root": "/opt/chef/embedded/lib/ruby/gems/2.6.0/gems/chef-15.15.1/lib"
"version": "17.9.26",
"chef_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/chef-17.9.26/lib",
"chef_effortless": null
},
"ohai": {
"version": "17.9.1",
"ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/ohai-17.9.1/lib/ohai"
}
}
},
@@ -50,4 +62,4 @@
"recipe[kosmos-base]",
"role[ejabberd]"
]
}
}

View File

@@ -8,15 +8,21 @@
"automatic": {
"fqdn": "ejabberd-4",
"os": "linux",
"os_version": "5.4.0-1026-kvm",
"os_version": "5.4.0-1051-kvm",
"hostname": "ejabberd-4",
"ipaddress": "192.168.122.39",
"roles": [
"ejabberd",
"postgresql_client"
],
"recipes": [
"kosmos-base",
"kosmos-base::default",
"kosmos_postgresql::hostsfile",
"kosmos-ejabberd",
"kosmos-ejabberd::default",
"kosmos-ejabberd::letsencrypt",
"kosmos-ejabberd::backup",
"apt::default",
"timezone_iii::default",
"timezone_iii::debian",
@@ -30,19 +36,25 @@
"postfix::_common",
"postfix::_attributes",
"postfix::sasl_auth",
"hostname::default"
"hostname::default",
"kosmos-ejabberd::firewall",
"tor-full::default",
"kosmos-base::letsencrypt",
"backup::default",
"logrotate::default"
],
"platform": "ubuntu",
"platform_version": "20.04",
"cloud": null,
"chef_packages": {
"ohai": {
"version": "15.12.0",
"ohai_root": "/opt/chef/embedded/lib/ruby/gems/2.6.0/gems/ohai-15.12.0/lib/ohai"
},
"chef": {
"version": "15.15.1",
"chef_root": "/opt/chef/embedded/lib/ruby/gems/2.6.0/gems/chef-15.15.1/lib"
"version": "17.9.26",
"chef_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/chef-17.9.26/lib",
"chef_effortless": null
},
"ohai": {
"version": "17.9.1",
"ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.0.0/gems/ohai-17.9.1/lib/ohai"
}
}
},
@@ -50,4 +62,4 @@
"recipe[kosmos-base]",
"role[ejabberd]"
]
}
}

View File

@@ -47,7 +47,7 @@ file "/opt/ejabberd/.hosts.erlang" do
mode "0644"
owner "ejabberd"
group "ejabberd"
content ejabberd_hostnames.join(".\n")
content ejabberd_hostnames.map{|h| "#{h}."}.join("\n")
end
ruby_block "configure ERLANG_NODE" do
@@ -167,8 +167,7 @@ template "/opt/ejabberd/conf/ejabberd.yml" do
end
execute "ejabberdctl reload_config" do
# command "/opt/ejabberd-#{ejabberd_version}/bin/ejabberdctl reload_config"
command ""
command "/opt/ejabberd-#{ejabberd_version}/bin/ejabberdctl reload_config"
action :nothing
end
@@ -181,7 +180,7 @@ file "/lib/systemd/system/ejabberd.service" do
content lazy { IO.read("/opt/ejabberd-#{ejabberd_version}/bin/ejabberd.service") }
action :nothing
notifies :run, "execute[systemctl daemon-reload]", :immediately
# notifies :restart, "service[ejabberd]", :delayed
notifies :restart, "service[ejabberd]", :delayed
end
execute "systemctl daemon-reload" do
@@ -200,8 +199,7 @@ end
end
service "ejabberd" do
action [:enable]
# action [:enable, :start]
action [:enable, :start]
end
unless node.chef_environment == "development"