Page MenuHomeSoftware Heritage
Files F7437746

No OneTemporary
Actions

View Options

diff --git a/site-modules/profile/manifests/swh/deploy/counters/journal_client.pp b/site-modules/profile/manifests/swh/deploy/counters/journal_client.pp
index fa3bc54f..8a20aee1 100644
--- a/site-modules/profile/manifests/swh/deploy/counters/journal_client.pp
+++ b/site-modules/profile/manifests/swh/deploy/counters/journal_client.pp
@@ -1,35 +1,40 @@
# Deployment of the swh.counters.journal_client
class profile::swh::deploy::counters::journal_client {
include ::profile::swh::deploy::base_counters
include ::profile::swh::deploy::journal
$config_file = lookup('swh::deploy::counters::journal_client::config_file')
$config = lookup('swh::deploy::counters::journal_client::config')
$user = lookup('swh::deploy::base_counters::user')
$group = lookup('swh::deploy::base_counters::group')
$service_name = 'swh-counters-journal-client'
$unit_name = "${service_name}.service"
+ $sentry_dsn = lookup("swh::deploy::counters::sentry_dsn", Optional[String], 'first', undef)
+ $sentry_environment = lookup("swh::deploy::counters::sentry_environment", Optional[String], 'first', undef)
+ $sentry_swh_package = lookup("swh::deploy::counters::sentry_swh_package", Optional[String], 'first', undef)
file {$config_file:
ensure => present,
owner => 'root',
group => $group,
mode => '0640',
content => inline_template("<%= @config.to_yaml %>\n"),
notify => Service[$service_name],
}
# Template uses variables
# - $user
# - $group
- #
+ # - $sentry_dsn
+ # - $sentry_environment
+ # - $sentry_swh_package
::systemd::unit_file {$unit_name:
ensure => present,
content => template("profile/swh/deploy/journal/${unit_name}.erb"),
} ~> service {$service_name:
ensure => running,
enable => true,
}
}
diff --git a/site-modules/profile/templates/swh/deploy/journal/swh-counters-journal-client.service.erb b/site-modules/profile/templates/swh/deploy/journal/swh-counters-journal-client.service.erb
index 810be0b3..22e4869b 100644
--- a/site-modules/profile/templates/swh/deploy/journal/swh-counters-journal-client.service.erb
+++ b/site-modules/profile/templates/swh/deploy/journal/swh-counters-journal-client.service.erb
@@ -1,18 +1,27 @@
# Search Journal Client Template unit file
# Managed by puppet class profile::swh::deploy::counters::journal_client
# Changes will be overwritten
[Unit]
Description=Software Heritage Counters Journal Client
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
ExecStart=/usr/bin/swh counters --config-file <%= @config_file %> journal-client
Restart=always
RestartSec=10
[Install]
WantedBy=multi-user.target

File Metadata

Mime Type
text/x-diff
Expires
Tue, Apr 15, 4:07 AM (10 h, 12 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3268396

Event Timeline

About · Developer information · Legal