From d135b3873c3c05c8cdaa065ced017ea8f7d1a936 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Fri, 9 Jul 2021 11:32:33 +0200 Subject: [PATCH] Switch to a systemd unit Chef resource --- site-cookbooks/sockethub/recipes/default.rb | 44 +++++++++++-------- .../default/nodejs.systemd.service.erb | 16 ------- 2 files changed, 26 insertions(+), 34 deletions(-) delete mode 100644 site-cookbooks/sockethub/templates/default/nodejs.systemd.service.erb diff --git a/site-cookbooks/sockethub/recipes/default.rb b/site-cookbooks/sockethub/recipes/default.rb index 052a927..59f6412 100644 --- a/site-cookbooks/sockethub/recipes/default.rb +++ b/site-cookbooks/sockethub/recipes/default.rb @@ -27,11 +27,15 @@ include_recipe 'kosmos-nodejs' include_recipe 'kosmos-redis' -group "sockethub" do +user = "sockethub" +group = "sockethub" +entry = "/usr/bin/sockethub" + +group group do gid 7625 end -user "sockethub" do +user user do comment "sockethub user" uid 7625 gid 7625 @@ -57,21 +61,25 @@ unless node['sockethub']['debug_logs'].nil? environment_variables['DEBUG'] = node['sockethub']['debug_logs'] end -template "/lib/systemd/system/sockethub_nodejs.service" do - source 'nodejs.systemd.service.erb' - owner 'root' - group 'root' - mode '0644' - variables( - user: "sockethub", - group: "sockethub", - entry: "/usr/bin/sockethub", - environment: environment_variables - ) - notifies :run, "execute[systemctl daemon-reload]", :delayed - notifies :restart, "service[sockethub_nodejs]", :delayed -end +environment = environment_variables.map{|k, v| "'#{k}=#{v}'"}.join(' ') -service "sockethub_nodejs" do - action [:enable, :start] +systemd_unit "sockethub_nodejs.service" do + content <<-EOF +[Unit] +Description=Start sockethub +Requires=redis-server.service +After=redis-server.service + +[Service] +ExecStart=#{entry} +User=#{user} +Group=#{group} +Environment=#{environment} +Restart=always + +[Install] +WantedBy=multi-user.target + EOF + triggers_reload true + action [:create, :enable, :start] end diff --git a/site-cookbooks/sockethub/templates/default/nodejs.systemd.service.erb b/site-cookbooks/sockethub/templates/default/nodejs.systemd.service.erb deleted file mode 100644 index 2c42623..0000000 --- a/site-cookbooks/sockethub/templates/default/nodejs.systemd.service.erb +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Start nodejs app -Requires=redis-server.service -After=redis-server.service - -[Service] -ExecStart=<%= @entry %> -User=<%= @user %> -Group=<%= @group %> -<% unless @environment.empty? -%> -Environment=<% @environment.each do |key, value| -%>'<%= key %>=<%= value %>' <% end %> -<% end -%> -Restart=always - -[Install] -WantedBy=multi-user.target