--- Nftables::Service[rsyncd_access_srv-dumps].orig
+++ Nftables::Service[rsyncd_access_srv-dumps]
@@
- src_ips => ['10.192.27.6', '10.64.16.101', '208.80.154.142', '208.80.154.71', '2620:0:860:114:10:192:27:6', '2620:0:861:102:10:64:16:101', '2620:0:861:2:208:80:154:142', '2620:0:861:3:208:80:154:71']
+ src_ips => ['10.192.27.12', '10.64.16.101', '208.80.154.142', '208.80.154.71', '2620:0:860:114:10:192:27:12', '2620:0:861:102:10:64:16:101', '2620:0:861:2:208:80:154:142', '2620:0:861:3:208:80:154:71']
Rsync::Server::Module[srv-dumps]
- Parameters differences:
--- Rsync::Server::Module[srv-dumps].orig
+++ Rsync::Server::Module[srv-dumps]
@@
- hosts_allow => ['phab1004.eqiad.wmnet', 'phab2002.codfw.wmnet', 'clouddumps1001.wikimedia.org', 'clouddumps1002.wikimedia.org']
+ hosts_allow => ['phab1004.eqiad.wmnet', 'phab2003.codfw.wmnet', 'clouddumps1001.wikimedia.org', 'clouddumps1002.wikimedia.org']
- File[/lib/systemd/system/rsync-phabricator-home-dirs.timer]
- Parameters differences:
--- File[/lib/systemd/system/rsync-phabricator-home-dirs.timer].orig
+++ File[/lib/systemd/system/rsync-phabricator-home-dirs.timer]
@@
- ensure => absent
+ ensure => present
- File[/usr/local/sbin/sync-phabricator-home-dirs]
- Parameters differences:
--- File[/usr/local/sbin/sync-phabricator-home-dirs].orig
+++ File[/usr/local/sbin/sync-phabricator-home-dirs]
+ owner => root
+ mode => 0755
+ group => root
+ ensure => present
- Content differences:
--- /usr/local/sbin/sync-phabricator-home-dirs.orig
+++ /usr/local/sbin/sync-phabricator-home-dirs
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/bin/rsync --delete -a rsync://phab1004.eqiad.wmnet/phabricator-home-dirs /srv/homes/
- Systemd::Timer::Job[rsync-phabricator-repos]
- Parameters differences:
--- Systemd::Timer::Job[rsync-phabricator-repos].orig
+++ Systemd::Timer::Job[rsync-phabricator-repos]
@@
- ensure => absent
+ ensure => present
- Systemd::Service[rsync-phabricator-repos]
- Parameters differences:
--- Systemd::Service[rsync-phabricator-repos].orig
+++ Systemd::Service[rsync-phabricator-repos]
@@
- ensure => absent
+ ensure => present
- Ferm::Service[ssh_cluster]
- Parameters differences:
--- Ferm::Service[ssh_cluster].orig
+++ Ferm::Service[ssh_cluster]
@@
- srange => ['phab1004.eqiad.wmnet', 'phab2002.codfw.wmnet']
+ srange => ['phab1004.eqiad.wmnet', 'phab2003.codfw.wmnet']
- Exec[systemd daemon-reload for rsync-phabricator-home-dirs.timer (rsync-phabricator-home-dirs.timer)]
- Parameters differences:
--- Exec[systemd daemon-reload for rsync-phabricator-home-dirs.timer (rsync-phabricator-home-dirs.timer)].orig
+++ Exec[systemd daemon-reload for rsync-phabricator-home-dirs.timer (rsync-phabricator-home-dirs.timer)]
+ before => ['Service[rsync-phabricator-home-dirs.timer]']
- File[/etc/rsyslog.d/40-rsync-phabricator-repos.conf]
- Parameters differences:
--- File[/etc/rsyslog.d/40-rsync-phabricator-repos.conf].orig
+++ File[/etc/rsyslog.d/40-rsync-phabricator-repos.conf]
@@
- ensure => absent
+ ensure => present
- Logrotate::Conf[rsync-phabricator-repos]
- Parameters differences:
--- Logrotate::Conf[rsync-phabricator-repos].orig
+++ Logrotate::Conf[rsync-phabricator-repos]
@@
- ensure => absent
+ ensure => present
- File[/etc/logrotate.d/rsync-phabricator-repos]
- Parameters differences:
--- File[/etc/logrotate.d/rsync-phabricator-repos].orig
+++ File[/etc/logrotate.d/rsync-phabricator-repos]
@@
- ensure => absent
+ ensure => present
- Ferm::Service[rsyncd_access_srv_dumps]
- Parameters differences:
--- Ferm::Service[rsyncd_access_srv_dumps].orig
+++ Ferm::Service[rsyncd_access_srv_dumps]
@@
- srange => ['phab1004.eqiad.wmnet', 'phab2002.codfw.wmnet', 'clouddumps1001.wikimedia.org', 'clouddumps1002.wikimedia.org']
+ srange => ['phab1004.eqiad.wmnet', 'phab2003.codfw.wmnet', 'clouddumps1001.wikimedia.org', 'clouddumps1002.wikimedia.org']
- Systemd::Unit[rsync-phabricator-repos.timer]
- Parameters differences:
--- Systemd::Unit[rsync-phabricator-repos.timer].orig
+++ Systemd::Unit[rsync-phabricator-repos.timer]
@@
- ensure => absent
+ ensure => present
- File[/lib/systemd/system/rsync-phabricator-repos.service]
- Parameters differences:
--- File[/lib/systemd/system/rsync-phabricator-repos.service].orig
+++ File[/lib/systemd/system/rsync-phabricator-repos.service]
@@
- ensure => absent
+ ensure => present
- File[/var/log/rsync-phabricator-repos]
- Parameters differences:
--- File[/var/log/rsync-phabricator-repos].orig
+++ File[/var/log/rsync-phabricator-repos]
@@
- ensure => absent
+ ensure => directory
- Systemd::Unit[rsync-phabricator-home-dirs.service]
- Parameters differences:
--- Systemd::Unit[rsync-phabricator-home-dirs.service].orig
+++ Systemd::Unit[rsync-phabricator-home-dirs.service]
@@
- ensure => absent
+ ensure => present
- Firewall::Service[rsyncd_access_srv-dumps]
- Parameters differences:
--- Firewall::Service[rsyncd_access_srv-dumps].orig
+++ Firewall::Service[rsyncd_access_srv-dumps]
@@
- srange => ['phab1004.eqiad.wmnet', 'phab2002.codfw.wmnet', 'clouddumps1001.wikimedia.org', 'clouddumps1002.wikimedia.org']
+ srange => ['phab1004.eqiad.wmnet', 'phab2003.codfw.wmnet', 'clouddumps1001.wikimedia.org', 'clouddumps1002.wikimedia.org']
- Class[Profile::Phabricator::Datasync]
- Parameters differences:
--- Class[Profile::Phabricator::Datasync].orig
+++ Class[Profile::Phabricator::Datasync]
@@
- passive_server => phab2002.codfw.wmnet
+ passive_server => phab2003.codfw.wmnet
@@
- dumps_rsync_clients => ['phab1004.eqiad.wmnet', 'phab2002.codfw.wmnet', 'clouddumps1001.wikimedia.org', 'clouddumps1002.wikimedia.org']
+ dumps_rsync_clients => ['phab1004.eqiad.wmnet', 'phab2003.codfw.wmnet', 'clouddumps1001.wikimedia.org', 'clouddumps1002.wikimedia.org']
- File[/usr/local/sbin/sync-phabricator-repos]
- Parameters differences:
--- File[/usr/local/sbin/sync-phabricator-repos].orig
+++ File[/usr/local/sbin/sync-phabricator-repos]
+ owner => root
+ mode => 0755
+ group => root
+ ensure => present
- Content differences:
--- /usr/local/sbin/sync-phabricator-repos.orig
+++ /usr/local/sbin/sync-phabricator-repos
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/bin/rsync --delete -a rsync://phab1004.eqiad.wmnet/phabricator-repos /srv/repos/
- Systemd::Timer::Job[rsync-phabricator-home-dirs]
- Parameters differences:
--- Systemd::Timer::Job[rsync-phabricator-home-dirs].orig
+++ Systemd::Timer::Job[rsync-phabricator-home-dirs]
@@
- ensure => absent
+ ensure => present
- File[/var/log/rsync-phabricator-home-dirs]
- Parameters differences:
--- File[/var/log/rsync-phabricator-home-dirs].orig
+++ File[/var/log/rsync-phabricator-home-dirs]
@@
- ensure => absent
+ ensure => directory
- Rsync::Quickdatacopy[phabricator-home-dirs]
- Parameters differences:
--- Rsync::Quickdatacopy[phabricator-home-dirs].orig
+++ Rsync::Quickdatacopy[phabricator-home-dirs]
@@
- dest_host => phab2002.codfw.wmnet
+ dest_host => phab2003.codfw.wmnet
- File[/etc/logrotate.d/rsync-phabricator-home-dirs]
- Parameters differences:
--- File[/etc/logrotate.d/rsync-phabricator-home-dirs].orig
+++ File[/etc/logrotate.d/rsync-phabricator-home-dirs]
@@
- ensure => absent
+ ensure => present
- Systemd::Service[rsync-phabricator-home-dirs]
- Parameters differences:
--- Systemd::Service[rsync-phabricator-home-dirs].orig
+++ Systemd::Service[rsync-phabricator-home-dirs]
@@
- ensure => absent
+ ensure => present
- Nftables::Service[ssh_cluster]
- Parameters differences:
--- Nftables::Service[ssh_cluster].orig
+++ Nftables::Service[ssh_cluster]
@@
- src_ips => ['10.192.27.6', '10.64.16.101', '2620:0:860:114:10:192:27:6', '2620:0:861:102:10:64:16:101']
+ src_ips => ['10.192.27.12', '10.64.16.101', '2620:0:860:114:10:192:27:12', '2620:0:861:102:10:64:16:101']
- Firewall::Service[ssh_cluster]
- Parameters differences:
--- Firewall::Service[ssh_cluster].orig
+++ Firewall::Service[ssh_cluster]
@@
- srange => ['phab1004.eqiad.wmnet', 'phab2002.codfw.wmnet']
+ srange => ['phab1004.eqiad.wmnet', 'phab2003.codfw.wmnet']
- Rsyslog::Conf[rsync-phabricator-repos]
- Parameters differences:
--- Rsyslog::Conf[rsync-phabricator-repos].orig
+++ Rsyslog::Conf[rsync-phabricator-repos]
@@
- ensure => absent
+ ensure => present
- Systemd::Timer[rsync-phabricator-repos]
- Parameters differences:
--- Systemd::Timer[rsync-phabricator-repos].orig
+++ Systemd::Timer[rsync-phabricator-repos]
@@
- ensure => absent
+ ensure => present
- Concat_fragment[/etc/rsyncd.conf-srv-dumps]
- Content differences:
--- /etc/rsyncd.conf-srv-dumps.orig
+++ /etc/rsyncd.conf-srv-dumps
@@ -16,5 +16,5 @@
-hosts allow = phab1004.eqiad.wmnet phab2002.codfw.wmnet clouddumps1001.wikimedia.org clouddumps1002.wikimedia.org localhost
+hosts allow = phab1004.eqiad.wmnet phab2003.codfw.wmnet clouddumps1001.wikimedia.org clouddumps1002.wikimedia.org localhost
- Systemd::Syslog[rsync-phabricator-home-dirs]
- Parameters differences:
--- Systemd::Syslog[rsync-phabricator-home-dirs].orig
+++ Systemd::Syslog[rsync-phabricator-home-dirs]
@@
- ensure => absent
+ ensure => present
- Systemd::Syslog[rsync-phabricator-repos]
- Parameters differences:
--- Systemd::Syslog[rsync-phabricator-repos].orig
+++ Systemd::Syslog[rsync-phabricator-repos]
@@
- ensure => absent
+ ensure => present
- Rsyslog::Conf[rsync-phabricator-home-dirs]
- Parameters differences:
--- Rsyslog::Conf[rsync-phabricator-home-dirs].orig
+++ Rsyslog::Conf[rsync-phabricator-home-dirs]
@@
- ensure => absent
+ ensure => present
- File[/etc/nftables/input/10_rsyncd_access_srv-dumps.nft]
- Content differences:
--- /etc/nftables/input/10_rsyncd_access_srv-dumps.nft.orig
+++ /etc/nftables/input/10_rsyncd_access_srv-dumps.nft
@@ -1,4 +1,4 @@
# Managed by puppet
#
-ip saddr { 10.192.27.6, 10.64.16.101, 208.80.154.142, 208.80.154.71 } tcp dport { 873, 1873 } accept
-ip6 saddr { 2620:0:860:114:10:192:27:6, 2620:0:861:102:10:64:16:101, 2620:0:861:2:208:80:154:142, 2620:0:861:3:208:80:154:71 } tcp dport { 873, 1873 } accept
+ip saddr { 10.192.27.12, 10.64.16.101, 208.80.154.142, 208.80.154.71 } tcp dport { 873, 1873 } accept
+ip6 saddr { 2620:0:860:114:10:192:27:12, 2620:0:861:102:10:64:16:101, 2620:0:861:2:208:80:154:142, 2620:0:861:3:208:80:154:71 } tcp dport { 873, 1873 } accept
- Concat::Fragment[/etc/rsyncd.conf-srv-dumps]
- Logrotate::Conf[rsync-phabricator-home-dirs]
- Parameters differences:
--- Logrotate::Conf[rsync-phabricator-home-dirs].orig
+++ Logrotate::Conf[rsync-phabricator-home-dirs]
@@
- ensure => absent
+ ensure => present
- File[/etc/nftables/input/10_ssh_cluster.nft]
- Content differences:
--- /etc/nftables/input/10_ssh_cluster.nft.orig
+++ /etc/nftables/input/10_ssh_cluster.nft
@@ -1,4 +1,4 @@
# Managed by puppet
#
-ip saddr { 10.192.27.6, 10.64.16.101 } tcp dport { 22 } accept
-ip6 saddr { 2620:0:860:114:10:192:27:6, 2620:0:861:102:10:64:16:101 } tcp dport { 22 } accept
+ip saddr { 10.192.27.12, 10.64.16.101 } tcp dport { 22 } accept
+ip6 saddr { 2620:0:860:114:10:192:27:12, 2620:0:861:102:10:64:16:101 } tcp dport { 22 } accept
Relevant files