Merge branch 'master' into vu-release

thehyve · Aug 21, 2018 · 0525d6b · 0525d6b
2 parents 662907a + a395bef
commit 0525d6b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -82,6 +82,7 @@
         ensure     => present,
         home       => $tsloader_home,
         managehome => true,
+        shell      => '/bin/bash',
     }
     -> file { $tsloader_home:
         ensure => directory,

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -38,6 +38,11 @@
     Enum['api-server', 'app-server'] $server_type
         = lookup('transmart_core::server_type', Enum['api-server', 'app-server'], first, 'app-server'),
 
+    Boolean $notifications_enabled       = lookup('transmart_core::notifications_enabled', Boolean, first, false),
+    Integer $notifications_sets          = lookup('transmart_core::notifications_sets', Integer, first, 20),
+    Integer[0,23] $notifications_trigger_hour = lookup('transmart_core::notifications_trigger_hour', Integer[0,23], first, 0),
+    Integer[0,59] $notifications_trigger_minute = lookup('transmart_core::notifications_trigger_minute', Integer[0,59], first, 0),
+
     Optional[String] $keycloak_realm         = lookup('transmart_core::keycloak_realm', Optional[String], first, undef),
     Optional[String] $keycloak_server_url    = lookup('transmart_core::keycloak_server_url', Optional[String], first, undef),
     Optional[String] $keycloak_client_id     = lookup('transmart_core::keycloak_client_id', Optional[String], first, undef),

diff --git a/templates/config/transmart-api-server/config.yml.erb b/templates/config/transmart-api-server/config.yml.erb
@@ -52,4 +52,16 @@ keycloak:
 
 keycloakOffline:
     offlineToken: <%= scope.lookupvar('::transmart_core::params::keycloak_offline_token') %>
-<% end -%>
+<% end -%>
+
+<% if scope.lookupvar('::transmart_core::params::notifications_enabled') -%>
+org.transmartproject.notifications:
+    # enable daily and weekly notification jobs
+    enabled: true
+    # max number of query sets returned in a subscription email
+    maxNumberOfSets: <%= scope.lookupvar('::transmart_core::params::notifications_sets').to_s %>
+    # daily cron job trigger time in format: hh-mm
+    # hh: Hour, range: 0-23;
+    # mm: Minute, range: 0-59;
+    dailyJobTriggerTime: <%= scope.lookupvar('::transmart_core::params::notifications_trigger_hour').to_s %>-<%= scope.lookupvar('::transmart_core::params::notifications_trigger_minute').to_s %>
+<% end -%>