From 052b1599d3755c900c25bda18bee78b4cc816aa2 Mon Sep 17 00:00:00 2001 From: Bryan Stopp Date: Thu, 30 Aug 2018 15:44:43 -0500 Subject: [PATCH 1/2] Allow consumers to sepecify working directory. --- manifests/init.pp | 2 ++ templates/wildfly.systemd.service.epp | 3 +++ templates/wildfly.sysvinit.service.epp | 3 +++ 3 files changed, 8 insertions(+) diff --git a/manifests/init.pp b/manifests/init.pp index 28e588fe..c5defdef 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -50,6 +50,7 @@ # @param user User to own `JBOSS_HOME`. If `manage_user` is `true`, this user will be managed. # @param user_home User home directory. Defaults to '/home/wildfly' # @param version Sets the Wildfly version managed in order to handle small differences among versions. +# @param working_dir Sets the working directory for the service. class wildfly( Pattern[/^(\d{1,}\.\d{1,}(\.\d{1,})?$)/] $version = '9.0.2', Variant[Pattern[/^file:\/\//], Pattern[/^puppet:\/\//], Stdlib::Httpsurl, Stdlib::Httpurl] $install_source = "http://download.jboss.org/wildfly/${version}.Final/wildfly-${version}.Final.tar.gz", @@ -111,6 +112,7 @@ Optional[String] $java_opts = undef, Optional[String] $jboss_opts = undef, Optional[String] $overlay_class = undef, + Optional[String] $working_dir = undef, ) { contain wildfly::prepare diff --git a/templates/wildfly.systemd.service.epp b/templates/wildfly.systemd.service.epp index 0e326d61..bfd5e18b 100644 --- a/templates/wildfly.systemd.service.epp +++ b/templates/wildfly.systemd.service.epp @@ -11,6 +11,9 @@ LimitNOFILE=102642 ExecStart=<%= $wildfly::dirname %>/bin/launch.sh ${WILDFLY_MODE} ${WILDFLY_CONFIG} Restart=always RestartSec=20 +<%- if $wildfly::working_dir {-%> +WorkingDirectory=<%= $wildfly::working_dir %> +<%- } -%> [Install] WantedBy=multi-user.target diff --git a/templates/wildfly.sysvinit.service.epp b/templates/wildfly.sysvinit.service.epp index 132e9df8..027ba65a 100644 --- a/templates/wildfly.sysvinit.service.epp +++ b/templates/wildfly.sysvinit.service.epp @@ -6,6 +6,9 @@ After=syslog.target network.target Type=forking ExecStart=/etc/init.d/<%= $wildfly::service::service_name %> start ExecStop=/etc/init.d/<%= $wildfly::service::service_name %> stop +<%- if $wildfly::working_dir {-%> +WorkingDirectory=<%= $wildfly::working_dir %> +<%- } -%> [Install] WantedBy=multi-user.target From b7bb06c5358cb140828c5f478841f7f6f2f177e8 Mon Sep 17 00:00:00 2001 From: Bryan Stopp Date: Thu, 30 Aug 2018 16:49:57 -0500 Subject: [PATCH 2/2] Be more specific about the type of parameter. --- manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index c5defdef..d077452c 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -112,7 +112,7 @@ Optional[String] $java_opts = undef, Optional[String] $jboss_opts = undef, Optional[String] $overlay_class = undef, - Optional[String] $working_dir = undef, + Optional[Stdlib::Unixpath] $working_dir = undef, ) { contain wildfly::prepare