Compilation results for vrts1003.eqiad.wmnet: System changes detected

You can retrieve this result from host.json.

Catalog differences

Summary

Total Resources:	3476
Resources added:	71
Resources removed:	0
Resources modified:	89
Change percentage:	4.60%

Resources only in the new catalog

Systemd::Unit[rsync-vrts-rspamd-data.timer]
Systemd::Timer[wmf_auto_restart_rspamd]
File[/var/log/wmf_auto_restart_rspamd]
Class[Rspamd::Service]
Systemd::Timer[rsync-vrts-rspamd-data]
Class[Rspamd::Install]
File[/etc/rspamd/local.d/worker-controller.inc]
Rsyslog::Conf[vrts_train_mail_filters]
File[/etc/logrotate.d/rsync-vrts-rspamd-data]
File[/var/log/vrts_train_mail_filters]
Rsyslog::Conf[wmf_auto_restart_rspamd]
Service[rspamd]
Systemd::Timer[vrts_train_mail_filters]
Logrotate::Conf[wmf_auto_restart_rspamd]
File[/lib/systemd/system/rsync-vrts-rspamd-data.service]
Systemd::Timer::Job[wmf_auto_restart_rspamd]
File[/lib/systemd/system/vrts_train_mail_filters.timer]
File[/etc/vrts/rspamd-controller.password]
Service[vrts_train_mail_filters.timer]
File[purge unmanaged rspamd local.d files]
Systemd::Service[wmf_auto_restart_rspamd]
File[purge unmanaged rspamd override.d files]
Systemd::Unit[vrts_train_mail_filters.service]
Exec[systemd daemon-reload for vrts_train_mail_filters.timer (vrts_train_mail_filters.timer)]
Profile::Auto_restarts::Service[rspamd]
Systemd::Timer::Job[rsync-vrts-rspamd-data]
Class[Rspamd]
Systemd::Timer::Job[vrts_train_mail_filters]
File[/lib/systemd/system/rsync-vrts-rspamd-data.timer]
File[/etc/logrotate.d/vrts_train_mail_filters]
Class[Profile::Mail::Vrts::Training]
Rsyslog::Conf[rsync-vrts-rspamd-data]
File[/etc/rsyslog.d/40-wmf-auto-restart-rspamd.conf]
Exec[systemd daemon-reload for rsync-vrts-rspamd-data.service (rsync-vrts-rspamd-data.service)]
Logrotate::Conf[rsync-vrts-rspamd-data]
Systemd::Service[rsync-vrts-rspamd-data]
Rsync::Server::Module[vrts-rspamd-data]
Package[rspamd]
File[/var/log/rsync-vrts-rspamd-data]
File[/etc/nftables/input/10_rsyncd_access_vrts-rspamd-data.nft]
Nftables::Service[rsyncd_access_vrts-rspamd-data]
Systemd::Unit[wmf_auto_restart_rspamd.timer]
File[/etc/logrotate.d/wmf_auto_restart_rspamd]
File[/etc/rsyslog.d/40-rsync-vrts-rspamd-data.conf]
Concat::Fragment[/etc/rsyncd.conf-vrts-rspamd-data]
Systemd::Unit[vrts_train_mail_filters.timer]
Systemd::Syslog[vrts_train_mail_filters]
File[/lib/systemd/system/wmf_auto_restart_rspamd.timer]
Exec[systemd daemon-reload for rsync-vrts-rspamd-data.timer (rsync-vrts-rspamd-data.timer)]
Systemd::Unit[wmf_auto_restart_rspamd.service]
Exec[systemd daemon-reload for wmf_auto_restart_rspamd.service (wmf_auto_restart_rspamd.service)]
Systemd::Service[vrts_train_mail_filters]
Systemd::Unit[rsync-vrts-rspamd-data.service]
File_line[auto_restart_file_presence_rspamd]
Class[Rspamd::Configuration]
Firewall::Service[rsyncd_access_vrts-rspamd-data]
Rsync::Quickdatacopy[vrts-rspamd-data]
Class[Rspamd::Repo]
File[/etc/rsyslog.d/40-vrts-train-mail-filters.conf]
Concat_fragment[/etc/rsyncd.conf-vrts-rspamd-data]
Service[rsync-vrts-rspamd-data.timer]
File[/usr/local/bin/train_mail_filters.py]
File[/etc/rspamd/local.d/classifier-bayes.conf]
Systemd::Syslog[wmf_auto_restart_rspamd]
Exec[systemd daemon-reload for vrts_train_mail_filters.service (vrts_train_mail_filters.service)]
File[/lib/systemd/system/wmf_auto_restart_rspamd.service]
Exec[systemd daemon-reload for wmf_auto_restart_rspamd.timer (wmf_auto_restart_rspamd.timer)]
Systemd::Syslog[rsync-vrts-rspamd-data]
Service[wmf_auto_restart_rspamd.timer]
Logrotate::Conf[vrts_train_mail_filters]
File[/lib/systemd/system/vrts_train_mail_filters.service]

Resources modified

Systemd::Unit[vrts_train_mail_filters.timer]

Parameters differences:

--- Systemd::Unit[vrts_train_mail_filters.timer].orig
+++ Systemd::Unit[vrts_train_mail_filters.timer]

+    unit              => vrts_train_mail_filters.timer
+    override          => False
+    override_filename => puppet-override.conf
+    restart           => False
+    require           => ['Class[Systemd]']
+    ensure            => present

File[/var/log/wmf_auto_restart_rspamd]

Parameters differences:

--- File[/var/log/wmf_auto_restart_rspamd].orig
+++ File[/var/log/wmf_auto_restart_rspamd]

+    force  => True
+    owner  => root
+    mode   => 0755
+    backup => False
+    group  => root
+    ensure => directory

Rsyslog::Conf[wmf_auto_restart_rspamd]

Parameters differences:

--- Rsyslog::Conf[wmf_auto_restart_rspamd].orig
+++ Rsyslog::Conf[wmf_auto_restart_rspamd]

+    priority => 40
+    ensure   => present
+    mode     => 0444
+    require  => File[/var/log/wmf_auto_restart_rspamd]

Service[rsync-vrts-rspamd-data.timer]

Parameters differences:

--- Service[rsync-vrts-rspamd-data.timer].orig
+++ Service[rsync-vrts-rspamd-data.timer]

+    before   => ['Exec[systemd daemon-reload for rsync-vrts-rspamd-data.timer (rsync-vrts-rspamd-data.timer)]']
+    provider => systemd
+    ensure   => stopped
+    enable   => False

File[/lib/systemd/system/rsync-vrts-rspamd-data.service]

Parameters differences:

--- File[/lib/systemd/system/rsync-vrts-rspamd-data.service].orig
+++ File[/lib/systemd/system/rsync-vrts-rspamd-data.service]

+    owner  => root
+    mode   => 0444
+    group  => root
+    ensure => absent
+    notify => Exec[systemd daemon-reload for rsync-vrts-rspamd-data.service (rsync-vrts-rspamd-data.service)]

Content differences:

--- /lib/systemd/system/rsync-vrts-rspamd-data.service.orig
+++ /lib/systemd/system/rsync-vrts-rspamd-data.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Transfer data periodically between hosts
+Documentation=https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
+
+[Service]
+Type=oneshot
+User=root
+ExecStart=/usr/local/sbin/sync-vrts-rspamd-data

Systemd::Unit[rsync-vrts-rspamd-data.service]

Parameters differences:

--- Systemd::Unit[rsync-vrts-rspamd-data.service].orig
+++ Systemd::Unit[rsync-vrts-rspamd-data.service]

+    unit              => rsync-vrts-rspamd-data.service
+    override          => False
+    override_filename => puppet-override.conf
+    restart           => False
+    require           => ['Class[Systemd]']
+    ensure            => absent

Systemd::Syslog[rsync-vrts-rspamd-data]

Parameters differences:

--- Systemd::Syslog[rsync-vrts-rspamd-data].orig
+++ Systemd::Syslog[rsync-vrts-rspamd-data]

+    readable_by            => all
+    force_stop             => True
+    owner                  => root
+    ensure                 => absent
+    group                  => root
+    programname_comparison => startswith
+    log_filename           => syslog.log
+    base_dir               => /var/log

Exec[systemd daemon-reload for vrts_train_mail_filters.service (vrts_train_mail_filters.service)]

Parameters differences:

--- Exec[systemd daemon-reload for vrts_train_mail_filters.service (vrts_train_mail_filters.service)].orig
+++ Exec[systemd daemon-reload for vrts_train_mail_filters.service (vrts_train_mail_filters.service)]

+    refreshonly => True
+    command     => /bin/systemctl daemon-reload

File[/etc/logrotate.d/rsync-vrts-rspamd-data]

Parameters differences:

--- File[/etc/logrotate.d/rsync-vrts-rspamd-data].orig
+++ File[/etc/logrotate.d/rsync-vrts-rspamd-data]

+    owner  => root
+    ensure => absent
+    mode   => 0444
+    group  => root

Content differences:

--- /etc/logrotate.d/rsync-vrts-rspamd-data.orig
+++ /etc/logrotate.d/rsync-vrts-rspamd-data
@@ -0,0 +1,12 @@
+# logrotate(8) config for rsync-vrts-rspamd-data
+
+/var/log/rsync-vrts-rspamd-data/*.log {
+    daily
+    copytruncate
+    missingok
+    compress
+    delaycompress
+    notifempty
+    rotate 15
+    size 256M
+}

Systemd::Timer[vrts_train_mail_filters]

Parameters differences:

--- Systemd::Timer[vrts_train_mail_filters].orig
+++ Systemd::Timer[vrts_train_mail_filters]

+    fixed_random_delay => False
+    timer_intervals    => [{'start': 'OnCalendar', 'interval': '*-*-* *:05:00'}]
+    unit_name          => vrts_train_mail_filters.service
+    ensure             => present
+    accuracy           => 15sec
+    splay              => 0

Systemd::Syslog[vrts_train_spamassassin]

Parameters differences:

--- Systemd::Syslog[vrts_train_spamassassin].orig
+++ Systemd::Syslog[vrts_train_spamassassin]

@@
-    ensure => present
+    ensure => absent

File[/usr/local/bin/train_spamassassin]

Parameters differences:

--- File[/usr/local/bin/train_spamassassin].orig
+++ File[/usr/local/bin/train_spamassassin]

-    source => puppet:///modules/vrts/train_spamassassin
-    mode   => 0555
@@
-    ensure => file
+    ensure => absent

File[/etc/vrts/rspamd-controller.password]

Parameters differences:

--- File[/etc/vrts/rspamd-controller.password].orig
+++ File[/etc/vrts/rspamd-controller.password]

+    owner  => root
+    ensure => file
+    mode   => 0400
+    group  => root

Content differences:

--- /etc/vrts/rspamd-controller.password.orig
+++ /etc/vrts/rspamd-controller.password
@@ -0,0 +1 @@
+dAZH2hLJcgseEe0XeBZBf2lioBU0xff3

Class[Adduser]

Parameters differences:

--- Class[Adduser].orig
+++ Class[Adduser]

@@
-    before => ['Package[puppet]', 'Package[facter]', 'Package[augeas-tools]', 'Package[virt-what]', 'Package[puppet-module-puppetlabs-augeas-core]', 'Package[python3-prometheus-client]', 'Package[python3-yaml]', 'Package[ruby-net-ssh]', 'Package[openssl]', 'Package[ssl-cert]', 'Package[ca-certificates]', 'Package[wmf-certificates]', 'Package[ntp]', 'Package[systemd-timesyncd]', 'Package[logrotate]', 'Package[prometheus-node-exporter]', 'Package[bsdutils]', 'Package[smartmontools]', 'Package[rsyslog]', 'Package[rsyslog-openssl]', 'Package[cadvisor]', 'Package[prometheus-ethtool-exporter]', 'Package[acct]', 'Package[byobu]', 'Package[colordiff]', 'Package[curl]', 'Package[debian-goodies]', 'Package[ethtool]', 'Package[gdb]', 'Package[gdisk]', 'Package[git]', 'Package[htop]', 'Package[httpry]', 'Package[iotop]', 'Package[iperf]', 'Package[jq]', 'Package[libtemplate-perl]', 'Package[lldpd]', 'Package[lshw]', 'Package[molly-guard]', 'Package[moreutils]', 'Package[net-tools]', 'Package[numactl]', 'Package[ncdu]', 'Package[ngrep]', 'Package[pigz]', 'Package[psmisc]', 'Package[pv]', 'Package[python3]', 'Package[screen]', 'Package[strace]', 'Package[sysstat]', 'Package[tcpdump]', 'Package[tmux]', 'Package[tree]', 'Package[vim]', 'Package[vim-addon-manager]', 'Package[vim-scripts]', 'Package[wipe]', 'Package[xfsprogs]', 'Package[zsh]', 'Package[icdiff]', 'Package[linux-perf]', 'Package[bsd-mailx]', 'Package[ack]', 'Package[netcat-openbsd]', 'Package[tshark]', 'Package[fzf]', 'Package[ripgrep]', 'Package[fd-find]', 'Package[kitty-terminfo]', 'Package[mtr-tiny]', 'Package[bat]', 'Package[efibootmgr]', 'Package[bind9-dnsutils]', 'Package[tzdata]', 'Package[python3-wmflib]', 'Package[ruby-sorted-set]', 'Package[btop]', 'Package[dstat]', 'Package[apport]', 'Package[command-not-found]', 'Package[command-not-found-data]', 'Package[ecryptfs-utils]', 'Package[mlocate]', 'Package[os-prober]', 'Package[python3-apport]', 'Package[wpasupplicant]', 'Package[atop]', 'Package[apt-listchanges]', 'Package[isc-dhcp-client]', 'Package[rasdaemon]', 'Package[libicu67]', 'Package[libwsutil12]', 'Package[libwireshark14]', 'Package[libopencsd0]', 'Package[libwiretap11]', 'Package[ruby2.7]', 'Package[python3.9-minimal]', 'Package[python3.9]', 'Package[perl-modules-5.32]', 'Package[libpython3.9]', 'Package[libperl5.32]', 'Package[libpython3.9-minimal]', 'Package[libpython3.9-stdlib]', 'Package[libidn11]', 'Package[libldap-2.4-2]', 'Package[liburing1]', 'Package[libwebp6]', 'Package[libcbor0]', 'Package[libusb-0.1-4]', 'Package[telnet]', 'Package[libruby2.7]', 'Package[libdns-export1110]', 'Package[libisc-export1105]', 'Package[libbpf0]', 'Package[openssh-client]', 'Package[openssh-server]', 'Package[debdeploy-client]', 'Package[python3-dateutil]', 'Package[sudo]', 'Package[golang-cfssl]', 'Package[debmonitor-client]', 'Package[perccli]', 'Package[nagios-nrpe-server]', 'Package[monitoring-plugins]', 'Package[monitoring-plugins-basic]', 'Package[monitoring-plugins-standard]', 'Package[liburiparser1]', 'Package[python3-attr]', 'Package[iucode-tool]', 'Package[freeipmi-tools]', 'Package[freeipmi-ipmiseld]', 'Package[rsyslog-kafka]', 'Package[emacs-nox]', 'Package[prometheus-ipmi-exporter]', 'Package[libnet-dns-perl]', 'Package[iptables]', 'Package[ferm]', 'Package[nftables]', 'Package[conntrack]', 'Package[apache2]', 'Package[clamav-daemon]', 'Package[clamav-freshclam]', 'Package[exim4-config]', 'Package[exim4-daemon-heavy]', 'Package[spamd]', 'Package[libmail-spf-perl]', 'Package[libmail-dkim-perl]', 'Package[libapache2-mod-perl2]', 'Package[libapache-dbi-perl]', 'Package[libdbd-mysql-perl]', 'Package[libgd-graph-perl]', 'Package[libgd-text-perl]', 'Package[libio-socket-ssl-perl]', 'Package[libjson-xs-perl]', 'Package[libnet-ldap-perl]', 'Package[libpdf-api2-perl]', 'Package[libsoap-lite-perl]', 'Package[libtext-csv-xs-perl]', 'Package[libtimedate-perl]', 'Package[libyaml-libyaml-perl]', 'Package[libarchive-zip-perl]', 'Package[libmoo-perl]', 'Package[libnamespace-clean-perl]', 'Package[perl-doc]', 'Package[libdatetime-perl]', 'Package[libxml-libxml-perl]', 'Package[libxml-libxslt-perl]', 'Package[libencode-hanextra-perl]', 'Package[libauthen-sasl-perl]', 'Package[libmail-imapclient-perl]', 'Package[libical-parser-perl]', 'Package[libdata-uuid-perl]', 'Package[default-mysql-client]', 'Package[libdatetime-timezone-perl]', 'Package[prometheus-sql-exporter]', 'Package[links]', 'Package[envoyproxy]', 'Package[prometheus-rsyslog-exporter]', 'Package[initramfs-tools]', 'Package[python3-click]', 'Package[python3-box]', 'Package[confd]', 'Package[python3-toml]', 'Package[prometheus-apache-exporter]', 'Package[rsync]', 'Package[stunnel4]']
+    before => ['Package[puppet]', 'Package[facter]', 'Package[augeas-tools]', 'Package[virt-what]', 'Package[puppet-module-puppetlabs-augeas-core]', 'Package[python3-prometheus-client]', 'Package[python3-yaml]', 'Package[ruby-net-ssh]', 'Package[openssl]', 'Package[ssl-cert]', 'Package[ca-certificates]', 'Package[wmf-certificates]', 'Package[ntp]', 'Package[systemd-timesyncd]', 'Package[logrotate]', 'Package[prometheus-node-exporter]', 'Package[bsdutils]', 'Package[smartmontools]', 'Package[rsyslog]', 'Package[rsyslog-openssl]', 'Package[cadvisor]', 'Package[prometheus-ethtool-exporter]', 'Package[acct]', 'Package[byobu]', 'Package[colordiff]', 'Package[curl]', 'Package[debian-goodies]', 'Package[ethtool]', 'Package[gdb]', 'Package[gdisk]', 'Package[git]', 'Package[htop]', 'Package[httpry]', 'Package[iotop]', 'Package[iperf]', 'Package[jq]', 'Package[libtemplate-perl]', 'Package[lldpd]', 'Package[lshw]', 'Package[molly-guard]', 'Package[moreutils]', 'Package[net-tools]', 'Package[numactl]', 'Package[ncdu]', 'Package[ngrep]', 'Package[pigz]', 'Package[psmisc]', 'Package[pv]', 'Package[python3]', 'Package[screen]', 'Package[strace]', 'Package[sysstat]', 'Package[tcpdump]', 'Package[tmux]', 'Package[tree]', 'Package[vim]', 'Package[vim-addon-manager]', 'Package[vim-scripts]', 'Package[wipe]', 'Package[xfsprogs]', 'Package[zsh]', 'Package[icdiff]', 'Package[linux-perf]', 'Package[bsd-mailx]', 'Package[ack]', 'Package[netcat-openbsd]', 'Package[tshark]', 'Package[fzf]', 'Package[ripgrep]', 'Package[fd-find]', 'Package[kitty-terminfo]', 'Package[mtr-tiny]', 'Package[bat]', 'Package[efibootmgr]', 'Package[bind9-dnsutils]', 'Package[tzdata]', 'Package[python3-wmflib]', 'Package[ruby-sorted-set]', 'Package[btop]', 'Package[dstat]', 'Package[apport]', 'Package[command-not-found]', 'Package[command-not-found-data]', 'Package[ecryptfs-utils]', 'Package[mlocate]', 'Package[os-prober]', 'Package[python3-apport]', 'Package[wpasupplicant]', 'Package[atop]', 'Package[apt-listchanges]', 'Package[isc-dhcp-client]', 'Package[rasdaemon]', 'Package[libicu67]', 'Package[libwsutil12]', 'Package[libwireshark14]', 'Package[libopencsd0]', 'Package[libwiretap11]', 'Package[ruby2.7]', 'Package[python3.9-minimal]', 'Package[python3.9]', 'Package[perl-modules-5.32]', 'Package[libpython3.9]', 'Package[libperl5.32]', 'Package[libpython3.9-minimal]', 'Package[libpython3.9-stdlib]', 'Package[libidn11]', 'Package[libldap-2.4-2]', 'Package[liburing1]', 'Package[libwebp6]', 'Package[libcbor0]', 'Package[libusb-0.1-4]', 'Package[telnet]', 'Package[libruby2.7]', 'Package[libdns-export1110]', 'Package[libisc-export1105]', 'Package[libbpf0]', 'Package[openssh-client]', 'Package[openssh-server]', 'Package[debdeploy-client]', 'Package[python3-dateutil]', 'Package[sudo]', 'Package[golang-cfssl]', 'Package[debmonitor-client]', 'Package[perccli]', 'Package[nagios-nrpe-server]', 'Package[monitoring-plugins]', 'Package[monitoring-plugins-basic]', 'Package[monitoring-plugins-standard]', 'Package[liburiparser1]', 'Package[python3-attr]', 'Package[iucode-tool]', 'Package[freeipmi-tools]', 'Package[freeipmi-ipmiseld]', 'Package[rsyslog-kafka]', 'Package[emacs-nox]', 'Package[prometheus-ipmi-exporter]', 'Package[libnet-dns-perl]', 'Package[iptables]', 'Package[ferm]', 'Package[nftables]', 'Package[conntrack]', 'Package[apache2]', 'Package[clamav-daemon]', 'Package[clamav-freshclam]', 'Package[exim4-config]', 'Package[exim4-daemon-heavy]', 'Package[spamd]', 'Package[libmail-spf-perl]', 'Package[libmail-dkim-perl]', 'Package[libapache2-mod-perl2]', 'Package[libapache-dbi-perl]', 'Package[libdbd-mysql-perl]', 'Package[libgd-graph-perl]', 'Package[libgd-text-perl]', 'Package[libio-socket-ssl-perl]', 'Package[libjson-xs-perl]', 'Package[libnet-ldap-perl]', 'Package[libpdf-api2-perl]', 'Package[libsoap-lite-perl]', 'Package[libtext-csv-xs-perl]', 'Package[libtimedate-perl]', 'Package[libyaml-libyaml-perl]', 'Package[libarchive-zip-perl]', 'Package[libmoo-perl]', 'Package[libnamespace-clean-perl]', 'Package[perl-doc]', 'Package[libdatetime-perl]', 'Package[libxml-libxml-perl]', 'Package[libxml-libxslt-perl]', 'Package[libencode-hanextra-perl]', 'Package[libauthen-sasl-perl]', 'Package[libmail-imapclient-perl]', 'Package[libical-parser-perl]', 'Package[libdata-uuid-perl]', 'Package[default-mysql-client]', 'Package[libdatetime-timezone-perl]', 'Package[rspamd]', 'Package[prometheus-sql-exporter]', 'Package[links]', 'Package[envoyproxy]', 'Package[prometheus-rsyslog-exporter]', 'Package[initramfs-tools]', 'Package[python3-click]', 'Package[python3-box]', 'Package[confd]', 'Package[python3-toml]', 'Package[prometheus-apache-exporter]', 'Package[rsync]', 'Package[stunnel4]']

File[/lib/systemd/system/vrts_train_spamassassin.timer]

Parameters differences:

--- File[/lib/systemd/system/vrts_train_spamassassin.timer].orig
+++ File[/lib/systemd/system/vrts_train_spamassassin.timer]

@@
-    ensure => present
+    ensure => absent

File[/etc/rspamd/local.d/worker-controller.inc]

Parameters differences:

--- File[/etc/rspamd/local.d/worker-controller.inc].orig
+++ File[/etc/rspamd/local.d/worker-controller.inc]

+    owner   => root
+    mode    => 0440
+    group   => _rspamd
+    require => Package[rspamd]
+    ensure  => file
+    notify  => Service[rspamd]

Content differences:

--- /etc/rspamd/local.d/worker-controller.inc.orig
+++ /etc/rspamd/local.d/worker-controller.inc
@@ -0,0 +1,2 @@
+password = "${rspamd_controller_password}";
+enable_password = "${rspamd_controller_password}";

File[/lib/systemd/system/vrts_train_mail_filters.timer]

Parameters differences:

--- File[/lib/systemd/system/vrts_train_mail_filters.timer].orig
+++ File[/lib/systemd/system/vrts_train_mail_filters.timer]

+    owner  => root
+    mode   => 0444
+    group  => root
+    ensure => present
+    notify => Exec[systemd daemon-reload for vrts_train_mail_filters.timer (vrts_train_mail_filters.timer)]

Content differences:

--- /lib/systemd/system/vrts_train_mail_filters.timer.orig
+++ /lib/systemd/system/vrts_train_mail_filters.timer
@@ -0,0 +1,12 @@
+[Unit]
+Description=Periodic execution of vrts_train_mail_filters.service
+
+[Timer]
+Unit=vrts_train_mail_filters.service
+# Accuracy sets the maximum time interval around the execution time we want to allow
+AccuracySec=15sec
+OnCalendar=*-*-* *:05:00
+RandomizedDelaySec=0
+
+[Install]
+WantedBy=multi-user.target

Systemd::Unit[vrts_train_spamassassin.timer]

Parameters differences:

--- Systemd::Unit[vrts_train_spamassassin.timer].orig
+++ Systemd::Unit[vrts_train_spamassassin.timer]

@@
-    ensure => present
+    ensure => absent

File[/usr/local/bin/train_mail_filters.py]

Parameters differences:

--- File[/usr/local/bin/train_mail_filters.py].orig
+++ File[/usr/local/bin/train_mail_filters.py]

+    owner  => root
+    mode   => 0500
+    ensure => file
+    group  => root
+    source => puppet:///modules/profile/mail/vrts/train_mail_filters.py

Logrotate::Conf[wmf_auto_restart_rspamd]

Parameters differences:

--- Logrotate::Conf[wmf_auto_restart_rspamd].orig
+++ Logrotate::Conf[wmf_auto_restart_rspamd]

+    ensure => present

Class[Profile::Mail::Vrts::Training]

Parameters differences:

--- Class[Profile::Mail::Vrts::Training].orig
+++ Class[Profile::Mail::Vrts::Training]

+    train_rspamd       => True
+    active_host        => vrts1003.eqiad.wmnet
+    passive_host       => vrts2002.codfw.wmnet
+    train_spamassassin => True

Concat_fragment[/etc/rsyncd.conf-vrts-rspamd-data]

Parameters differences:

--- Concat_fragment[/etc/rsyncd.conf-vrts-rspamd-data].orig
+++ Concat_fragment[/etc/rsyncd.conf-vrts-rspamd-data]

+    order  => 10
+    target => /etc/rsyncd.conf
+    tag    => _etc_rsyncd.conf

Content differences:

--- /etc/rsyncd.conf-vrts-rspamd-data.orig
+++ /etc/rsyncd.conf-vrts-rspamd-data
@@ -0,0 +1,20 @@
+# This file is being maintained by Puppet.
+# DO NOT EDIT
+
+[ vrts-rspamd-data ]
+path            = /var/lib/rspamd
+read only       = yes
+write only      = no
+list            = yes
+uid             = 0
+gid             = 0
+use chroot      = yes
+
+
+max connections = 0
+
+
+
+
+hosts allow = vrts2002.codfw.wmnet localhost
+

Class[Profile::Apt]

Parameters differences:

--- Class[Profile::Apt].orig
+++ Class[Profile::Apt]

@@
-    before => ['Package[puppet]', 'Package[facter]', 'Package[augeas-tools]', 'Package[virt-what]', 'Package[puppet-module-puppetlabs-augeas-core]', 'Package[python3-prometheus-client]', 'Package[python3-yaml]', 'Package[ruby-net-ssh]', 'Package[openssl]', 'Package[ssl-cert]', 'Package[ca-certificates]', 'Package[wmf-certificates]', 'Package[ntp]', 'Package[systemd-timesyncd]', 'Package[logrotate]', 'Package[prometheus-node-exporter]', 'Package[bsdutils]', 'Package[smartmontools]', 'Package[rsyslog]', 'Package[rsyslog-openssl]', 'Package[cadvisor]', 'Package[prometheus-ethtool-exporter]', 'Package[acct]', 'Package[byobu]', 'Package[colordiff]', 'Package[curl]', 'Package[debian-goodies]', 'Package[ethtool]', 'Package[gdb]', 'Package[gdisk]', 'Package[git]', 'Package[htop]', 'Package[httpry]', 'Package[iotop]', 'Package[iperf]', 'Package[jq]', 'Package[libtemplate-perl]', 'Package[lldpd]', 'Package[lshw]', 'Package[molly-guard]', 'Package[moreutils]', 'Package[net-tools]', 'Package[numactl]', 'Package[ncdu]', 'Package[ngrep]', 'Package[pigz]', 'Package[psmisc]', 'Package[pv]', 'Package[python3]', 'Package[screen]', 'Package[strace]', 'Package[sysstat]', 'Package[tcpdump]', 'Package[tmux]', 'Package[tree]', 'Package[vim]', 'Package[vim-addon-manager]', 'Package[vim-scripts]', 'Package[wipe]', 'Package[xfsprogs]', 'Package[zsh]', 'Package[icdiff]', 'Package[linux-perf]', 'Package[bsd-mailx]', 'Package[ack]', 'Package[netcat-openbsd]', 'Package[tshark]', 'Package[fzf]', 'Package[ripgrep]', 'Package[fd-find]', 'Package[kitty-terminfo]', 'Package[mtr-tiny]', 'Package[bat]', 'Package[efibootmgr]', 'Package[bind9-dnsutils]', 'Package[tzdata]', 'Package[python3-wmflib]', 'Package[ruby-sorted-set]', 'Package[btop]', 'Package[dstat]', 'Package[apport]', 'Package[command-not-found]', 'Package[command-not-found-data]', 'Package[ecryptfs-utils]', 'Package[mlocate]', 'Package[os-prober]', 'Package[python3-apport]', 'Package[wpasupplicant]', 'Package[atop]', 'Package[apt-listchanges]', 'Package[isc-dhcp-client]', 'Package[rasdaemon]', 'Package[libicu67]', 'Package[libwsutil12]', 'Package[libwireshark14]', 'Package[libopencsd0]', 'Package[libwiretap11]', 'Package[ruby2.7]', 'Package[python3.9-minimal]', 'Package[python3.9]', 'Package[perl-modules-5.32]', 'Package[libpython3.9]', 'Package[libperl5.32]', 'Package[libpython3.9-minimal]', 'Package[libpython3.9-stdlib]', 'Package[libidn11]', 'Package[libldap-2.4-2]', 'Package[liburing1]', 'Package[libwebp6]', 'Package[libcbor0]', 'Package[libusb-0.1-4]', 'Package[telnet]', 'Package[libruby2.7]', 'Package[libdns-export1110]', 'Package[libisc-export1105]', 'Package[libbpf0]', 'Package[openssh-client]', 'Package[openssh-server]', 'Package[debdeploy-client]', 'Package[python3-dateutil]', 'Package[sudo]', 'Package[golang-cfssl]', 'Package[debmonitor-client]', 'Package[perccli]', 'Package[nagios-nrpe-server]', 'Package[monitoring-plugins]', 'Package[monitoring-plugins-basic]', 'Package[monitoring-plugins-standard]', 'Package[liburiparser1]', 'Package[python3-attr]', 'Package[iucode-tool]', 'Package[freeipmi-tools]', 'Package[freeipmi-ipmiseld]', 'Package[rsyslog-kafka]', 'Package[emacs-nox]', 'Package[prometheus-ipmi-exporter]', 'Package[libnet-dns-perl]', 'Package[iptables]', 'Package[ferm]', 'Package[nftables]', 'Package[conntrack]', 'Package[apache2]', 'Package[clamav-daemon]', 'Package[clamav-freshclam]', 'Package[exim4-config]', 'Package[exim4-daemon-heavy]', 'Package[spamd]', 'Package[libmail-spf-perl]', 'Package[libmail-dkim-perl]', 'Package[libapache2-mod-perl2]', 'Package[libapache-dbi-perl]', 'Package[libdbd-mysql-perl]', 'Package[libgd-graph-perl]', 'Package[libgd-text-perl]', 'Package[libio-socket-ssl-perl]', 'Package[libjson-xs-perl]', 'Package[libnet-ldap-perl]', 'Package[libpdf-api2-perl]', 'Package[libsoap-lite-perl]', 'Package[libtext-csv-xs-perl]', 'Package[libtimedate-perl]', 'Package[libyaml-libyaml-perl]', 'Package[libarchive-zip-perl]', 'Package[libmoo-perl]', 'Package[libnamespace-clean-perl]', 'Package[perl-doc]', 'Package[libdatetime-perl]', 'Package[libxml-libxml-perl]', 'Package[libxml-libxslt-perl]', 'Package[libencode-hanextra-perl]', 'Package[libauthen-sasl-perl]', 'Package[libmail-imapclient-perl]', 'Package[libical-parser-perl]', 'Package[libdata-uuid-perl]', 'Package[default-mysql-client]', 'Package[libdatetime-timezone-perl]', 'Package[prometheus-sql-exporter]', 'Package[links]', 'Package[envoyproxy]', 'Package[prometheus-rsyslog-exporter]', 'Package[initramfs-tools]', 'Package[python3-click]', 'Package[python3-box]', 'Package[confd]', 'Package[python3-toml]', 'Package[prometheus-apache-exporter]', 'Package[rsync]', 'Package[stunnel4]']
+    before => ['Package[puppet]', 'Package[facter]', 'Package[augeas-tools]', 'Package[virt-what]', 'Package[puppet-module-puppetlabs-augeas-core]', 'Package[python3-prometheus-client]', 'Package[python3-yaml]', 'Package[ruby-net-ssh]', 'Package[openssl]', 'Package[ssl-cert]', 'Package[ca-certificates]', 'Package[wmf-certificates]', 'Package[ntp]', 'Package[systemd-timesyncd]', 'Package[logrotate]', 'Package[prometheus-node-exporter]', 'Package[bsdutils]', 'Package[smartmontools]', 'Package[rsyslog]', 'Package[rsyslog-openssl]', 'Package[cadvisor]', 'Package[prometheus-ethtool-exporter]', 'Package[acct]', 'Package[byobu]', 'Package[colordiff]', 'Package[curl]', 'Package[debian-goodies]', 'Package[ethtool]', 'Package[gdb]', 'Package[gdisk]', 'Package[git]', 'Package[htop]', 'Package[httpry]', 'Package[iotop]', 'Package[iperf]', 'Package[jq]', 'Package[libtemplate-perl]', 'Package[lldpd]', 'Package[lshw]', 'Package[molly-guard]', 'Package[moreutils]', 'Package[net-tools]', 'Package[numactl]', 'Package[ncdu]', 'Package[ngrep]', 'Package[pigz]', 'Package[psmisc]', 'Package[pv]', 'Package[python3]', 'Package[screen]', 'Package[strace]', 'Package[sysstat]', 'Package[tcpdump]', 'Package[tmux]', 'Package[tree]', 'Package[vim]', 'Package[vim-addon-manager]', 'Package[vim-scripts]', 'Package[wipe]', 'Package[xfsprogs]', 'Package[zsh]', 'Package[icdiff]', 'Package[linux-perf]', 'Package[bsd-mailx]', 'Package[ack]', 'Package[netcat-openbsd]', 'Package[tshark]', 'Package[fzf]', 'Package[ripgrep]', 'Package[fd-find]', 'Package[kitty-terminfo]', 'Package[mtr-tiny]', 'Package[bat]', 'Package[efibootmgr]', 'Package[bind9-dnsutils]', 'Package[tzdata]', 'Package[python3-wmflib]', 'Package[ruby-sorted-set]', 'Package[btop]', 'Package[dstat]', 'Package[apport]', 'Package[command-not-found]', 'Package[command-not-found-data]', 'Package[ecryptfs-utils]', 'Package[mlocate]', 'Package[os-prober]', 'Package[python3-apport]', 'Package[wpasupplicant]', 'Package[atop]', 'Package[apt-listchanges]', 'Package[isc-dhcp-client]', 'Package[rasdaemon]', 'Package[libicu67]', 'Package[libwsutil12]', 'Package[libwireshark14]', 'Package[libopencsd0]', 'Package[libwiretap11]', 'Package[ruby2.7]', 'Package[python3.9-minimal]', 'Package[python3.9]', 'Package[perl-modules-5.32]', 'Package[libpython3.9]', 'Package[libperl5.32]', 'Package[libpython3.9-minimal]', 'Package[libpython3.9-stdlib]', 'Package[libidn11]', 'Package[libldap-2.4-2]', 'Package[liburing1]', 'Package[libwebp6]', 'Package[libcbor0]', 'Package[libusb-0.1-4]', 'Package[telnet]', 'Package[libruby2.7]', 'Package[libdns-export1110]', 'Package[libisc-export1105]', 'Package[libbpf0]', 'Package[openssh-client]', 'Package[openssh-server]', 'Package[debdeploy-client]', 'Package[python3-dateutil]', 'Package[sudo]', 'Package[golang-cfssl]', 'Package[debmonitor-client]', 'Package[perccli]', 'Package[nagios-nrpe-server]', 'Package[monitoring-plugins]', 'Package[monitoring-plugins-basic]', 'Package[monitoring-plugins-standard]', 'Package[liburiparser1]', 'Package[python3-attr]', 'Package[iucode-tool]', 'Package[freeipmi-tools]', 'Package[freeipmi-ipmiseld]', 'Package[rsyslog-kafka]', 'Package[emacs-nox]', 'Package[prometheus-ipmi-exporter]', 'Package[libnet-dns-perl]', 'Package[iptables]', 'Package[ferm]', 'Package[nftables]', 'Package[conntrack]', 'Package[apache2]', 'Package[clamav-daemon]', 'Package[clamav-freshclam]', 'Package[exim4-config]', 'Package[exim4-daemon-heavy]', 'Package[spamd]', 'Package[libmail-spf-perl]', 'Package[libmail-dkim-perl]', 'Package[libapache2-mod-perl2]', 'Package[libapache-dbi-perl]', 'Package[libdbd-mysql-perl]', 'Package[libgd-graph-perl]', 'Package[libgd-text-perl]', 'Package[libio-socket-ssl-perl]', 'Package[libjson-xs-perl]', 'Package[libnet-ldap-perl]', 'Package[libpdf-api2-perl]', 'Package[libsoap-lite-perl]', 'Package[libtext-csv-xs-perl]', 'Package[libtimedate-perl]', 'Package[libyaml-libyaml-perl]', 'Package[libarchive-zip-perl]', 'Package[libmoo-perl]', 'Package[libnamespace-clean-perl]', 'Package[perl-doc]', 'Package[libdatetime-perl]', 'Package[libxml-libxml-perl]', 'Package[libxml-libxslt-perl]', 'Package[libencode-hanextra-perl]', 'Package[libauthen-sasl-perl]', 'Package[libmail-imapclient-perl]', 'Package[libical-parser-perl]', 'Package[libdata-uuid-perl]', 'Package[default-mysql-client]', 'Package[libdatetime-timezone-perl]', 'Package[rspamd]', 'Package[prometheus-sql-exporter]', 'Package[links]', 'Package[envoyproxy]', 'Package[prometheus-rsyslog-exporter]', 'Package[initramfs-tools]', 'Package[python3-click]', 'Package[python3-box]', 'Package[confd]', 'Package[python3-toml]', 'Package[prometheus-apache-exporter]', 'Package[rsync]', 'Package[stunnel4]']

Class[Rspamd::Repo]

Parameters differences:

--- Class[Rspamd::Repo].orig
+++ Class[Rspamd::Repo]

+    before => ['Class[Rspamd::Install]']

Systemd::Unit[wmf_auto_restart_rspamd.service]

Parameters differences:

--- Systemd::Unit[wmf_auto_restart_rspamd.service].orig
+++ Systemd::Unit[wmf_auto_restart_rspamd.service]

+    unit              => wmf_auto_restart_rspamd.service
+    override          => False
+    override_filename => puppet-override.conf
+    restart           => False
+    require           => ['Class[Systemd]']
+    ensure            => present

Logrotate::Conf[vrts_train_mail_filters]

Parameters differences:

--- Logrotate::Conf[vrts_train_mail_filters].orig
+++ Logrotate::Conf[vrts_train_mail_filters]

+    ensure => present

Systemd::Unit[vrts_train_spamassassin.service]

Parameters differences:

--- Systemd::Unit[vrts_train_spamassassin.service].orig
+++ Systemd::Unit[vrts_train_spamassassin.service]

@@
-    ensure => present
+    ensure => absent

Systemd::Service[vrts_train_mail_filters]

Parameters differences:

--- Systemd::Service[vrts_train_mail_filters].orig
+++ Systemd::Service[vrts_train_mail_filters]

+    migration_task           => T407130
+    require                  => Systemd::Unit[vrts_train_mail_filters.service]
+    monitoring_contact_group => admins
+    unit_type                => timer
+    monitoring_enabled       => False
+    monitoring_critical      => False
+    service_params           => {}
+    override                 => False
+    restart                  => False
+    ensure                   => present

File[purge unmanaged rspamd override.d files]

Parameters differences:

--- File[purge unmanaged rspamd override.d files].orig
+++ File[purge unmanaged rspamd override.d files]

+    owner   => root
+    ensure  => directory
+    group   => root
+    path    => /etc/rspamd/override.d
+    purge   => True
+    recurse => True

Exec[systemd daemon-reload for wmf_auto_restart_rspamd.service (wmf_auto_restart_rspamd.service)]

Parameters differences:

--- Exec[systemd daemon-reload for wmf_auto_restart_rspamd.service (wmf_auto_restart_rspamd.service)].orig
+++ Exec[systemd daemon-reload for wmf_auto_restart_rspamd.service (wmf_auto_restart_rspamd.service)]

+    refreshonly => True
+    command     => /bin/systemctl daemon-reload

Systemd::Unit[rsync-vrts-rspamd-data.timer]

Parameters differences:

--- Systemd::Unit[rsync-vrts-rspamd-data.timer].orig
+++ Systemd::Unit[rsync-vrts-rspamd-data.timer]

+    unit              => rsync-vrts-rspamd-data.timer
+    override          => False
+    override_filename => puppet-override.conf
+    restart           => False
+    require           => ['Class[Systemd]']
+    ensure            => absent

File[/lib/systemd/system/vrts_train_mail_filters.service]

Parameters differences:

--- File[/lib/systemd/system/vrts_train_mail_filters.service].orig
+++ File[/lib/systemd/system/vrts_train_mail_filters.service]

+    owner  => root
+    mode   => 0444
+    group  => root
+    ensure => present
+    notify => Exec[systemd daemon-reload for vrts_train_mail_filters.service (vrts_train_mail_filters.service)]

Content differences:

--- /lib/systemd/system/vrts_train_mail_filters.service.orig
+++ /lib/systemd/system/vrts_train_mail_filters.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=VRTS - train SpamAssassin and Rspamd filters
+Documentation=https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
+
+[Service]
+Type=oneshot
+User=root
+ExecStart=/usr/local/bin/train_mail_filters.py --train-spamassassin --train-rspamd --rspamd-controller localhost:11334 --rspamd-password-file /etc/vrts/rspamd-controller.password

Exec[systemd daemon-reload for rsync-vrts-rspamd-data.service (rsync-vrts-rspamd-data.service)]

Parameters differences:

--- Exec[systemd daemon-reload for rsync-vrts-rspamd-data.service (rsync-vrts-rspamd-data.service)].orig
+++ Exec[systemd daemon-reload for rsync-vrts-rspamd-data.service (rsync-vrts-rspamd-data.service)]

+    refreshonly => True
+    command     => /bin/systemctl daemon-reload

File[/etc/rsyslog.d/40-vrts-train-mail-filters.conf]

Parameters differences:

--- File[/etc/rsyslog.d/40-vrts-train-mail-filters.conf].orig
+++ File[/etc/rsyslog.d/40-vrts-train-mail-filters.conf]

+    owner  => root
+    mode   => 0444
+    group  => root
+    ensure => present
+    notify => Service[rsyslog]

Content differences:

--- /etc/rsyslog.d/40-vrts-train-mail-filters.conf.orig
+++ /etc/rsyslog.d/40-vrts-train-mail-filters.conf
@@ -0,0 +1,10 @@
+# rsyslog.conf(5) configuration file for services.
+# This file is managed by Puppet.
+if $programname startswith "vrts_train_mail_filters" then {
+    action(
+        type="omfile" file="/var/log/vrts_train_mail_filters/syslog.log"
+        fileOwner="root" fileGroup="root"
+        fileCreateMode="0644"
+    )
+    & stop
+}

File[purge unmanaged rspamd local.d files]

Parameters differences:

--- File[purge unmanaged rspamd local.d files].orig
+++ File[purge unmanaged rspamd local.d files]

+    owner   => root
+    ensure  => directory
+    group   => root
+    path    => /etc/rspamd/local.d
+    purge   => True
+    recurse => True

Systemd::Timer::Job[vrts_train_spamassassin]

Parameters differences:

--- Systemd::Timer::Job[vrts_train_spamassassin].orig
+++ Systemd::Timer::Job[vrts_train_spamassassin]

@@
-    ensure => present
+    ensure => absent

Profile::Auto_restarts::Service[rspamd]

Parameters differences:

--- Profile::Auto_restarts::Service[rspamd].orig
+++ Profile::Auto_restarts::Service[rspamd]

+    ensure => present

File[/etc/rsyslog.d/40-wmf-auto-restart-rspamd.conf]

Parameters differences:

--- File[/etc/rsyslog.d/40-wmf-auto-restart-rspamd.conf].orig
+++ File[/etc/rsyslog.d/40-wmf-auto-restart-rspamd.conf]

+    owner  => root
+    mode   => 0444
+    group  => root
+    ensure => present
+    notify => Service[rsyslog]

Content differences:

--- /etc/rsyslog.d/40-wmf-auto-restart-rspamd.conf.orig
+++ /etc/rsyslog.d/40-wmf-auto-restart-rspamd.conf
@@ -0,0 +1,10 @@
+# rsyslog.conf(5) configuration file for services.
+# This file is managed by Puppet.
+if $programname startswith "wmf_auto_restart_rspamd" then {
+    action(
+        type="omfile" file="/var/log/wmf_auto_restart_rspamd/syslog.log"
+        fileOwner="root" fileGroup="root"
+        fileCreateMode="0644"
+    )
+    & stop
+}

Systemd::Service[wmf_auto_restart_rspamd]

Parameters differences:

--- Systemd::Service[wmf_auto_restart_rspamd].orig
+++ Systemd::Service[wmf_auto_restart_rspamd]

+    migration_task           => T407130
+    require                  => Systemd::Unit[wmf_auto_restart_rspamd.service]
+    monitoring_contact_group => admins
+    unit_type                => timer
+    monitoring_enabled       => False
+    monitoring_critical      => False
+    service_params           => {}
+    override                 => False
+    restart                  => False
+    ensure                   => present

Systemd::Timer::Job[vrts_train_mail_filters]

Parameters differences:

--- Systemd::Timer::Job[vrts_train_mail_filters].orig
+++ Systemd::Timer::Job[vrts_train_mail_filters]

+    ignore_errors             => False
+    fixed_random_delay        => False
+    success_exit_status       => []
+    private_tmp               => False
+    logfile_group             => root
+    monitoring_enabled        => False
+    monitoring_contact_groups => admins
+    logfile_name              => syslog.log
+    monitoring_notes_url      => https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
+    syslog_match_startswith   => True
+    send_mail_to              => root@vrts1003.eqiad.wmnet
+    syslog_force_stop         => True
+    interval                  => {'start': 'OnCalendar', 'interval': '*-*-* *:05:00'}
+    require                   => ['File[/usr/local/bin/train_mail_filters.py]', 'Class[Spamassassin]', 'Class[Rspamd]', 'File[/etc/vrts/rspamd-controller.password]']
+    user                      => root
+    command                   => /usr/local/bin/train_mail_filters.py --train-spamassassin --train-rspamd --rspamd-controller localhost:11334 --rspamd-password-file /etc/vrts/rspamd-controller.password
+    logging_enabled           => True
+    send_mail_only_on_error   => True
+    logfile_basedir           => /var/log
+    logfile_perms             => all
+    send_mail                 => False
+    ensure                    => present
+    description               => VRTS - train SpamAssassin and Rspamd filters
+    environment               => {}

Exec[systemd daemon-reload for wmf_auto_restart_rspamd.timer (wmf_auto_restart_rspamd.timer)]

Parameters differences:

--- Exec[systemd daemon-reload for wmf_auto_restart_rspamd.timer (wmf_auto_restart_rspamd.timer)].orig
+++ Exec[systemd daemon-reload for wmf_auto_restart_rspamd.timer (wmf_auto_restart_rspamd.timer)]

+    refreshonly => True
+    before      => ['Service[wmf_auto_restart_rspamd.timer]']
+    command     => /bin/systemctl daemon-reload

File[/var/log/vrts_train_mail_filters]

Parameters differences:

--- File[/var/log/vrts_train_mail_filters].orig
+++ File[/var/log/vrts_train_mail_filters]

+    force  => True
+    owner  => root
+    mode   => 0755
+    backup => False
+    group  => root
+    ensure => directory

File[/lib/systemd/system/rsync-vrts-rspamd-data.timer]

Parameters differences:

--- File[/lib/systemd/system/rsync-vrts-rspamd-data.timer].orig
+++ File[/lib/systemd/system/rsync-vrts-rspamd-data.timer]

+    owner  => root
+    mode   => 0444
+    group  => root
+    ensure => absent
+    notify => Exec[systemd daemon-reload for rsync-vrts-rspamd-data.timer (rsync-vrts-rspamd-data.timer)]

Content differences:

--- /lib/systemd/system/rsync-vrts-rspamd-data.timer.orig
+++ /lib/systemd/system/rsync-vrts-rspamd-data.timer
@@ -0,0 +1,12 @@
+[Unit]
+Description=Periodic execution of rsync-vrts-rspamd-data.service
+
+[Timer]
+Unit=rsync-vrts-rspamd-data.service
+# Accuracy sets the maximum time interval around the execution time we want to allow
+AccuracySec=15sec
+OnCalendar=*-*-* *:15:00
+RandomizedDelaySec=0
+
+[Install]
+WantedBy=multi-user.target

Exec[systemd daemon-reload for vrts_train_spamassassin.timer (vrts_train_spamassassin.timer)]

Parameters differences:

--- Exec[systemd daemon-reload for vrts_train_spamassassin.timer (vrts_train_spamassassin.timer)].orig
+++ Exec[systemd daemon-reload for vrts_train_spamassassin.timer (vrts_train_spamassassin.timer)]

-    before => ['Service[vrts_train_spamassassin.timer]']

Systemd::Timer[rsync-vrts-rspamd-data]

Parameters differences:

--- Systemd::Timer[rsync-vrts-rspamd-data].orig
+++ Systemd::Timer[rsync-vrts-rspamd-data]

+    fixed_random_delay => False
+    timer_intervals    => [{'start': 'OnCalendar', 'interval': '*-*-* *:15:00'}]
+    unit_name          => rsync-vrts-rspamd-data.service
+    ensure             => absent
+    accuracy           => 15sec
+    splay              => 0

Rsyslog::Conf[vrts_train_spamassassin]

Parameters differences:

--- Rsyslog::Conf[vrts_train_spamassassin].orig
+++ Rsyslog::Conf[vrts_train_spamassassin]

@@
-    ensure => present
+    ensure => absent

Service[wmf_auto_restart_rspamd.timer]

Parameters differences:

--- Service[wmf_auto_restart_rspamd.timer].orig
+++ Service[wmf_auto_restart_rspamd.timer]

+    provider => systemd
+    ensure   => running
+    enable   => True

Package[rspamd]

Parameters differences:

--- Package[rspamd].orig
+++ Package[rspamd]

+    provider => apt
+    ensure   => present

Systemd::Timer[wmf_auto_restart_rspamd]

Parameters differences:

--- Systemd::Timer[wmf_auto_restart_rspamd].orig
+++ Systemd::Timer[wmf_auto_restart_rspamd]

+    fixed_random_delay => False
+    timer_intervals    => [{'start': 'OnCalendar', 'interval': 'Mon,Tue,Wed,Thu,Fri *-*-* 1:6:00'}]
+    unit_name          => wmf_auto_restart_rspamd.service
+    ensure             => present
+    accuracy           => 15sec
+    splay              => 0

Class[Rspamd::Install]

Parameters differences:

--- Class[Rspamd::Install].orig
+++ Class[Rspamd::Install]

+    before => ['Class[Rspamd::Configuration]']

File[/lib/systemd/system/wmf_auto_restart_rspamd.timer]

Parameters differences:

--- File[/lib/systemd/system/wmf_auto_restart_rspamd.timer].orig
+++ File[/lib/systemd/system/wmf_auto_restart_rspamd.timer]

+    owner  => root
+    mode   => 0444
+    group  => root
+    ensure => present
+    notify => Exec[systemd daemon-reload for wmf_auto_restart_rspamd.timer (wmf_auto_restart_rspamd.timer)]

Content differences:

--- /lib/systemd/system/wmf_auto_restart_rspamd.timer.orig
+++ /lib/systemd/system/wmf_auto_restart_rspamd.timer
@@ -0,0 +1,12 @@
+[Unit]
+Description=Periodic execution of wmf_auto_restart_rspamd.service
+
+[Timer]
+Unit=wmf_auto_restart_rspamd.service
+# Accuracy sets the maximum time interval around the execution time we want to allow
+AccuracySec=15sec
+OnCalendar=Mon,Tue,Wed,Thu,Fri *-*-* 1:6:00
+RandomizedDelaySec=0
+
+[Install]
+WantedBy=multi-user.target

File[/etc/logrotate.d/vrts_train_spamassassin]

Parameters differences:

--- File[/etc/logrotate.d/vrts_train_spamassassin].orig
+++ File[/etc/logrotate.d/vrts_train_spamassassin]

@@
-    ensure => present
+    ensure => absent

Service[vrts_train_mail_filters.timer]

Parameters differences:

--- Service[vrts_train_mail_filters.timer].orig
+++ Service[vrts_train_mail_filters.timer]

+    provider => systemd
+    ensure   => running
+    enable   => True

File[/etc/rspamd/local.d/classifier-bayes.conf]

Parameters differences:

--- File[/etc/rspamd/local.d/classifier-bayes.conf].orig
+++ File[/etc/rspamd/local.d/classifier-bayes.conf]

+    owner   => root
+    mode    => 0444
+    group   => _rspamd
+    require => Package[rspamd]
+    ensure  => file
+    notify  => Service[rspamd]

Content differences:

--- /etc/rspamd/local.d/classifier-bayes.conf.orig
+++ /etc/rspamd/local.d/classifier-bayes.conf
@@ -0,0 +1,15 @@
+backend = "sqlite3";
+cache {
+  type = "sqlite3";
+  path = "/var/lib/rspamd/learn_cache.sqlite";
+}
+statfile {
+  symbol = "BAYES_HAM";
+  spam = false;
+  path = "/var/lib/rspamd/bayes.ham.sqlite";
+}
+statfile {
+  symbol = "BAYES_SPAM";
+  spam = true;
+  path = "/var/lib/rspamd/bayes.spam.sqlite";
+}

File_line[auto_restart_file_presence_rspamd]

Parameters differences:

--- File_line[auto_restart_file_presence_rspamd].orig
+++ File_line[auto_restart_file_presence_rspamd]

+    path    => /etc/debdeploy-client/autorestarts.conf
+    require => File[/etc/debdeploy-client/autorestarts.conf]
+    ensure  => present
+    line    => rspamd

File[/etc/logrotate.d/vrts_train_mail_filters]

Parameters differences:

--- File[/etc/logrotate.d/vrts_train_mail_filters].orig
+++ File[/etc/logrotate.d/vrts_train_mail_filters]

+    owner  => root
+    ensure => present
+    mode   => 0444
+    group  => root

Content differences:

--- /etc/logrotate.d/vrts_train_mail_filters.orig
+++ /etc/logrotate.d/vrts_train_mail_filters
@@ -0,0 +1,12 @@
+# logrotate(8) config for vrts_train_mail_filters
+
+/var/log/vrts_train_mail_filters/*.log {
+    daily
+    copytruncate
+    missingok
+    compress
+    delaycompress
+    notifempty
+    rotate 15
+    size 256M
+}

Class[Vrts]

Parameters differences:

--- Class[Vrts].orig
+++ Class[Vrts]

+    before => ['Class[Profile::Mail::Vrts::Training]']

Class[Rspamd]

Parameters differences:

--- Class[Rspamd].orig
+++ Class[Rspamd]

+    config              => {}
+    package_ensure      => present
+    purge_unmanaged     => True
+    config_path         => /etc/rspamd
+    manage_package_repo => False
+    service_manage      => True
+    package_manage      => True
+    package_name        => rspamd

File[/var/log/rsync-vrts-rspamd-data]

Parameters differences:

--- File[/var/log/rsync-vrts-rspamd-data].orig
+++ File[/var/log/rsync-vrts-rspamd-data]

+    force  => True
+    owner  => root
+    mode   => 0755
+    backup => False
+    group  => root
+    ensure => absent

File[/etc/rsyslog.d/40-rsync-vrts-rspamd-data.conf]

Parameters differences:

--- File[/etc/rsyslog.d/40-rsync-vrts-rspamd-data.conf].orig
+++ File[/etc/rsyslog.d/40-rsync-vrts-rspamd-data.conf]

+    owner  => root
+    mode   => 0444
+    group  => root
+    ensure => absent
+    notify => Service[rsyslog]

Content differences:

--- /etc/rsyslog.d/40-rsync-vrts-rspamd-data.conf.orig
+++ /etc/rsyslog.d/40-rsync-vrts-rspamd-data.conf
@@ -0,0 +1,10 @@
+# rsyslog.conf(5) configuration file for services.
+# This file is managed by Puppet.
+if $programname startswith "rsync-vrts-rspamd-data" then {
+    action(
+        type="omfile" file="/var/log/rsync-vrts-rspamd-data/syslog.log"
+        fileOwner="root" fileGroup="root"
+        fileCreateMode="0644"
+    )
+    & stop
+}

Exec[systemd daemon-reload for vrts_train_mail_filters.timer (vrts_train_mail_filters.timer)]

Parameters differences:

--- Exec[systemd daemon-reload for vrts_train_mail_filters.timer (vrts_train_mail_filters.timer)].orig
+++ Exec[systemd daemon-reload for vrts_train_mail_filters.timer (vrts_train_mail_filters.timer)]

+    refreshonly => True
+    before      => ['Service[vrts_train_mail_filters.timer]']
+    command     => /bin/systemctl daemon-reload

Exec[systemd daemon-reload for rsync-vrts-rspamd-data.timer (rsync-vrts-rspamd-data.timer)]

Parameters differences:

--- Exec[systemd daemon-reload for rsync-vrts-rspamd-data.timer (rsync-vrts-rspamd-data.timer)].orig
+++ Exec[systemd daemon-reload for rsync-vrts-rspamd-data.timer (rsync-vrts-rspamd-data.timer)]

+    refreshonly => True
+    command     => /bin/systemctl daemon-reload

Logrotate::Conf[vrts_train_spamassassin]

Parameters differences:

--- Logrotate::Conf[vrts_train_spamassassin].orig
+++ Logrotate::Conf[vrts_train_spamassassin]

@@
-    ensure => present
+    ensure => absent

File[/etc/nftables/input/10_rsyncd_access_vrts-rspamd-data.nft]

Parameters differences:

--- File[/etc/nftables/input/10_rsyncd_access_vrts-rspamd-data.nft].orig
+++ File[/etc/nftables/input/10_rsyncd_access_vrts-rspamd-data.nft]

+    owner  => root
+    mode   => 0444
+    ensure => present
+    tag    => nft
+    group  => root
+    notify => ['Service[nftables]']

Content differences:

--- /etc/nftables/input/10_rsyncd_access_vrts-rspamd-data.nft.orig
+++ /etc/nftables/input/10_rsyncd_access_vrts-rspamd-data.nft
@@ -0,0 +1,4 @@
+# Managed by puppet
+# 
+ip saddr { 10.192.9.10 } tcp dport { 873, 1873 } accept
+ip6 saddr { 2620:0:860:10a:10:192:9:10 } tcp dport { 873, 1873 } accept

Rsync::Quickdatacopy[vrts-rspamd-data]

Parameters differences:

--- Rsync::Quickdatacopy[vrts-rspamd-data].orig
+++ Rsync::Quickdatacopy[vrts-rspamd-data]

+    source_host                => vrts1003.eqiad.wmnet
+    require                    => Class[Rspamd]
+    auto_sync                  => True
+    ignore_missing_file_errors => False
+    module_path                => /var/lib/rspamd
+    progress                   => False
+    auto_interval              => {'start': 'OnCalendar', 'interval': '*-*-* *:15:00'}
+    delete                     => True
+    ensure                     => present
+    dest_host                  => vrts2002.codfw.wmnet
+    server_uses_stunnel        => True

File[/etc/rsyslog.d/40-vrts-train-spamassassin.conf]

Parameters differences:

--- File[/etc/rsyslog.d/40-vrts-train-spamassassin.conf].orig
+++ File[/etc/rsyslog.d/40-vrts-train-spamassassin.conf]

@@
-    ensure => present
+    ensure => absent

File[/lib/systemd/system/wmf_auto_restart_rspamd.service]

Parameters differences:

--- File[/lib/systemd/system/wmf_auto_restart_rspamd.service].orig
+++ File[/lib/systemd/system/wmf_auto_restart_rspamd.service]

+    owner  => root
+    mode   => 0444
+    group  => root
+    ensure => present
+    notify => Exec[systemd daemon-reload for wmf_auto_restart_rspamd.service (wmf_auto_restart_rspamd.service)]

Content differences:

--- /lib/systemd/system/wmf_auto_restart_rspamd.service.orig
+++ /lib/systemd/system/wmf_auto_restart_rspamd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Auto restart job: rspamd
+Documentation=https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
+
+[Service]
+Type=oneshot
+User=root
+ExecStart=/usr/local/sbin/wmf-auto-restart -s rspamd

Logrotate::Conf[rsync-vrts-rspamd-data]

Parameters differences:

--- Logrotate::Conf[rsync-vrts-rspamd-data].orig
+++ Logrotate::Conf[rsync-vrts-rspamd-data]

+    ensure => absent

Systemd::Syslog[wmf_auto_restart_rspamd]

Parameters differences:

--- Systemd::Syslog[wmf_auto_restart_rspamd].orig
+++ Systemd::Syslog[wmf_auto_restart_rspamd]

+    readable_by            => all
+    force_stop             => True
+    owner                  => root
+    ensure                 => present
+    group                  => root
+    programname_comparison => startswith
+    log_filename           => syslog.log
+    base_dir               => /var/log

Systemd::Unit[vrts_train_mail_filters.service]

Parameters differences:

--- Systemd::Unit[vrts_train_mail_filters.service].orig
+++ Systemd::Unit[vrts_train_mail_filters.service]

+    unit              => vrts_train_mail_filters.service
+    override          => False
+    override_filename => puppet-override.conf
+    restart           => False
+    require           => ['Class[Systemd]']
+    ensure            => present

Service[rspamd]

Parameters differences:

--- Service[rspamd].orig
+++ Service[rspamd]

+    subscribe => Class[Rspamd::Install]
+    ensure    => running
+    enable    => True

Concat::Fragment[/etc/rsyncd.conf-vrts-rspamd-data]

Parameters differences:

--- Concat::Fragment[/etc/rsyncd.conf-vrts-rspamd-data].orig
+++ Concat::Fragment[/etc/rsyncd.conf-vrts-rspamd-data]

+    order  => 10
+    target => /etc/rsyncd.conf

File[/lib/systemd/system/vrts_train_spamassassin.service]

Parameters differences:

--- File[/lib/systemd/system/vrts_train_spamassassin.service].orig
+++ File[/lib/systemd/system/vrts_train_spamassassin.service]

@@
-    ensure => present
+    ensure => absent

File[/var/log/vrts_train_spamassassin]

Parameters differences:

--- File[/var/log/vrts_train_spamassassin].orig
+++ File[/var/log/vrts_train_spamassassin]

@@
-    ensure => directory
+    ensure => absent

Systemd::Syslog[vrts_train_mail_filters]

Parameters differences:

--- Systemd::Syslog[vrts_train_mail_filters].orig
+++ Systemd::Syslog[vrts_train_mail_filters]

+    readable_by            => all
+    force_stop             => True
+    owner                  => root
+    ensure                 => present
+    group                  => root
+    programname_comparison => startswith
+    log_filename           => syslog.log
+    base_dir               => /var/log

Service[vrts_train_spamassassin.timer]

Parameters differences:

--- Service[vrts_train_spamassassin.timer].orig
+++ Service[vrts_train_spamassassin.timer]

+    before => ['Exec[systemd daemon-reload for vrts_train_spamassassin.timer (vrts_train_spamassassin.timer)]']
@@
-    ensure => running
+    ensure => stopped
@@
-    enable => True
+    enable => False

Systemd::Service[vrts_train_spamassassin]

Parameters differences:

--- Systemd::Service[vrts_train_spamassassin].orig
+++ Systemd::Service[vrts_train_spamassassin]

@@
-    ensure => present
+    ensure => absent

Systemd::Timer::Job[rsync-vrts-rspamd-data]

Parameters differences:

--- Systemd::Timer::Job[rsync-vrts-rspamd-data].orig
+++ Systemd::Timer::Job[rsync-vrts-rspamd-data]

+    ignore_errors             => False
+    success_exit_status       => []
+    fixed_random_delay        => False
+    private_tmp               => False
+    logfile_group             => root
+    monitoring_enabled        => False
+    monitoring_contact_groups => admins
+    logfile_name              => syslog.log
+    monitoring_notes_url      => https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
+    syslog_match_startswith   => True
+    send_mail_to              => root@vrts1003.eqiad.wmnet
+    syslog_force_stop         => True
+    interval                  => {'start': 'OnCalendar', 'interval': '*-*-* *:15:00'}
+    user                      => root
+    command                   => /usr/local/sbin/sync-vrts-rspamd-data
+    logging_enabled           => True
+    send_mail_only_on_error   => True
+    logfile_basedir           => /var/log
+    logfile_perms             => all
+    send_mail                 => False
+    ensure                    => absent
+    description               => Transfer data periodically between hosts
+    environment               => {}

Rsyslog::Conf[rsync-vrts-rspamd-data]

Parameters differences:

--- Rsyslog::Conf[rsync-vrts-rspamd-data].orig
+++ Rsyslog::Conf[rsync-vrts-rspamd-data]

+    priority => 40
+    ensure   => absent
+    mode     => 0444
+    require  => File[/var/log/rsync-vrts-rspamd-data]

Rsyslog::Conf[vrts_train_mail_filters]

Parameters differences:

--- Rsyslog::Conf[vrts_train_mail_filters].orig
+++ Rsyslog::Conf[vrts_train_mail_filters]

+    priority => 40
+    ensure   => present
+    mode     => 0444
+    require  => File[/var/log/vrts_train_mail_filters]

Systemd::Timer::Job[wmf_auto_restart_rspamd]

Parameters differences:

--- Systemd::Timer::Job[wmf_auto_restart_rspamd].orig
+++ Systemd::Timer::Job[wmf_auto_restart_rspamd]

+    ignore_errors             => False
+    fixed_random_delay        => False
+    success_exit_status       => []
+    private_tmp               => False
+    logfile_group             => root
+    monitoring_enabled        => False
+    monitoring_contact_groups => admins
+    logfile_name              => syslog.log
+    monitoring_notes_url      => https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
+    syslog_match_startswith   => True
+    send_mail_to              => root@vrts1003.eqiad.wmnet
+    syslog_force_stop         => True
+    interval                  => {'start': 'OnCalendar', 'interval': 'Mon,Tue,Wed,Thu,Fri *-*-* 1:6:00'}
+    require                   => File[/usr/local/sbin/wmf-auto-restart]
+    user                      => root
+    command                   => /usr/local/sbin/wmf-auto-restart -s rspamd
+    logging_enabled           => True
+    send_mail_only_on_error   => True
+    logfile_basedir           => /var/log
+    logfile_perms             => all
+    send_mail                 => False
+    ensure                    => present
+    description               => Auto restart job: rspamd
+    environment               => {}

Nftables::Service[rsyncd_access_vrts-rspamd-data]

Parameters differences:

--- Nftables::Service[rsyncd_access_vrts-rspamd-data].orig
+++ Nftables::Service[rsyncd_access_vrts-rspamd-data]

+    prio                => 10
+    unrestricted_access => False
+    desc                => 
+    notrack             => False
+    proto               => tcp
+    src_ips             => ['10.192.9.10', '2620:0:860:10a:10:192:9:10']
+    port                => [873, 1873]
+    ensure              => present

Systemd::Service[rsync-vrts-rspamd-data]

Parameters differences:

--- Systemd::Service[rsync-vrts-rspamd-data].orig
+++ Systemd::Service[rsync-vrts-rspamd-data]

+    migration_task           => T407130
+    require                  => Systemd::Unit[rsync-vrts-rspamd-data.service]
+    monitoring_contact_group => admins
+    unit_type                => timer
+    monitoring_enabled       => False
+    monitoring_critical      => False
+    service_params           => {}
+    override                 => False
+    restart                  => False
+    ensure                   => absent

File[/etc/logrotate.d/wmf_auto_restart_rspamd]

Parameters differences:

--- File[/etc/logrotate.d/wmf_auto_restart_rspamd].orig
+++ File[/etc/logrotate.d/wmf_auto_restart_rspamd]

+    owner  => root
+    ensure => present
+    mode   => 0444
+    group  => root

Content differences:

--- /etc/logrotate.d/wmf_auto_restart_rspamd.orig
+++ /etc/logrotate.d/wmf_auto_restart_rspamd
@@ -0,0 +1,12 @@
+# logrotate(8) config for wmf_auto_restart_rspamd
+
+/var/log/wmf_auto_restart_rspamd/*.log {
+    daily
+    copytruncate
+    missingok
+    compress
+    delaycompress
+    notifempty
+    rotate 15
+    size 256M
+}

Rsync::Server::Module[vrts-rspamd-data]

Parameters differences:

--- Rsync::Server::Module[vrts-rspamd-data].orig
+++ Rsync::Server::Module[vrts-rspamd-data]

+    chroot          => True
+    qos_low         => False
+    read_only       => yes
+    write_only      => no
+    lock_file       => /var/run/rsyncd.lock
+    gid             => 0
+    auto_firewall   => True
+    list            => yes
+    path            => /var/lib/rspamd
+    ensure          => present
+    hosts_allow     => ['vrts2002.codfw.wmnet']
+    uid             => 0
+    max_connections => 0

Systemd::Unit[wmf_auto_restart_rspamd.timer]

Parameters differences:

--- Systemd::Unit[wmf_auto_restart_rspamd.timer].orig
+++ Systemd::Unit[wmf_auto_restart_rspamd.timer]

+    unit              => wmf_auto_restart_rspamd.timer
+    override          => False
+    override_filename => puppet-override.conf
+    restart           => False
+    require           => ['Class[Systemd]']
+    ensure            => present

Firewall::Service[rsyncd_access_vrts-rspamd-data]

Parameters differences:

--- Firewall::Service[rsyncd_access_vrts-rspamd-data].orig
+++ Firewall::Service[rsyncd_access_vrts-rspamd-data]

+    prio                => 10
+    unrestricted_access => False
+    desc                => 
+    notrack             => False
+    proto               => tcp
+    srange              => ['vrts2002.codfw.wmnet']
+    port                => [873, 1873]
+    ensure              => present

Class[Rspamd::Configuration]

Parameters differences:

--- Class[Rspamd::Configuration].orig
+++ Class[Rspamd::Configuration]

+    notify => ['Class[Rspamd::Service]']

Systemd::Timer[vrts_train_spamassassin]

Parameters differences:

--- Systemd::Timer[vrts_train_spamassassin].orig
+++ Systemd::Timer[vrts_train_spamassassin]

@@
-    ensure => present
+    ensure => absent

Compilation results for vrts1003.eqiad.wmnet: System changes detected

Catalog differences

Summary

Resources only in the new catalog

Resources modified

Relevant files