Merge pull request #334 from tuxmea/fix_systemd

Fix systemd templates
voxpupuli · Aug 27, 2024 · 8be98d1 · 8be98d1
2 parents 35ba308 + 3d6e74e
commit 8be98d1
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git a/functions/service_config.pp b/functions/service_config.pp
@@ -26,7 +26,7 @@ function wildfly::service_config(
         'conf_file'        => '/etc/default/jboss-eap.conf',
         'conf_template'    => 'wildfly/wildfly.sysvinit.conf',
         'service_file'     => 'bin/init.d/jboss-eap-rhel.sh',
-        'systemd_template' => 'jboss-eap/jboss-eap.systemd.service',
+        'systemd_template' => 'wildfly/jboss-eap.systemd.service',
       }
     }
     default: {

diff --git a/manifests/service/systemd.pp b/manifests/service/systemd.pp
@@ -8,7 +8,7 @@
     owner   => $wildfly::user,
     group   => $wildfly::group,
     # need to manage this until it's fixed in the upstream
-    content => file('wildfly/launch.sh'),
+    content => epp('wildfly/launch.sh.epp'),
     before  => File["/etc/systemd/system/${wildfly::service::service_name}.service"],
   }
 

diff --git a/spec/functions/service_config_spec.rb b/spec/functions/service_config_spec.rb
@@ -21,7 +21,7 @@
     let(:version) { '7.0' }
 
     it 'using systemd' do
-      is_expected.to run.with_params(distribution, version, 'standalone').and_return('service_file' => 'bin/init.d/jboss-eap-rhel.sh', 'conf_file' => '/etc/default/jboss-eap.conf', 'service_name' => 'jboss-eap', 'conf_template' => 'wildfly/wildfly.sysvinit.conf', 'systemd_template' => 'jboss-eap/jboss-eap.systemd.service')
+      is_expected.to run.with_params(distribution, version, 'standalone').and_return('service_file' => 'bin/init.d/jboss-eap-rhel.sh', 'conf_file' => '/etc/default/jboss-eap.conf', 'service_name' => 'jboss-eap', 'conf_template' => 'wildfly/wildfly.sysvinit.conf', 'systemd_template' => 'wildfly/jboss-eap.systemd.service')
     end
   end
 end
diff --git a/templates/jboss-eap.systemd.service.epp b/templates/jboss-eap.systemd.service.epp
@@ -9,7 +9,7 @@ User=<%= $wildfly::user %>
 Group=<%= $wildfly::group %>
 EnvironmentFile=/etc/default/jboss-eap.conf
 LimitNOFILE=102642
-ExecStart=<%= $wildfly::dirname %>/bin/standalone.sh ${WILDFLY_MODE} ${WILDFLY_CONFIG}
+ExecStart=<%= $wildfly::dirname %>/bin/launch.sh ${WILDFLY_MODE} ${WILDFLY_CONFIG}
 Restart=always
 RestartSec=20
 StandardOutput=null

diff --git a/templates/launch.sh.epp b/templates/launch.sh.epp
@@ -0,0 +1,15 @@
+#!/bin/bash
+# THIS FILE IS MANAGED BY PUPPET
+
+if [ "x$WILDFLY_HOME" = "x" ]; then
+    WILDFLY_HOME="<%= $wildfly::dirname %>"
+fi
+
+mode="$1"
+shift
+
+if [[ "$mode" == "domain" ]]; then
+    exec $WILDFLY_HOME/bin/domain.sh -c "$@"
+else
+    exec $WILDFLY_HOME/bin/standalone.sh -c "$@"
+fi