D2576.id9201.diff
No OneTemporary
Actions

Size

21 KB

Subscribers

None

D2576.id9201.diff
View Options

	diff --git a/data/defaults.yaml b/data/defaults.yaml
	--- a/data/defaults.yaml
	+++ b/data/defaults.yaml
	@@ -1272,6 +1272,8 @@
	swh::deploy::group: swhdeploy
	swh::deploy::public_key: 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWrJX/uUss/EYZaTp2EIsZgg3ZSH8JcNZV5gBdNZ7EHcQcqxYUCqmwv9Ss3xT8n9kIrH6iz/vquqf84XR+keoZK3bsp50tMOY8LJWpcl/JK2XD6ovoJrHPu+iAroLkE59RdTa1Vz+jF67Q2UuG9f0nKwL4rnkeWTyuK/zAbyHyYKFQntkkwMr5/YTU8sjl/4aNF/2Ww8hitdi2GORlCjav2bB0wyPBA2e8sMt8Hp9O4TIWg/RD6vPX+ZvuFaB/Lw/Hv21622QGTHoZiO92/8/W9/t24il6SU4z96ZGfXqdUZkpPYKBGwyIkZkS4dN6jb4CcRlyXTObphyu3dAlABRt swhworker@worker01'

	+swh::deploy::storage::sentry_swh_package: swh.storage
	+swh::deploy::storage::sentry_environment: "%{alias('swh::deploy::environment')}"
	swh::deploy::storage::conf_directory: "%{hiera('swh::conf_directory')}/storage"
	swh::deploy::storage::conf_file: "%{hiera('swh::deploy::storage::conf_directory')}/storage.yml"
	swh::deploy::storage::user: swhstorage
	@@ -1302,6 +1304,8 @@
	db: "host=%{hiera('swh::deploy::storage::db::host')} port=%{hiera('swh::deploy::storage::db::port')} user=%{hiera('swh::deploy::storage::db::user')} dbname=%{hiera('swh::deploy::storage::db::dbname')} password=%{hiera('swh::deploy::storage::db::password')}"
	objstorage: "%{alias('swh::remote_service::objstorage::config')}"

	+swh::deploy::indexer::sentry_swh_package: swh.indexer
	+swh::deploy::indexer::storage::sentry_environment: "%{alias('swh::deploy::environment')}"
	swh::deploy::indexer::storage::conf_file: "%{hiera('swh::deploy::storage::conf_directory')}/indexer.yml"
	swh::deploy::indexer::storage::user: swhstorage
	swh::deploy::indexer::storage::group: swhstorage
	@@ -1337,6 +1341,8 @@
	root: "%{hiera('swh::deploy::vault::cache')}"
	slicing: "0:1/1:5"

	+swh::deploy::vault::sentry_swh_package: swh.vault
	+swh::deploy::vault::sentry_environment: "%{alias('swh::deploy::environment')}"
	swh::deploy::vault::conf_directory: "%{hiera('swh::conf_directory')}/vault"
	swh::deploy::vault::conf_file: "%{hiera('swh::deploy::vault::conf_directory')}/server.yml"
	swh::deploy::vault::user: swhvault
	@@ -1392,6 +1398,8 @@
	- origin
	- origin_visit

	+swh::deploy::objstorage::sentry_swh_package: swh.objstorage
	+swh::deploy::objstorage::sentry_environment: "%{alias('swh::deploy::environment')}"
	swh::deploy::objstorage::conf_directory: "%{hiera('swh::conf_directory')}/objstorage"
	swh::deploy::objstorage::conf_file: "%{hiera('swh::deploy::objstorage::conf_directory')}/server.yml"
	swh::deploy::objstorage::user: "%{hiera('swh::deploy::storage::user')}"
	@@ -1444,6 +1452,8 @@
	swh::deploy::vault::e2e::storage: "http://uffizi.internal.softwareheritage.org:%{hiera('swh::remote_service::storage::port')}"
	swh::deploy::vault::e2e::webapp: "https://archive.softwareheritage.org"

	+swh::deploy::deposit::sentry_swh_package: swh.deposit
	+swh::deploy::deposit::sentry_environment: "%{alias('swh::deploy::environment')}"
	swh::deploy::deposit::config_directory: "%{hiera('swh::conf_directory')}/deposit"
	swh::deploy::deposit::config_file: "%{hiera('swh::deploy::deposit::config_directory')}/server.yml"
	swh::deploy::deposit::user: swhdeposit
	@@ -1475,6 +1485,8 @@
	media_root: "%{hiera('swh::deploy::deposit::media_root_directory')}"
	loader-version: 2

	+swh::deploy::loader_deposit::sentry_swh_package: swh.loader.core
	+swh::deploy::loader_deposit::sentry_environment: "%{alias('swh::deploy::environment')}"
	swh::deploy::worker::loader_deposit::config_file: "%{hiera('swh::conf_directory')}/loader_deposit.yml"
	swh::deploy::worker::loader_deposit::concurrency: 1
	swh::deploy::worker::loader_deposit::private_tmp: true
	@@ -1494,6 +1506,8 @@
	username: "%{hiera('deposit_basic_auth_swhworker_username')}"
	password: "%{hiera('deposit_basic_auth_swhworker_password')}"

	+swh::deploy::checker_deposit::sentry_swh_package: swh.deposit.loader
	+swh::deploy::checker_deposit::sentry_environment: "%{alias('swh::deploy::environment')}"
	swh::deploy::worker::checker_deposit::config_file: "%{hiera('swh::conf_directory')}/checker_deposit.yml"
	swh::deploy::worker::checker_deposit::concurrency: 1
	swh::deploy::worker::checker_deposit::private_tmp: true
	@@ -1554,6 +1568,8 @@
	- python-django-common
	swh::deploy::deposit::backported_packages: "%{alias('swh::deploy::webapp::backported_packages')}"

	+swh::deploy::webapp::sentry_swh_package: swh.web
	+swh::deploy::webapp::sentry_environment: "%{alias('swh::deploy::environment')}"
	swh::deploy::webapp::conf_directory: "%{hiera('swh::conf_directory')}/web"
	swh::deploy::webapp::conf_file: "%{hiera('swh::deploy::webapp::conf_directory')}/web.yml"
	swh::deploy::webapp::user: swhwebapp
	@@ -1661,6 +1677,8 @@
	args:
	db: "host=%{hiera('swh::deploy::scheduler::db::host')} port=%{hiera('swh::deploy::scheduler::db::port')} dbname=%{hiera('swh::deploy::scheduler::db::dbname')} user=%{hiera('swh::deploy::scheduler::db::user')} password=%{hiera('swh::deploy::scheduler::db::password')}"

	+swh::deploy::scheduler::sentry_swh_package: swh.scheduler
	+swh::deploy::scheduler::sentry_environment: "%{alias('swh::deploy::environment')}"
	swh::deploy::scheduler::conf_file: "%{hiera('swh::conf_directory')}/scheduler.yml"
	swh::deploy::scheduler::user: swhscheduler
	swh::deploy::scheduler::group: swhscheduler
	@@ -1678,6 +1696,8 @@
	celery:
	task_broker: "%{alias('swh::deploy::scheduler::task_broker')}"

	+swh::deploy::scheduler::remote::sentry_swh_package: swh.scheduler
	+swh::deploy::scheduler::remote::sentry_environment: "%{alias('swh::deploy::environment')}"
	swh::deploy::scheduler::remote::conf_dir: "%{hiera('swh::conf_directory')}/backend"
	swh::deploy::scheduler::remote::conf_file: "%{hiera('swh::deploy::scheduler::remote::conf_dir')}/scheduler.yml"
	swh::deploy::scheduler::remote::user: swhscheduler
	@@ -1734,6 +1754,8 @@
	- loader_git
	- lister

	+swh::deploy::loader_git::sentry_swh_package: swh.loader.git
	+swh::deploy::loader_git::sentry_environment: "%{alias('swh::deploy::environment')}"
	swh::deploy::worker::loader_git::config_file: "%{hiera('swh::conf_directory')}/loader_git.yml"
	swh::deploy::worker::loader_git::concurrency: 4
	swh::deploy::worker::loader_git::loglevel: info
	@@ -1751,6 +1773,8 @@
	- swh.loader.git.tasks.LoadDiskGitRepository
	- swh.loader.git.tasks.UncompressAndLoadDiskGitRepository

	+swh::deploy::loader_debian::sentry_swh_package: swh.loader.core
	+swh::deploy::loader_debian::sentry_environment: "%{alias('swh::deploy::environment')}"
	swh::deploy::worker::loader_debian::config_file: "%{hiera('swh::conf_directory')}/loader_debian.yml"
	swh::deploy::worker::loader_debian::private_tmp: true
	swh::deploy::worker::loader_debian::concurrency: 1
	@@ -1763,6 +1787,8 @@
	task_queues:
	- swh.loader.package.debian.tasks.LoadDebian

	+swh::deploy::loader_archive::sentry_swh_package: swh.loader.core
	+swh::deploy::loader_archive::sentry_environment: "%{alias('swh::deploy::environment')}"
	swh::deploy::worker::loader_archive::config_file: "%{hiera('swh::conf_directory')}/loader_archive.yml"
	swh::deploy::worker::loader_archive::private_tmp: true
	swh::deploy::worker::loader_archive::concurrency: 1
	@@ -1775,6 +1801,8 @@
	task_queues:
	- swh.loader.package.archive.tasks.LoadArchive

	+swh::deploy::loader_cran::sentry_swh_package: swh.loader.core
	+swh::deploy::loader_cran::sentry_environment: "%{alias('swh::deploy::environment')}"
	swh::deploy::worker::loader_cran::config_file: "%{hiera('swh::conf_directory')}/loader_cran.yml"
	swh::deploy::worker::loader_cran::private_tmp: true
	swh::deploy::worker::loader_cran::concurrency: 1
	@@ -1787,6 +1815,8 @@
	task_queues:
	- swh.loader.package.cran.tasks.LoadCRAN

	+swh::deploy::lister::sentry_swh_package: swh.lister
	+swh::deploy::lister::sentry_environment: "%{alias('swh::deploy::environment')}"
	swh::deploy::worker::lister::config_file: "%{hiera('swh::conf_directory')}/lister.yml"
	swh::deploy::worker::lister::concurrency: 5
	swh::deploy::worker::lister::loglevel: warning
	@@ -1814,6 +1844,8 @@
	- swh.lister.pypi.tasks.PyPIListerTask
	credentials: "%{alias('swh::deploy::worker::lister::config::credentials')}"

	+swh::deploy::loader_mercurial::sentry_swh_package: swh.loader.mercurial
	+swh::deploy::loader_mercurial::sentry_environment: "%{alias('swh::deploy::environment')}"
	swh::deploy::worker::loader_mercurial::config_file: "%{hiera('swh::conf_directory')}/loader_mercurial.yml"
	swh::deploy::worker::loader_mercurial::concurrency: 1
	swh::deploy::worker::loader_mercurial::private_tmp: true
	@@ -1829,6 +1861,8 @@
	- swh.loader.mercurial.tasks.LoadMercurial
	- swh.loader.mercurial.tasks.LoadArchiveMercurial

	+swh::deploy::loader_pypi::sentry_swh_package: swh.loader.core
	+swh::deploy::loader_pypi::sentry_environment: "%{alias('swh::deploy::environment')}"
	swh::deploy::worker::loader_pypi::config_file: "%{hiera('swh::conf_directory')}/loader_pypi.yml"
	swh::deploy::worker::loader_pypi::concurrency: 1
	swh::deploy::worker::loader_pypi::private_tmp: true
	@@ -1841,6 +1875,8 @@
	task_queues:
	- swh.loader.package.pypi.tasks.LoadPyPI

	+swh::deploy::loader_npm::sentry_swh_package: swh.loader.core
	+swh::deploy::loader_npm::sentry_environment: "%{alias('swh::deploy::environment')}"
	swh::deploy::worker::loader_npm::config_file: "%{hiera('swh::conf_directory')}/loader_npm.yml"
	swh::deploy::worker::loader_npm::concurrency: 1
	swh::deploy::worker::loader_npm::private_tmp: true
	@@ -1853,6 +1889,8 @@
	task_queues:
	- swh.loader.package.npm.tasks.LoadNpm

	+swh::deploy::loader_svn::sentry_swh_package: swh.loader.svn
	+swh::deploy::loader_svn::sentry_environment: "%{alias('swh::deploy::environment')}"
	swh::deploy::worker::loader_svn::config_file: "%{hiera('swh::conf_directory')}/loader_svn.yml"
	swh::deploy::worker::loader_svn::concurrency: 1
	swh::deploy::worker::loader_svn::private_tmp: true
	@@ -1880,6 +1918,8 @@
	group_id: swh.indexer.journal_client
	scheduler: "%{alias('swh::remote_service::scheduler::config::writable')}"

	+swh::deploy::indexer_content_mimetype::sentry_swh_package: swh.indexer
	+swh::deploy::indexer_content_mimetype::sentry_environment: "%{alias('swh::deploy::environment')}"
	swh::deploy::worker::indexer_content_mimetype::config_file: "%{hiera('swh::conf_directory')}/indexer_content_mimetype.yml"
	swh::deploy::worker::indexer_content_mimetype::concurrency: 1
	swh::deploy::worker::indexer_content_mimetype::loglevel: info
	@@ -1905,6 +1945,8 @@
	debian-package: python3-magic
	write_batch_size: 1000

	+swh::deploy::indexer_origin_intrinsic_metadata::sentry_swh_package: swh.indexer
	+swh::deploy::indexer_origin_intrinsic_metadata::sentry_environment: "%{alias('swh::deploy::environment')}"
	swh::deploy::worker::indexer_origin_intrinsic_metadata::config_file: "%{hiera('swh::conf_directory')}/indexer_origin_intrinsic_metadata.yml"
	swh::deploy::worker::indexer_origin_intrinsic_metadata::concurrency: 1
	swh::deploy::worker::indexer_origin_intrinsic_metadata::loglevel: info
	@@ -1925,6 +1967,8 @@
	version: 0.0.2
	configuration: {}

	+swh::deploy::indexer_rehash::sentry_swh_package: swh.indexer
	+swh::deploy::indexer_rehash::sentry_environment: "%{alias('swh::deploy::environment')}"
	swh::deploy::worker::indexer_rehash::config_file: "rehash.yml"
	swh::deploy::worker::indexer_rehash::concurrency: 5
	swh::deploy::worker::indexer_rehash::loglevel: info
	@@ -1937,6 +1981,8 @@
	batch_size_retrieve_content: 10000
	batch_size_update: 5000

	+swh::deploy::indexer_fossology_license::sentry_swh_package: swh.indexer
	+swh::deploy::indexer_fossology_license::sentry_environment: "%{alias('swh::deploy::environment')}"
	swh::deploy::worker::indexer_fossology_license::config_file: "%{hiera('swh::conf_directory')}/indexer_fossology_license.yml"
	swh::deploy::worker::indexer_fossology_license::concurrency: 1
	swh::deploy::worker::indexer_fossology_license::loglevel: info
	@@ -1961,6 +2007,8 @@
	- swh_indexer_content_fossology_license_range
	write_batch_size: 1000

	+swh::deploy::indexer_content_ctags::sentry_swh_package: swh.indexer
	+swh::deploy::indexer_content_ctags::sentry_environment: "%{alias('swh::deploy::environment')}"
	swh::deploy::worker::indexer_content_ctags::config_file: "%{hiera('swh::conf_directory')}/indexer_content_ctags.yml"
	swh::deploy::worker::indexer_content_ctags::concurrency: 2
	swh::deploy::worker::indexer_content_ctags::loglevel: info
	@@ -2384,6 +2432,8 @@
	zephir: Zephir
	unknown: ''

	+swh::deploy::vault_cooker::sentry_swh_package: swh.vault
	+swh::deploy::vault_cooker::sentry_environment: "%{alias('swh::deploy::environment')}"
	swh::deploy::worker::vault_cooker::config_file: "%{hiera('swh::conf_directory')}/vault_cooker.yml"
	swh::deploy::worker::vault_cooker::concurrency: 20
	swh::deploy::worker::vault_cooker::loglevel: info
	@@ -2696,7 +2746,9 @@
	prometheus::server::listen_port: 9090
	prometheus::server::certname: pergamon.softwareheritage.org

	-prometheus::static_environment: production
	+swh::deploy::environment: production
	+
	+prometheus::static_environment: "%{alias('swh::deploy::environment')}"
	prometheus::static_labels:
	instance: "%{::swh_hostname.internal_fqdn}"
	environment: "%{lookup('prometheus::static_environment')}"
	@@ -4158,3 +4210,4 @@
	borg::repository_server: banco.internal.softwareheritage.org

	borg::encryption: repokey-blake2
	+
	diff --git a/data/location/sesi_rocquencourt_staging.yaml b/data/location/sesi_rocquencourt_staging.yaml
	--- a/data/location/sesi_rocquencourt_staging.yaml
	+++ b/data/location/sesi_rocquencourt_staging.yaml
	@@ -127,7 +127,8 @@
	swh::deploy::journal::brokers:
	- journal0.internal.staging.swh.network

	-prometheus::static_environment: staging
	swh::deploy::deposit::vhost::letsencrypt_cert: deposit_staging
	swh::deploy::webapp::vhost::letsencrypt_cert: archive_staging

	+swh::deploy:environment: staging
	+
	diff --git a/site-modules/profile/manifests/swh/deploy/deposit.pp b/site-modules/profile/manifests/swh/deploy/deposit.pp
	--- a/site-modules/profile/manifests/swh/deploy/deposit.pp
	+++ b/site-modules/profile/manifests/swh/deploy/deposit.pp
	@@ -79,6 +79,10 @@
	mode => '2750',
	}

	+ $sentry_dsn = lookup("swh::deploy::deposit::sentry_dsn", Optional[String], 'first', undef)
	+ $sentry_environment = lookup("swh::deploy::deposit::sentry_environment", Optional[String], 'first', undef)
	+ $sentry_swh_package = lookup("swh::deploy::deposit::sentry_swh_package", Optional[String], 'first', undef)
	+
	::gunicorn::instance {'swh-deposit':
	ensure => enabled,
	user => $user,
	@@ -87,6 +91,9 @@
	environment => {
	'SWH_CONFIG_FILENAME' => $config_file,
	'DJANGO_SETTINGS_MODULE' => 'swh.deposit.settings.production',
	+ 'SWH_SENTRY_DSN' => $sentry_dsn,
	+ 'SWH_SENTRY_ENVIRONMENT' => $sentry_environment,
	+ 'SWH_MAIN_PACKAGE' => $sentry_swh_package,
	},
	settings => {
	bind => $backend_listen_address,
	diff --git a/site-modules/profile/manifests/swh/deploy/rpc_server.pp b/site-modules/profile/manifests/swh/deploy/rpc_server.pp
	--- a/site-modules/profile/manifests/swh/deploy/rpc_server.pp
	+++ b/site-modules/profile/manifests/swh/deploy/rpc_server.pp
	@@ -90,17 +90,9 @@
	format_log => "combined if=\$error_status",
	}

	- $base_env = {
	- 'SWH_CONFIG_FILENAME' => $conf_file,
	- 'SWH_LOG_TARGET' => 'journal',
	- }
	-
	$sentry_dsn = lookup("swh::deploy::${config_key}::sentry_dsn", Optional[String], 'first', undef)
	-
	- $env = $sentry_dsn ? {
	- undef => $base_env,
	- default => $base_env + {'SWH_SENTRY_DSN' => $sentry_dsn},
	- }
	+ $sentry_environment = lookup("swh::deploy::${config_key}::sentry_environment", Optional[String], 'first', undef)
	+ $sentry_swh_package = lookup("swh::deploy::${config_key}::sentry_swh_package", Optional[String], 'first', undef)

	::gunicorn::instance {$service_name:
	ensure => enabled,
	@@ -108,7 +100,13 @@
	group => $group,
	executable => $executable,
	config_base_module => $gunicorn_config_base_module,
	- environment => $env,
	+ environment => {
	+ 'SWH_CONFIG_FILENAME' => $conf_file,
	+ 'SWH_LOG_TARGET' => 'journal',
	+ 'SWH_SENTRY_DSN' => $sentry_dsn,
	+ 'SWH_SENTRY_ENVIRONMENT' => $sentry_environment,
	+ 'SWH_MAIN_PACKAGE' => $sentry_swh_package,
	+ },
	settings => {
	bind => $gunicorn_unix_socket,
	workers => $backend_workers,
	diff --git a/site-modules/profile/manifests/swh/deploy/scheduler.pp b/site-modules/profile/manifests/swh/deploy/scheduler.pp
	--- a/site-modules/profile/manifests/swh/deploy/scheduler.pp
	+++ b/site-modules/profile/manifests/swh/deploy/scheduler.pp
	@@ -11,6 +11,8 @@
	$task_broker = lookup('swh::deploy::scheduler::task_broker')

	$sentry_dsn = lookup('swh::deploy::scheduler::sentry_dsn', Optional[String], 'first', undef)
	+ $sentry_environment = lookup('swh::deploy::scheduler::sentry_environment', Optional[String], 'first', undef)
	+ $sentry_swh_package = lookup('swh::deploy::scheduler::sentry_swh_package', Optional[String], 'first', undef)

	$listener_service_name = 'swh-scheduler-listener'
	$listener_unit_name = "${listener_service_name}.service"
	@@ -46,7 +48,7 @@
	# Template uses variables
	# - $user
	# - $group
	- # - $sentry_dsn
	+ # - $sentry_{dsn,environment,swh_package}
	#
	::systemd::unit_file {$listener_unit_name:
	ensure => present,
	diff --git a/site-modules/profile/manifests/swh/deploy/webapp.pp b/site-modules/profile/manifests/swh/deploy/webapp.pp
	--- a/site-modules/profile/manifests/swh/deploy/webapp.pp
	+++ b/site-modules/profile/manifests/swh/deploy/webapp.pp
	@@ -116,16 +116,9 @@
	mode => '0664',
	}

	- $base_env = {
	- 'DJANGO_SETTINGS_MODULE' => 'swh.web.settings.production',
	- }
	-
	$sentry_dsn = lookup("swh::deploy::webapp::sentry_dsn", Optional[String], 'first', undef)
	-
	- $env = $sentry_dsn ? {
	- undef => $base_env,
	- default => $base_env + {'SWH_SENTRY_DSN' => $sentry_dsn},
	- }
	+ $sentry_environment = lookup("swh::deploy::webapp::sentry_environment", Optional[String], 'first', undef)
	+ $sentry_swh_package = lookup("swh::deploy::webapp::sentry_swh_package", Optional[String], 'first', undef)

	::gunicorn::instance {'swh-webapp':
	ensure => enabled,
	@@ -141,7 +134,12 @@
	graceful_timeout => $backend_reload_mercy,
	keepalive => $backend_http_keepalive,
	},
	- environment => $env,
	+ environment => {
	+ 'DJANGO_SETTINGS_MODULE' => 'swh.web.settings.production',
	+ 'SWH_SENTRY_DSN' => $sentry_dsn,
	+ 'SWH_SENTRY_ENVIRONMENT' => $sentry_environment,
	+ 'SWH_MAIN_PACKAGE' => $sentry_swh_package,
	+ },
	}

	include ::profile::apache::common
	diff --git a/site-modules/profile/manifests/swh/deploy/worker/instance.pp b/site-modules/profile/manifests/swh/deploy/worker/instance.pp
	--- a/site-modules/profile/manifests/swh/deploy/worker/instance.pp
	+++ b/site-modules/profile/manifests/swh/deploy/worker/instance.pp
	@@ -19,6 +19,8 @@
	$config = lookup("swh::deploy::worker::${instance_name}::config", Hash, $merge_policy)

	$sentry_dsn = lookup("swh::deploy::${sentry_name}::sentry_dsn", Optional[String], 'first', undef)
	+ $sentry_environment = lookup("swh::deploy::${sentry_name}::sentry_environment", Optional[String], 'first', undef)
	+ $sentry_swh_package = lookup("swh::deploy::${sentry_name}::sentry_swh_package", Optional[String], 'first', undef)

	case $ensure {
	'present', 'running': {
	@@ -26,7 +28,7 @@
	# - $concurrency
	# - $loglevel
	# - $max_tasks_per_child
	- # - $sentry_dsn
	+ # - $sentry_{dsn,environment,swh_package}
	::systemd::dropin_file {"${service_basename}/parameters.conf":
	ensure => present,
	unit => $service_name,
	diff --git a/site-modules/profile/templates/swh/deploy/scheduler/swh-scheduler-listener.service.erb b/site-modules/profile/templates/swh/deploy/scheduler/swh-scheduler-listener.service.erb
	--- a/site-modules/profile/templates/swh/deploy/scheduler/swh-scheduler-listener.service.erb
	+++ b/site-modules/profile/templates/swh/deploy/scheduler/swh-scheduler-listener.service.erb
	@@ -15,6 +15,12 @@
	<%- if !@sentry_dsn.empty? -%>
	Environment=SWH_SENTRY_DSN=<%= @sentry_dsn %>
	<%- end -%>
	+<%- if !@sentry_environment.empty? -%>
	+Environment=SWH_SENTRY_ENVIRONMENT=<%= @sentry_environment %>
	+<%- end -%>
	+<%- if !@sentry_swh_package.empty? -%>
	+Environment=SWH_MAIN_PACKAGE=<%= @sentry_swh_package %>
	+<%- end -%>
	ExecStart=/usr/bin/swh --log-level <%= @listener_log_level %> scheduler --config-file <%= @config_file %> start-listener
	Restart=always
	RestartSec=10
	diff --git a/site-modules/profile/templates/swh/deploy/scheduler/swh-scheduler-runner.service.erb b/site-modules/profile/templates/swh/deploy/scheduler/swh-scheduler-runner.service.erb
	--- a/site-modules/profile/templates/swh/deploy/scheduler/swh-scheduler-runner.service.erb
	+++ b/site-modules/profile/templates/swh/deploy/scheduler/swh-scheduler-runner.service.erb
	@@ -15,6 +15,12 @@
	<%- if !@sentry_dsn.empty? -%>
	Environment=SWH_SENTRY_DSN=<%= @sentry_dsn %>
	<%- end -%>
	+<%- if !@sentry_environment.empty? -%>
	+Environment=SWH_SENTRY_ENVIRONMENT=<%= @sentry_environment %>
	+<%- end -%>
	+<%- if !@sentry_swh_package.empty? -%>
	+Environment=SWH_MAIN_PACKAGE=<%= @sentry_swh_package %>
	+<%- end -%>
	ExecStart=/usr/bin/swh --log-level <%= @runner_log_level %> scheduler --config-file <%= @config_file %> start-runner --period 10
	Restart=always
	RestartSec=10
	diff --git a/site-modules/profile/templates/swh/deploy/worker/parameters.conf.erb b/site-modules/profile/templates/swh/deploy/worker/parameters.conf.erb
	--- a/site-modules/profile/templates/swh/deploy/worker/parameters.conf.erb
	+++ b/site-modules/profile/templates/swh/deploy/worker/parameters.conf.erb
	@@ -8,6 +8,12 @@
	<%- 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 -%>
	<% if @limit_no_file %>
	LimitNOFILE=<%= @limit_no_file %>
	<% end %>

File Metadata

Mime Type: text/plain
Expires: Wed, Jul 2, 10:47 AM (2 w, 1 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 3215530

D2576.id9201.diffNo OneTemporaryActions

D2576.id9201.diffView Options

File Metadata

Event Timeline

D2576.id9201.diff
No OneTemporary
Actions

D2576.id9201.diff
View Options