--- Exec[systemd daemon-reload for rsync-srv-patches-releases-primary.timer (rsync-srv-patches-releases-primary.timer)].orig
+++ Exec[systemd daemon-reload for rsync-srv-patches-releases-primary.timer (rsync-srv-patches-releases-primary.timer)]
+ before => ['Service[rsync-srv-patches-releases-primary.timer]']
Service[rsync-srv-patches-releases1003.eqiad.wmnet.timer]
- Parameters differences:
--- Service[rsync-srv-patches-releases1003.eqiad.wmnet.timer].orig
+++ Service[rsync-srv-patches-releases1003.eqiad.wmnet.timer]
+ before => ['Exec[systemd daemon-reload for rsync-srv-patches-releases1003.eqiad.wmnet.timer (rsync-srv-patches-releases1003.eqiad.wmnet.timer)]']
@@
- ensure => running
+ ensure => stopped
@@
- enable => True
+ enable => False
- File[/var/log/rsync-srv-patches-releases-primary]
- Parameters differences:
--- File[/var/log/rsync-srv-patches-releases-primary].orig
+++ File[/var/log/rsync-srv-patches-releases-primary]
@@
- ensure => absent
+ ensure => directory
- File[/etc/rsyslog.d/40-wmf-auto-restart-rsync.conf]
- Parameters differences:
--- File[/etc/rsyslog.d/40-wmf-auto-restart-rsync.conf].orig
+++ File[/etc/rsyslog.d/40-wmf-auto-restart-rsync.conf]
@@
- ensure => absent
+ ensure => present
- File[/etc/scap.secondary]
- Parameters differences:
--- File[/etc/scap.secondary].orig
+++ File[/etc/scap.secondary]
@@
- ensure => present
+ ensure => absent
- File[/etc/logrotate.d/rsync-srv-patches-releases-primary]
- Parameters differences:
--- File[/etc/logrotate.d/rsync-srv-patches-releases-primary].orig
+++ File[/etc/logrotate.d/rsync-srv-patches-releases-primary]
@@
- ensure => absent
+ ensure => present
- File[/etc/logrotate.d/rsync-srv-patches-releases1003_eqiad_wmnet]
- Parameters differences:
--- File[/etc/logrotate.d/rsync-srv-patches-releases1003_eqiad_wmnet].orig
+++ File[/etc/logrotate.d/rsync-srv-patches-releases1003_eqiad_wmnet]
@@
- ensure => present
+ ensure => absent
- File[/lib/systemd/system/wmf_auto_restart_rsync.timer]
- Parameters differences:
--- File[/lib/systemd/system/wmf_auto_restart_rsync.timer].orig
+++ File[/lib/systemd/system/wmf_auto_restart_rsync.timer]
@@
- ensure => absent
+ ensure => present
- File[/etc/rsyslog.d/40-rsync-srv-patches-releases-primary.conf]
- Parameters differences:
--- File[/etc/rsyslog.d/40-rsync-srv-patches-releases-primary.conf].orig
+++ File[/etc/rsyslog.d/40-rsync-srv-patches-releases-primary.conf]
@@
- ensure => absent
+ ensure => present
- File[/usr/local/sbin/sync-srv-mediawiki-private-releases1003.eqiad.wmnet]
- Parameters differences:
--- File[/usr/local/sbin/sync-srv-mediawiki-private-releases1003.eqiad.wmnet].orig
+++ File[/usr/local/sbin/sync-srv-mediawiki-private-releases1003.eqiad.wmnet]
@@
- ensure => present
+ ensure => absent
- File[/usr/local/sbin/sync-srv-org-wikimedia-releases-releases1003.eqiad.wmnet]
- Content differences:
--- /usr/local/sbin/sync-srv-org-wikimedia-releases-releases1003.eqiad.wmnet.orig
+++ /usr/local/sbin/sync-srv-org-wikimedia-releases-releases1003.eqiad.wmnet
@@ -1,2 +1,2 @@
#!/bin/sh
-/usr/bin/rsync --rsh /usr/local/sbin/sync-srv-org-wikimedia-releases-releases1003.eqiad.wmnet-ssl-wrapper --delete -a rsync://releases2003.codfw.wmnet/srv-org-wikimedia-releases-releases1003.eqiad.wmnet /srv/org/wikimedia/releases/
+/usr/bin/rsync --rsh /usr/local/sbin/sync-srv-org-wikimedia-releases-releases1003.eqiad.wmnet-ssl-wrapper --delete -a rsync://releases1003.eqiad.wmnet/srv-org-wikimedia-releases-releases1003.eqiad.wmnet /srv/org/wikimedia/releases/
- File[/lib/systemd/system/rsync-srv-patches-releases-primary.timer]
- Parameters differences:
--- File[/lib/systemd/system/rsync-srv-patches-releases-primary.timer].orig
+++ File[/lib/systemd/system/rsync-srv-patches-releases-primary.timer]
@@
- ensure => absent
+ ensure => present
- Exec[systemd daemon-reload for rsync-srv-patches-releases1003.eqiad.wmnet.timer (rsync-srv-patches-releases1003.eqiad.wmnet.timer)]
- Parameters differences:
--- Exec[systemd daemon-reload for rsync-srv-patches-releases1003.eqiad.wmnet.timer (rsync-srv-patches-releases1003.eqiad.wmnet.timer)].orig
+++ Exec[systemd daemon-reload for rsync-srv-patches-releases1003.eqiad.wmnet.timer (rsync-srv-patches-releases1003.eqiad.wmnet.timer)]
- before => ['Service[rsync-srv-patches-releases1003.eqiad.wmnet.timer]']
- Exec[systemd daemon-reload for wmf_auto_restart_rsync.timer (wmf_auto_restart_rsync.timer)]
- Parameters differences:
--- Exec[systemd daemon-reload for wmf_auto_restart_rsync.timer (wmf_auto_restart_rsync.timer)].orig
+++ Exec[systemd daemon-reload for wmf_auto_restart_rsync.timer (wmf_auto_restart_rsync.timer)]
+ before => ['Service[wmf_auto_restart_rsync.timer]']
- File[/lib/systemd/system/wmf_auto_restart_rsync.service]
- Parameters differences:
--- File[/lib/systemd/system/wmf_auto_restart_rsync.service].orig
+++ File[/lib/systemd/system/wmf_auto_restart_rsync.service]
@@
- ensure => absent
+ ensure => present
- File[/usr/local/sbin/sync-srv-patches-releases1003.eqiad.wmnet]
- Parameters differences:
--- File[/usr/local/sbin/sync-srv-patches-releases1003.eqiad.wmnet].orig
+++ File[/usr/local/sbin/sync-srv-patches-releases1003.eqiad.wmnet]
@@
- ensure => present
+ ensure => absent
- Content differences:
--- /usr/local/sbin/sync-srv-patches-releases1003.eqiad.wmnet.orig
+++ /usr/local/sbin/sync-srv-patches-releases1003.eqiad.wmnet
@@ -1,2 +1,2 @@
#!/bin/sh
-/usr/bin/rsync --rsh /usr/local/sbin/sync-srv-patches-releases1003.eqiad.wmnet-ssl-wrapper --delete -a --chown=jenkins:705 rsync://deploy1003.eqiad.wmnet/srv-patches-releases1003.eqiad.wmnet /srv/patches/
+/usr/bin/rsync --rsh /usr/local/sbin/sync-srv-patches-releases1003.eqiad.wmnet-ssl-wrapper --delete -a rsync://deploy1003.eqiad.wmnet/srv-patches-releases1003.eqiad.wmnet /srv/patches/
- Service[rsync-srv-patches-releases-primary.timer]
- Parameters differences:
--- Service[rsync-srv-patches-releases-primary.timer].orig
+++ Service[rsync-srv-patches-releases-primary.timer]
- before => ['Exec[systemd daemon-reload for rsync-srv-patches-releases-primary.timer (rsync-srv-patches-releases-primary.timer)]']
@@
- ensure => stopped
+ ensure => running
@@
- enable => False
+ enable => True
- File[/lib/systemd/system/rsync-srv-patches-releases1003.eqiad.wmnet.timer]
- Parameters differences:
--- File[/lib/systemd/system/rsync-srv-patches-releases1003.eqiad.wmnet.timer].orig
+++ File[/lib/systemd/system/rsync-srv-patches-releases1003.eqiad.wmnet.timer]
@@
- ensure => present
+ ensure => absent
- File[/lib/systemd/system/rsync-srv-patches-releases-primary.service]
- Parameters differences:
--- File[/lib/systemd/system/rsync-srv-patches-releases-primary.service].orig
+++ File[/lib/systemd/system/rsync-srv-patches-releases-primary.service]
@@
- ensure => absent
+ ensure => present
- File[/etc/update-motd.d/01-rsync-source-warning]
- Parameters differences:
--- File[/etc/update-motd.d/01-rsync-source-warning].orig
+++ File[/etc/update-motd.d/01-rsync-source-warning]
@@
- ensure => present
+ ensure => absent
- Content differences:
--- /etc/update-motd.d/01-rsync-source-warning.orig
+++ /etc/update-motd.d/01-rsync-source-warning
@@ -21,6 +21,6 @@
DO NOT UPLOAD FILES HERE.
-Upload to 'releases2003.codfw.wmnet' instead.
+Upload to 'releases1003.eqiad.wmnet' instead.
MOTD
- File[/etc/logrotate.d/wmf_auto_restart_rsync]
- Parameters differences:
--- File[/etc/logrotate.d/wmf_auto_restart_rsync].orig
+++ File[/etc/logrotate.d/wmf_auto_restart_rsync]
@@
- ensure => absent
+ ensure => present
- File[/usr/local/sbin/sync-var-lib-jenkins-releases1003.eqiad.wmnet]
- Content differences:
--- /usr/local/sbin/sync-var-lib-jenkins-releases1003.eqiad.wmnet.orig
+++ /usr/local/sbin/sync-var-lib-jenkins-releases1003.eqiad.wmnet
@@ -1,2 +1,2 @@
#!/bin/sh
-/usr/bin/rsync --rsh /usr/local/sbin/sync-var-lib-jenkins-releases1003.eqiad.wmnet-ssl-wrapper --delete -a rsync://releases2003.codfw.wmnet/var-lib-jenkins-releases1003.eqiad.wmnet /var/lib/jenkins/
+/usr/bin/rsync --rsh /usr/local/sbin/sync-var-lib-jenkins-releases1003.eqiad.wmnet-ssl-wrapper --delete -a rsync://releases1003.eqiad.wmnet/var-lib-jenkins-releases1003.eqiad.wmnet /var/lib/jenkins/
- File_line[auto_restart_file_presence_rsync]
- Parameters differences:
--- File_line[auto_restart_file_presence_rsync].orig
+++ File_line[auto_restart_file_presence_rsync]
@@
- ensure => absent
+ ensure => present
- File[/lib/systemd/system/rsync-srv-patches-releases1003.eqiad.wmnet.service]
- Parameters differences:
--- File[/lib/systemd/system/rsync-srv-patches-releases1003.eqiad.wmnet.service].orig
+++ File[/lib/systemd/system/rsync-srv-patches-releases1003.eqiad.wmnet.service]
@@
- ensure => present
+ ensure => absent
- File[/var/log/rsync-srv-patches-releases1003_eqiad_wmnet]
- Parameters differences:
--- File[/var/log/rsync-srv-patches-releases1003_eqiad_wmnet].orig
+++ File[/var/log/rsync-srv-patches-releases1003_eqiad_wmnet]
@@
- ensure => directory
+ ensure => absent