itamae-plugin-recipe-god 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1b70fe8e84fc466697e182390318c5401c0091aef1cc25b2a3fd83ddbaaf9bc
-  data.tar.gz: a7ed4454a7885d23f7952a5a13972acb006313529988f8daf7a91d0c690e2c5b
+  metadata.gz: 245430e7055f897fa389e0aeec9fffd1724b031988001100b301876dec289d8e
+  data.tar.gz: e5a73d60a8c8c5beb26d715f6abd0c76e8be8b5d3dd5cfc8dbd6a4acc92c1f13
 SHA512:
-  metadata.gz: a34d4c8b837f40d647a1e65f1fe4a2204445879aafc444b5c3884b39868eda5653c27c221902b860ad2625f82232282a03f7b196a6ae8188303222371384993a
-  data.tar.gz: cedce7b9ed154c8a251b2cc3f631528f5f5966183922f0f0063213c8109c9d4a4ac580c939c414013b3fcf3407a70213b7113dac00ef8fa9b0214f6e9f07e2be
+  metadata.gz: 047b27c798e863018afe57a9212216b570a641213fc8cf844aeae5ee6e350817f52776437b38fa0b7d67e46581460636427cf1ca6aa0b8fa570496b97001aa12
+  data.tar.gz: '0423694d749c5235f49a493d97488af9bc690d0995841a8ef89787a25792df04d57b6d33ca3202a22b8ee668564e067987f56866fc534769bb9d8836bfd5eafe'

data/lib/itamae/plugin/recipe/god/install.rb

@@ -40,7 +40,9 @@ template '/etc/god/master.conf' do
   mode '644'
 end
 
+ruby_bin_dir = node.languages.ruby.bin_dir rescue nil
 service_variables = {
+  god_bin: (ruby_bin_dir ? "#{ruby_bin_dir}/god" : 'god'),
   pid: '/var/run/god.pid',
   config: '/etc/god/master.conf',
   log: '/var/log/god.log',

data/lib/itamae/plugin/recipe/god/templates/etc/init.d/god.erb

@@ -8,6 +8,7 @@
 
 . /etc/rc.d/init.d/functions
 
+GOD_BIN=<%= @god_bin %>
 PID=<%= @pid %>
 CONFIG=<%= @config %>
 LOG=<%= @log %>
@@ -17,27 +18,27 @@ RETVAL=0
 case "$1" in
     start)
       echo -n 'Starting god: '
-      god -P $PID -c $CONFIG -l $LOG --log-level <%= @log_level %>
+      $GOD_BIN -P $PID -c $CONFIG -l $LOG --log-level <%= @log_level %>
       echo
       RETVAL=$?
   ;;
     stop)
       echo -n 'Stopping god: '
-      god quit
+      $GOD_BIN quit
       echo
       RETVAL=$?
   ;;
     restart)
       echo -n 'Stopping god: '
-      god quit
+      $GOD_BIN quit
       echo
       echo -n 'Starting god: '
-      god -P $PID -c $CONFIG -l $LOG --log-level <%= @log_level %>
+      $GOD_BIN -P $PID -c $CONFIG -l $LOG --log-level <%= @log_level %>
       echo
       RETVAL=$?
   ;;
     status)
-      god status
+      $GOD_BIN status
       RETVAL=$?
   ;;
     *)

data/lib/itamae/plugin/recipe/god/templates/etc/systemd/system/god.service.erb

@@ -3,10 +3,14 @@ Description=God: A process monitoring framework in Ruby
 After=network.target
 
 [Service]
+Environment="CONF_FILE=<%= @config %>"
+Environment="PID_FILE=<%= @pid %>"
+Environment="LOG_FILE=<%= @log %>"
+Environment="LOG_LEVEL=<%= @pid %>"
 EnvironmentFile=-/etc/sysconfig/god
-PIDFile=<%= @pid %>
-ExecStart=<%= `which god`.chomp %> -c <%= @config %> -P <%= @pid %> -l <%= @log %> --log-level <%= @log_level %>
-ExecStop=<%= `which god`.chomp %> quit
+PIDFile=$PID_FILE
+ExecStart=<%= @god_bin %> -c $CONF_FILE -P $PID_FILE -l $LOG_FILE --log-level $LOG_LEVEL
+ExecStop=<%= @god_bin %> quit
 
 [Install]
 WantedBy=multi-user.target

data/lib/itamae/plugin/recipe/god/version.rb

@@ -2,7 +2,7 @@ module Itamae
   module Plugin
     module Recipe
       module God
-        VERSION = '0.2.4'
+        VERSION = '0.2.5'
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae-plugin-recipe-god
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - y-matsuda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-11 00:00:00.000000000 Z
+date: 2024-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: itamae