--- 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[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[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]']
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_filename => puppet-override.conf
+ ensure => absent
+ require => ['Class[Systemd]']
+ restart => False
+ override => False
- Systemd::Syslog[vrts_train_mail_filters]
- Parameters differences:
--- Systemd::Syslog[vrts_train_mail_filters].orig
+++ Systemd::Syslog[vrts_train_mail_filters]
+ base_dir => /var/log
+ log_filename => syslog.log
+ programname_comparison => startswith
+ force_stop => True
+ readable_by => all
+ ensure => absent
+ group => root
+ owner => root
- 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]
+ ensure => absent
+ group => root
+ mode => 0444
+ owner => 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
+}
- 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]
+ mode => 0444
+ notify => Exec[systemd daemon-reload for vrts_train_mail_filters.service (vrts_train_mail_filters.service)]
+ ensure => absent
+ group => root
+ owner => root
- 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=/bin/sh -c '/usr/local/bin/train_mail_filters.py --train-spamassassin --train-rspamd --rspamd-controller localhost:11334 --prometheus-metrics-path /var/lib/prometheus/node.d/train_mail_filters.prom && /usr/local/sbin/rspamd_sqlite_backup.py backup --source-dir /var/lib/rspamd --backup-dir /var/lib/rspamd/backup'
- Systemd::Timer::Job[rsync-vrts-rspamd-data]
- Parameters differences:
--- Systemd::Timer::Job[rsync-vrts-rspamd-data].orig
+++ Systemd::Timer::Job[rsync-vrts-rspamd-data]
+ description => Transfer data periodically between hosts
+ logfile_basedir => /var/log
+ private_tmp => False
+ send_mail_only_on_error => True
+ logging_enabled => True
+ logfile_perms => all
+ syslog_force_stop => True
+ interval => {'start': 'OnCalendar', 'interval': '*-*-* *:00/10:00'}
+ ensure => absent
+ command => /usr/local/sbin/sync-vrts-rspamd-data
+ logfile_group => root
+ logfile_name => syslog.log
+ monitoring_notes_url => https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
+ send_mail_to => root@vrts2002.codfw.wmnet
+ monitoring_enabled => False
+ monitoring_contact_groups => admins
+ user => root
+ environment => {}
+ success_exit_status => []
+ syslog_match_startswith => True
+ ignore_errors => False
+ fixed_random_delay => False
+ send_mail => False
- Service[vrts_train_mail_filters.timer]
- Parameters differences:
--- Service[vrts_train_mail_filters.timer].orig
+++ Service[vrts_train_mail_filters.timer]
+ provider => systemd
+ ensure => stopped
+ enable => False
+ before => ['Exec[systemd daemon-reload for vrts_train_mail_filters.timer (vrts_train_mail_filters.timer)]']
- Class[Profile::Mail::Vrts::Training]
- Parameters differences:
--- Class[Profile::Mail::Vrts::Training].orig
+++ Class[Profile::Mail::Vrts::Training]
+ active_host => vrts1003.eqiad.wmnet
+ passive_host => vrts2002.codfw.wmnet
+ train_spamassassin => True
+ train_rspamd => True
- 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
+ require => File[/var/log/rsync-vrts-rspamd-data]
+ mode => 0444
- Systemd::Timer[vrts_train_spamassassin]
- Parameters differences:
--- Systemd::Timer[vrts_train_spamassassin].orig
+++ Systemd::Timer[vrts_train_spamassassin]
@@
- ensure => present
+ ensure => absent
- 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[/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]
+ mode => 0444
+ notify => Exec[systemd daemon-reload for vrts_train_mail_filters.timer (vrts_train_mail_filters.timer)]
+ ensure => absent
+ group => root
+ owner => root
- 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
- Logrotate::Conf[vrts_train_mail_filters]
- Parameters differences:
--- Logrotate::Conf[vrts_train_mail_filters].orig
+++ Logrotate::Conf[vrts_train_mail_filters]
+ ensure => absent
- 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
- 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::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_filename => puppet-override.conf
+ ensure => present
+ require => ['Class[Systemd]']
+ restart => False
+ override => False
- 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::Unit[vrts_sync_rspamd_data.timer]
- Parameters differences:
--- Systemd::Unit[vrts_sync_rspamd_data.timer].orig
+++ Systemd::Unit[vrts_sync_rspamd_data.timer]
+ unit => vrts_sync_rspamd_data.timer
+ override_filename => puppet-override.conf
+ ensure => present
+ require => ['Class[Systemd]']
+ restart => False
+ override => False
- File[/usr/local/bin/train_spamassassin]
- Parameters differences:
--- File[/usr/local/bin/train_spamassassin].orig
+++ File[/usr/local/bin/train_spamassassin]
- mode => 0555
- source => puppet:///modules/vrts/train_spamassassin
@@
- ensure => file
+ ensure => absent
- Systemd::Syslog[wmf_auto_restart_rspamd]
- Parameters differences:
--- Systemd::Syslog[wmf_auto_restart_rspamd].orig
+++ Systemd::Syslog[wmf_auto_restart_rspamd]
+ base_dir => /var/log
+ log_filename => syslog.log
+ programname_comparison => startswith
+ force_stop => True
+ readable_by => all
+ ensure => present
+ group => root
+ owner => root
- 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]
+ ensure => absent
+ group => root
+ mode => 0444
+ owner => 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
+}
- Systemd::Service[vrts_train_spamassassin]
- Parameters differences:
--- Systemd::Service[vrts_train_spamassassin].orig
+++ Systemd::Service[vrts_train_spamassassin]
@@
- ensure => present
+ ensure => absent
- 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
- 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_line[auto_restart_file_presence_rspamd]
- Parameters differences:
--- File_line[auto_restart_file_presence_rspamd].orig
+++ File_line[auto_restart_file_presence_rspamd]
+ line => rspamd
+ ensure => present
+ require => File[/etc/debdeploy-client/autorestarts.conf]
+ path => /etc/debdeploy-client/autorestarts.conf
- 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
+ command => /bin/systemctl daemon-reload
- Logrotate::Conf[wmf_auto_restart_rspamd]
- Parameters differences:
--- Logrotate::Conf[wmf_auto_restart_rspamd].orig
+++ Logrotate::Conf[wmf_auto_restart_rspamd]
+ ensure => present
- Systemd::Timer::Job[vrts_sync_rspamd_data]
- Parameters differences:
--- Systemd::Timer::Job[vrts_sync_rspamd_data].orig
+++ Systemd::Timer::Job[vrts_sync_rspamd_data]
+ description => VRTS - sync Rspamd sqlite backups from the active host
+ logfile_basedir => /var/log
+ private_tmp => False
+ send_mail_only_on_error => True
+ logging_enabled => True
+ logfile_perms => all
+ syslog_force_stop => True
+ interval => {'start': 'OnCalendar', 'interval': '*-*-* *:15:00'}
+ ensure => present
+ command => /bin/sh -c "/usr/local/sbin/sync-vrts-rspamd-data; rc=$?; if [ "$rc" -ne 0 ] && [ "$rc" -ne 24 ]; then exit "$rc"; fi; /usr/local/sbin/rspamd_sqlite_backup.py restore --backup-dir /var/lib/rspamd/backup --target-dir /var/lib/rspamd && /bin/systemctl restart rspamd.service"
+ logfile_group => root
+ logfile_name => syslog.log
+ monitoring_notes_url => https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
+ send_mail_to => root@vrts2002.codfw.wmnet
+ require => ['Class[Rspamd]', 'File[/usr/local/sbin/rspamd_sqlite_backup.py]', 'Rsync::Quickdatacopy[vrts-rspamd-data]']
+ monitoring_enabled => False
+ monitoring_contact_groups => admins
+ user => root
+ environment => {}
+ success_exit_status => []
+ syslog_match_startswith => True
+ ignore_errors => False
+ fixed_random_delay => False
+ send_mail => False
- 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/vrts_sync_rspamd_data.timer]
- Parameters differences:
--- File[/lib/systemd/system/vrts_sync_rspamd_data.timer].orig
+++ File[/lib/systemd/system/vrts_sync_rspamd_data.timer]
+ mode => 0444
+ notify => Exec[systemd daemon-reload for vrts_sync_rspamd_data.timer (vrts_sync_rspamd_data.timer)]
+ ensure => present
+ group => root
+ owner => root
- Content differences:
--- /lib/systemd/system/vrts_sync_rspamd_data.timer.orig
+++ /lib/systemd/system/vrts_sync_rspamd_data.timer
@@ -0,0 +1,12 @@
+[Unit]
+Description=Periodic execution of vrts_sync_rspamd_data.service
+
+[Timer]
+Unit=vrts_sync_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
- File[/usr/local/sbin/sync-vrts-rspamd-data]
- Parameters differences:
--- File[/usr/local/sbin/sync-vrts-rspamd-data].orig
+++ File[/usr/local/sbin/sync-vrts-rspamd-data]
+ ensure => present
+ group => root
+ mode => 0755
+ owner => root
- Content differences:
--- /usr/local/sbin/sync-vrts-rspamd-data.orig
+++ /usr/local/sbin/sync-vrts-rspamd-data
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/bin/rsync --rsh /usr/local/sbin/sync-vrts-rspamd-data-ssl-wrapper --delete -a --exclude '*.tmp' rsync://vrts1003.eqiad.wmnet/vrts-rspamd-data /var/lib/rspamd/backup/
- 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
- Systemd::Syslog[vrts_sync_rspamd_data]
- Parameters differences:
--- Systemd::Syslog[vrts_sync_rspamd_data].orig
+++ Systemd::Syslog[vrts_sync_rspamd_data]
+ base_dir => /var/log
+ log_filename => syslog.log
+ programname_comparison => startswith
+ force_stop => True
+ readable_by => all
+ ensure => present
+ group => root
+ owner => root
- Systemd::Timer::Job[vrts_train_mail_filters]
- Parameters differences:
--- Systemd::Timer::Job[vrts_train_mail_filters].orig
+++ Systemd::Timer::Job[vrts_train_mail_filters]
+ description => VRTS - train SpamAssassin and Rspamd filters
+ logfile_basedir => /var/log
+ private_tmp => False
+ send_mail_only_on_error => True
+ logging_enabled => True
+ logfile_perms => all
+ syslog_force_stop => True
+ interval => {'start': 'OnCalendar', 'interval': '*-*-* *:05:00'}
+ ensure => absent
+ command => /bin/sh -c '/usr/local/bin/train_mail_filters.py --train-spamassassin --train-rspamd --rspamd-controller localhost:11334 --prometheus-metrics-path /var/lib/prometheus/node.d/train_mail_filters.prom && /usr/local/sbin/rspamd_sqlite_backup.py backup --source-dir /var/lib/rspamd --backup-dir /var/lib/rspamd/backup'
+ logfile_group => root
+ logfile_name => syslog.log
+ monitoring_notes_url => https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
+ send_mail_to => root@vrts2002.codfw.wmnet
+ require => ['File[/usr/local/bin/train_mail_filters.py]', 'File[/usr/local/sbin/rspamd_sqlite_backup.py]', 'Class[Spamassassin]', 'Class[Rspamd]', 'File[/var/lib/rspamd/backup]', 'File[/usr/local/sbin/rspamd_sqlite_backup.py]']
+ monitoring_enabled => False
+ monitoring_contact_groups => admins
+ user => root
+ environment => {}
+ success_exit_status => []
+ syslog_match_startswith => True
+ ignore_errors => False
+ fixed_random_delay => False
+ send_mail => False
- Systemd::Unit[vrts_sync_rspamd_data.service]
- Parameters differences:
--- Systemd::Unit[vrts_sync_rspamd_data.service].orig
+++ Systemd::Unit[vrts_sync_rspamd_data.service]
+ unit => vrts_sync_rspamd_data.service
+ override_filename => puppet-override.conf
+ ensure => present
+ require => ['Class[Systemd]']
+ restart => False
+ override => False
- Class[Rspamd]
- Parameters differences:
--- Class[Rspamd].orig
+++ Class[Rspamd]
+ package_ensure => present
+ service_manage => True
+ purge_unmanaged => True
+ config_path => /etc/rspamd
+ manage_package_repo => False
+ config => {}
+ package_name => rspamd
+ package_manage => True
- 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
- 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]
+ mode => 0500
+ source => puppet:///modules/profile/mail/vrts/train_mail_filters.py
+ ensure => file
+ group => root
+ owner => root
- Package[rspamd]
- Parameters differences:
--- Package[rspamd].orig
+++ Package[rspamd]
+ provider => apt
+ ensure => present
- 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)]
+ before => ['Service[wmf_auto_restart_rspamd.timer]']
+ refreshonly => True
+ command => /bin/systemctl daemon-reload
- File[/var/log/vrts_sync_rspamd_data]
- Parameters differences:
--- File[/var/log/vrts_sync_rspamd_data].orig
+++ File[/var/log/vrts_sync_rspamd_data]
+ mode => 0755
+ ensure => directory
+ group => root
+ force => True
+ owner => root
+ backup => False
- 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_enabled => False
+ restart => False
+ override => False
+ unit_type => timer
+ monitoring_critical => False
+ monitoring_contact_group => admins
+ ensure => present
+ service_params => {}
- Class[Rspamd::Configuration]
- Parameters differences:
--- Class[Rspamd::Configuration].orig
+++ Class[Rspamd::Configuration]
+ notify => ['Class[Rspamd::Service]']
- Systemd::Timer[vrts_sync_rspamd_data]