Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/244514
Change subject: mailman: rm sodium remnants, hardcoded IP
......................................................................
mailman: rm sodium remnants, hardcoded IP
Removing the last hits for "sodium" across the repo.
Making that IP configurable. This class can still be useful
for the next migration.
Change-Id: I9d03de01abcc4af15a52227ac4aceb678e952a06
---
M manifests/role/lists.pp
M modules/admin/files/enforce-users-groups.sh
2 files changed, 10 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/14/244514/1
diff --git a/manifests/role/lists.pp b/manifests/role/lists.pp
index 7fcccae..79d3f99 100644
--- a/manifests/role/lists.pp
+++ b/manifests/role/lists.pp
@@ -168,15 +168,17 @@
class role::lists::migration {
+ $sourceip='208.80.154.61'
+
ferm::service { 'mailman-http':
proto => 'tcp',
port => '80',
}
- ferm::service { 'sodium-rysnc':
+ ferm::service { 'mailman-migration-rysnc':
proto => 'tcp',
port => '873',
- srange => '208.80.154.61/32',
+ srange => "${sourceip}/32",
}
include rsync::server
@@ -184,31 +186,31 @@
rsync::server::module { 'lists':
path => '/var/lib/mailman/lists',
read_only => 'no',
- hosts_allow => '208.80.154.61',
+ hosts_allow => $sourceip,
}
rsync::server::module { 'archives':
path => '/var/lib/mailman/archives',
read_only => 'no',
- hosts_allow => '208.80.154.61',
+ hosts_allow => $sourceip,
}
rsync::server::module { 'data':
path => '/var/lib/mailman/data',
read_only => 'no',
- hosts_allow => '208.80.154.61',
+ hosts_allow => $sourceip,
}
rsync::server::module { 'qfiles':
path => '/var/lib/mailman/qfiles',
read_only => 'no',
- hosts_allow => '208.80.154.61',
+ hosts_allow => $sourceip,
}
rsync::server::module { 'exim':
path => '/var/spool/exim4',
read_only => 'no',
- hosts_allow => '208.80.154.61',
+ hosts_allow => $sourceip,
}
package { 'mailman':
diff --git a/modules/admin/files/enforce-users-groups.sh
b/modules/admin/files/enforce-users-groups.sh
index c6a6600..047e3c3 100755
--- a/modules/admin/files/enforce-users-groups.sh
+++ b/modules/admin/files/enforce-users-groups.sh
@@ -15,7 +15,7 @@
"l10nupdate" \
"mwdeploy" \ # eventlog*
"gerrit2" \ # ytterbium.wikimedia.org
- "spamd" \ # sodium.wikimedia.org:
+ "spamd" \ # fermium.wikimedia.org:
"releases" \ # tin.eqiad.wmnet
"reprepro" \ # caesium.eqiad.wmnet
"mysql" \ # pc1001.eqiad.wmnet
--
To view, visit https://gerrit.wikimedia.org/r/244514
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d03de01abcc4af15a52227ac4aceb678e952a06
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
