Merge pull request #34 from antoineco/fix-context-user

user/group params for context.xml
antoineco · Jul 6, 2016 · cf59f24 · cf59f24
2 parents d812086 + 1970822
commit cf59f24
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/manifests/context.pp b/manifests/context.pp
@@ -2,6 +2,8 @@
 #
 define tomcat::context (
   $path,
+  $owner            = $::tomcat::tomcat_user_real,
+  $group            = $::tomcat::tomcat_group_real,
   $params           = {},
   $loader           = {},
   $manager          = {},
@@ -28,8 +30,8 @@
   # generate and manage context configuration
   concat { "${name} tomcat context":
     path   => $path,
-    owner  => $::tomcat::tomcat_user_real,
-    group  => $::tomcat::tomcat_group_real,
+    owner  => $owner,
+    group  => $group,
     mode   => '0600',
     order  => 'numeric',
     notify => Service[$::tomcat::service_name_real]

diff --git a/manifests/instance.pp b/manifests/instance.pp
@@ -898,6 +898,8 @@
   # generate and manage context configuration
   ::tomcat::context { "instance ${name} default":
     path             => "${catalina_base_real}/conf/context.xml",
+    owner            => $tomcat_user,
+    group            => $tomcat_group,
     params           => $context_params,
     loader           => $context_loader,
     manager          => $context_manager,