diff --git a/site-modules/profile/manifests/swh/deploy/journal_publisher.pp b/site-modules/profile/manifests/swh/deploy/journal_publisher.pp index 25b53901..fd7ecf99 100644 --- a/site-modules/profile/manifests/swh/deploy/journal_publisher.pp +++ b/site-modules/profile/manifests/swh/deploy/journal_publisher.pp @@ -1,35 +1,22 @@ # Deployment of the swh.journal.publisher class profile::swh::deploy::journal_publisher { - include ::profile::swh::deploy::journal $conf_file = lookup('swh::deploy::journal_publisher::conf_file') - $user = lookup('swh::deploy::journal_publisher::user') - $group = lookup('swh::deploy::journal_publisher::group') - - $publisher_config = lookup('swh::deploy::journal_publisher::config') $service_name = 'swh-journal-publisher' $unit_name = "${service_name}.service" file {$conf_file: - ensure => present, - owner => 'root', - group => $group, - mode => '0640', - content => inline_template("<%= @publisher_config.to_yaml %>\n"), - notify => Service[$service_name], + ensure => absent, } - # Template uses variables - # - $user - # - $group - # ::systemd::unit_file {$unit_name: - ensure => present, - content => template('profile/swh/deploy/journal/swh-journal-publisher.service.erb'), - } ~> service {$service_name: - ensure => running, - enable => true, + ensure => absent, + } + + service {$service_name: + ensure => stopped, + enable => false, } } diff --git a/site-modules/profile/templates/swh/deploy/journal/swh-journal-publisher.service.erb b/site-modules/profile/templates/swh/deploy/journal/swh-journal-publisher.service.erb deleted file mode 100644 index d04a5298..00000000 --- a/site-modules/profile/templates/swh/deploy/journal/swh-journal-publisher.service.erb +++ /dev/null @@ -1,19 +0,0 @@ -# Journal Publisher unit file -# Managed by puppet class profile::swh::deploy::journal_publisher -# Changes will be overwritten - -[Unit] -Description=Software Heritage Journal Publisher -Requires=network.target kafka.service -After=network.target kafka.service - -[Service] -User=<%= @user %> -Group=<%= @group %> -Type=simple -ExecStart=/usr/bin/swh-journal --config-file <%= @conf_file %> publisher -Restart=always -RestartSec=5s - -[Install] -WantedBy=multi-user.target