--- Class[Profile::Mediabackup::New_storage].orig
+++ Class[Profile::Mediabackup::New_storage]
@@
- mediabackup_config => {'mw_db_password': 'notsecret', 'db_password': 'notsecret', 'storage_root_user': 'auser', 'storage_root_password': 'dummypassword', 'encryption_key': '# created: 2021-11-29T11:50:16+01:00\n# public key: public\nAGE-SECRET-KEY-private"\n', 'access_key': 's3user', 'secret_key': 's3key', 'recovery_access_key': 's3userForFileRestores', 'recovery_secret_key': 's3keyForFileRestores', 'batchsize': 100, 'dblists_path': '/srv/mediawiki-config/dblists', 'mw_db_config_file': '/etc/mediabackup/mw_db.ini', 'db_config_file': '/etc/mediabackup/mediabackups_db.ini', 'storage_path': '/srv/objectstorage', 'storage_port': 9000, 'console_port': 9001, 'sections': {'s1': {'host': 'db2141.codfw.wmnet', 'port': 3311}, 's2': {'host': 'db2197.codfw.wmnet', 'port': 3312}, 's3': {'host': 'db2239.codfw.wmnet', 'port': 3313}, 's4': {'host': 'db2199.codfw.wmnet', 'port': 3314}, 's5': {'host': 'db2201.codfw.wmnet', 'port': 3315}, 's6': {'host': 'db2197.codfw.wmnet', 'port': 3316}, 's7': {'host': 'db2198.codfw.wmnet', 'port': 3317}, 's8': {'host': 'db2198.codfw.wmnet', 'port': 3318}}, 'mw_db_user': 'mediabackup', 'db_host': 'db2183.codfw.wmnet', 'db_port': 3306, 'db_user': 'mediabackup', 'db_schema': 'mediabackups', 'worker_hosts': ['ms-backup2001.codfw.wmnet', 'ms-backup2002.codfw.wmnet', 'ms-backup2003.codfw.wmnet', 'ms-backup2004.codfw.wmnet'], 'storage_hosts': ['backup2004.codfw.wmnet:9000', 'backup2005.codfw.wmnet:9000', 'backup2006.codfw.wmnet:9000', 'backup2007.codfw.wmnet:9000', 'backup2011.codfw.wmnet:9000', 'backup2010.codfw.wmnet:9000', 'backup2015.codfw.wmnet:9000', 'backup2015.codfw.wmnet:9001', 'backup2015.codfw.wmnet:9002', 'backup2015.codfw.wmnet:9003', 'backup2016.codfw.wmnet:9000', 'backup2016.codfw.wmnet:9001', 'backup2016.codfw.wmnet:9002', 'backup2016.codfw.wmnet:9003', 'backup2017.codfw.wmnet:9000', 'backup2017.codfw.wmnet:9001', 'backup2017.codfw.wmnet:9002', 'backup2017.codfw.wmnet:9003', 'backup2018.codfw.wmnet:9000', 'backup2018.codfw.wmnet:9001', 'backup2018.codfw.wmnet:9002', 'backup2018.codfw.wmnet:9003', 'backup2019.codfw.wmnet:9000', 'backup2019.codfw.wmnet:9001', 'backup2019.codfw.wmnet:9002', 'backup2019.codfw.wmnet:9003', 'backup2020.codfw.wmnet:9000', 'backup2020.codfw.wmnet:9001', 'backup2020.codfw.wmnet:9002', 'backup2020.codfw.wmnet:9003']}
+ mediabackup_config => {'mw_db_password': 'notsecret', 'db_password': 'notsecret', 'storage_root_user': 'auser', 'storage_root_password': 'dummypassword', 'encryption_key': '# created: 2021-11-29T11:50:16+01:00\n# public key: public\nAGE-SECRET-KEY-private"\n', 'access_key': 's3user', 'secret_key': 's3key', 'recovery_access_key': 's3userForFileRestores', 'recovery_secret_key': 's3keyForFileRestores', 'batchsize': 100, 'dblists_path': '/srv/mediawiki-config/dblists', 'mw_db_config_file': '/etc/mediabackup/mw_db.ini', 'db_config_file': '/etc/mediabackup/mediabackups_db.ini', 'storage_path': '/srv/objectstorage', 'storage_port': 9000, 'console_port': 9001, 'sections': {'s1': {'host': 'db2141.codfw.wmnet', 'port': 3311}, 's2': {'host': 'db2197.codfw.wmnet', 'port': 3312}, 's3': {'host': 'db2239.codfw.wmnet', 'port': 3313}, 's4': {'host': 'db2199.codfw.wmnet', 'port': 3314}, 's5': {'host': 'db2201.codfw.wmnet', 'port': 3315}, 's6': {'host': 'db2197.codfw.wmnet', 'port': 3316}, 's7': {'host': 'db2198.codfw.wmnet', 'port': 3317}, 's8': {'host': 'db2198.codfw.wmnet', 'port': 3318}}, 'mw_db_user': 'mediabackup', 'db_host': 'db2183.codfw.wmnet', 'db_port': 3306, 'db_user': 'mediabackup', 'db_schema': 'mediabackups', 'worker_hosts': ['ms-backup2003.codfw.wmnet', 'ms-backup2004.codfw.wmnet'], 'storage_hosts': ['backup2004.codfw.wmnet:9000', 'backup2005.codfw.wmnet:9000', 'backup2006.codfw.wmnet:9000', 'backup2007.codfw.wmnet:9000', 'backup2011.codfw.wmnet:9000', 'backup2010.codfw.wmnet:9000', 'backup2015.codfw.wmnet:9000', 'backup2015.codfw.wmnet:9001', 'backup2015.codfw.wmnet:9002', 'backup2015.codfw.wmnet:9003', 'backup2016.codfw.wmnet:9000', 'backup2016.codfw.wmnet:9001', 'backup2016.codfw.wmnet:9002', 'backup2016.codfw.wmnet:9003', 'backup2017.codfw.wmnet:9000', 'backup2017.codfw.wmnet:9001', 'backup2017.codfw.wmnet:9002', 'backup2017.codfw.wmnet:9003', 'backup2018.codfw.wmnet:9000', 'backup2018.codfw.wmnet:9001', 'backup2018.codfw.wmnet:9002', 'backup2018.codfw.wmnet:9003', 'backup2019.codfw.wmnet:9000', 'backup2019.codfw.wmnet:9001', 'backup2019.codfw.wmnet:9002', 'backup2019.codfw.wmnet:9003', 'backup2020.codfw.wmnet:9000', 'backup2020.codfw.wmnet:9001', 'backup2020.codfw.wmnet:9002', 'backup2020.codfw.wmnet:9003']}
Firewall::Service[versitygw-objectstorage02-mediabackup-workers]
- Parameters differences:
--- Firewall::Service[versitygw-objectstorage02-mediabackup-workers].orig
+++ Firewall::Service[versitygw-objectstorage02-mediabackup-workers]
@@
- srange => ['ms-backup2001.codfw.wmnet', 'ms-backup2002.codfw.wmnet', 'ms-backup2003.codfw.wmnet', 'ms-backup2004.codfw.wmnet']
+ srange => ['ms-backup2003.codfw.wmnet', 'ms-backup2004.codfw.wmnet']
- File[/etc/nftables/notrack/10_versitygw-objectstorage01-mediabackup-workers.nft]
- Content differences:
--- /etc/nftables/notrack/10_versitygw-objectstorage01-mediabackup-workers.nft.orig
+++ /etc/nftables/notrack/10_versitygw-objectstorage01-mediabackup-workers.nft
@@ -1,4 +1,4 @@
# Managed by puppet
#
-ip saddr { 10.192.12.6, 10.192.32.47, 10.192.48.42, 10.192.8.7 } tcp dport { 9001 } notrack
-ip6 saddr { 2620:0:860:103:10:192:32:47, 2620:0:860:104:10:192:48:42, 2620:0:860:109:10:192:8:7, 2620:0:860:10d:10:192:12:6 } tcp dport { 9001 } notrack
+ip saddr { 10.192.12.6, 10.192.8.7 } tcp dport { 9001 } notrack
+ip6 saddr { 2620:0:860:109:10:192:8:7, 2620:0:860:10d:10:192:12:6 } tcp dport { 9001 } notrack
- Firewall::Service[versitygw-objectstorage00-mediabackup-workers]
- Parameters differences:
--- Firewall::Service[versitygw-objectstorage00-mediabackup-workers].orig
+++ Firewall::Service[versitygw-objectstorage00-mediabackup-workers]
@@
- srange => ['ms-backup2001.codfw.wmnet', 'ms-backup2002.codfw.wmnet', 'ms-backup2003.codfw.wmnet', 'ms-backup2004.codfw.wmnet']
+ srange => ['ms-backup2003.codfw.wmnet', 'ms-backup2004.codfw.wmnet']
- File[/etc/nftables/notrack/10_versitygw-objectstorage00-mediabackup-workers.nft]
- Content differences:
--- /etc/nftables/notrack/10_versitygw-objectstorage00-mediabackup-workers.nft.orig
+++ /etc/nftables/notrack/10_versitygw-objectstorage00-mediabackup-workers.nft
@@ -1,4 +1,4 @@
# Managed by puppet
#
-ip saddr { 10.192.12.6, 10.192.32.47, 10.192.48.42, 10.192.8.7 } tcp dport { 9000 } notrack
-ip6 saddr { 2620:0:860:103:10:192:32:47, 2620:0:860:104:10:192:48:42, 2620:0:860:109:10:192:8:7, 2620:0:860:10d:10:192:12:6 } tcp dport { 9000 } notrack
+ip saddr { 10.192.12.6, 10.192.8.7 } tcp dport { 9000 } notrack
+ip6 saddr { 2620:0:860:109:10:192:8:7, 2620:0:860:10d:10:192:12:6 } tcp dport { 9000 } notrack
- Nftables::Service[versitygw-objectstorage02-mediabackup-workers]
- Parameters differences:
--- Nftables::Service[versitygw-objectstorage02-mediabackup-workers].orig
+++ Nftables::Service[versitygw-objectstorage02-mediabackup-workers]
@@
- src_ips => ['10.192.12.6', '10.192.32.47', '10.192.48.42', '10.192.8.7', '2620:0:860:103:10:192:32:47', '2620:0:860:104:10:192:48:42', '2620:0:860:109:10:192:8:7', '2620:0:860:10d:10:192:12:6']
+ src_ips => ['10.192.12.6', '10.192.8.7', '2620:0:860:109:10:192:8:7', '2620:0:860:10d:10:192:12:6']
- File[/etc/nftables/input/10_versitygw-objectstorage03-mediabackup-workers.nft]
- Content differences:
--- /etc/nftables/input/10_versitygw-objectstorage03-mediabackup-workers.nft.orig
+++ /etc/nftables/input/10_versitygw-objectstorage03-mediabackup-workers.nft
@@ -1,4 +1,4 @@
# Managed by puppet
#
-ip saddr { 10.192.12.6, 10.192.32.47, 10.192.48.42, 10.192.8.7 } tcp dport { 9003 } accept
-ip6 saddr { 2620:0:860:103:10:192:32:47, 2620:0:860:104:10:192:48:42, 2620:0:860:109:10:192:8:7, 2620:0:860:10d:10:192:12:6 } tcp dport { 9003 } accept
+ip saddr { 10.192.12.6, 10.192.8.7 } tcp dport { 9003 } accept
+ip6 saddr { 2620:0:860:109:10:192:8:7, 2620:0:860:10d:10:192:12:6 } tcp dport { 9003 } accept
- File[/etc/nftables/input/10_versitygw-objectstorage02-mediabackup-workers.nft]
- Content differences:
--- /etc/nftables/input/10_versitygw-objectstorage02-mediabackup-workers.nft.orig
+++ /etc/nftables/input/10_versitygw-objectstorage02-mediabackup-workers.nft
@@ -1,4 +1,4 @@
# Managed by puppet
#
-ip saddr { 10.192.12.6, 10.192.32.47, 10.192.48.42, 10.192.8.7 } tcp dport { 9002 } accept
-ip6 saddr { 2620:0:860:103:10:192:32:47, 2620:0:860:104:10:192:48:42, 2620:0:860:109:10:192:8:7, 2620:0:860:10d:10:192:12:6 } tcp dport { 9002 } accept
+ip saddr { 10.192.12.6, 10.192.8.7 } tcp dport { 9002 } accept
+ip6 saddr { 2620:0:860:109:10:192:8:7, 2620:0:860:10d:10:192:12:6 } tcp dport { 9002 } accept
- Firewall::Service[versitygw-objectstorage03-mediabackup-workers]
- Parameters differences:
--- Firewall::Service[versitygw-objectstorage03-mediabackup-workers].orig
+++ Firewall::Service[versitygw-objectstorage03-mediabackup-workers]
@@
- srange => ['ms-backup2001.codfw.wmnet', 'ms-backup2002.codfw.wmnet', 'ms-backup2003.codfw.wmnet', 'ms-backup2004.codfw.wmnet']
+ srange => ['ms-backup2003.codfw.wmnet', 'ms-backup2004.codfw.wmnet']
- File[/etc/nftables/input/10_versitygw-objectstorage00-mediabackup-workers.nft]
- Content differences:
--- /etc/nftables/input/10_versitygw-objectstorage00-mediabackup-workers.nft.orig
+++ /etc/nftables/input/10_versitygw-objectstorage00-mediabackup-workers.nft
@@ -1,4 +1,4 @@
# Managed by puppet
#
-ip saddr { 10.192.12.6, 10.192.32.47, 10.192.48.42, 10.192.8.7 } tcp dport { 9000 } accept
-ip6 saddr { 2620:0:860:103:10:192:32:47, 2620:0:860:104:10:192:48:42, 2620:0:860:109:10:192:8:7, 2620:0:860:10d:10:192:12:6 } tcp dport { 9000 } accept
+ip saddr { 10.192.12.6, 10.192.8.7 } tcp dport { 9000 } accept
+ip6 saddr { 2620:0:860:109:10:192:8:7, 2620:0:860:10d:10:192:12:6 } tcp dport { 9000 } accept
- Nftables::Service[versitygw-objectstorage00-mediabackup-workers]
- Parameters differences:
--- Nftables::Service[versitygw-objectstorage00-mediabackup-workers].orig
+++ Nftables::Service[versitygw-objectstorage00-mediabackup-workers]
@@
- src_ips => ['10.192.12.6', '10.192.32.47', '10.192.48.42', '10.192.8.7', '2620:0:860:103:10:192:32:47', '2620:0:860:104:10:192:48:42', '2620:0:860:109:10:192:8:7', '2620:0:860:10d:10:192:12:6']
+ src_ips => ['10.192.12.6', '10.192.8.7', '2620:0:860:109:10:192:8:7', '2620:0:860:10d:10:192:12:6']