Page MenuHomeSoftware Heritage

D6485.diff
No OneTemporary

D6485.diff

diff --git a/site-modules/profile/manifests/swh/deploy/search/journal_client.pp b/site-modules/profile/manifests/swh/deploy/search/journal_client.pp
--- a/site-modules/profile/manifests/swh/deploy/search/journal_client.pp
+++ b/site-modules/profile/manifests/swh/deploy/search/journal_client.pp
@@ -10,10 +10,15 @@
$user = lookup('swh::deploy::base_search::user')
$group = lookup('swh::deploy::base_search::group')
+ $sentry_dsn = lookup("swh::deploy::search::sentry_dsn", Optional[String], 'first', undef)
+ $sentry_environment = lookup("swh::deploy::search::sentry_environment", Optional[String], 'first', undef)
+ $sentry_swh_package = lookup("swh::deploy::search::sentry_swh_package", Optional[String], 'first', undef)
+
# Uses:
# - $config_directory
# - $user
# - $group
+ # - $sentry_{dsn,environment,swh_package}
systemd::unit_file {$systemd_template_unit_name:
ensure => 'present',
content => template("profile/swh/deploy/journal/${systemd_template_unit_name}.erb"),
diff --git a/site-modules/profile/templates/swh/deploy/journal/swh-search-journal-client@.service.erb b/site-modules/profile/templates/swh/deploy/journal/swh-search-journal-client@.service.erb
--- a/site-modules/profile/templates/swh/deploy/journal/swh-search-journal-client@.service.erb
+++ b/site-modules/profile/templates/swh/deploy/journal/swh-search-journal-client@.service.erb
@@ -7,6 +7,15 @@
After=network.target
[Service]
+<%- if !@sentry_dsn.nil? and !@sentry_dsn.empty? -%>
+Environment=SWH_SENTRY_DSN=<%= @sentry_dsn %>
+<%- end -%>
+<%- if !@sentry_environment.nil? and !@sentry_environment.empty? -%>
+Environment=SWH_SENTRY_ENVIRONMENT=<%= @sentry_environment %>
+<%- end -%>
+<%- if !@sentry_swh_package.nil? and !@sentry_swh_package.empty? -%>
+Environment=SWH_MAIN_PACKAGE=<%= @sentry_swh_package %>
+<%- end -%>
User=<%= @user %>
Group=<%= @group %>
Type=simple

File Metadata

Mime Type
text/plain
Expires
Sun, Aug 17, 7:49 PM (1 w, 20 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3228602

Event Timeline