Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: docker::web: allow defining multiple build servers
......................................................................
docker::web: allow defining multiple build servers
Change-Id: I64edad7ee3cdc694d6f1a82afdce1d7d7e1208c4
---
M modules/docker/templates/registry-nginx.conf.erb
M modules/role/manifests/toollabs/docker/registry.pp
2 files changed, 5 insertions(+), 3 deletions(-)
Approvals:
Yuvipanda: Looks good to me, but someone else must approve
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/modules/docker/templates/registry-nginx.conf.erb
b/modules/docker/templates/registry-nginx.conf.erb
index bb79b5a..880ecd9 100644
--- a/modules/docker/templates/registry-nginx.conf.erb
+++ b/modules/docker/templates/registry-nginx.conf.erb
@@ -64,7 +64,9 @@
location = /v2/ {
satisfy any;
- deny <%= @allow_push_from %>;
+ <%- @allow_push_from.each do |ip| -%>
+ deny <%= ip %>;
+ <%- end -%>
allow all;
auth_basic "docker-registry";
diff --git a/modules/role/manifests/toollabs/docker/registry.pp
b/modules/role/manifests/toollabs/docker/registry.pp
index ce01773..47ed911 100644
--- a/modules/role/manifests/toollabs/docker/registry.pp
+++ b/modules/role/manifests/toollabs/docker/registry.pp
@@ -7,7 +7,7 @@
before => Class['::docker::registry'],
}
- $builder = ipresolve(hiera('docker::builder_host'), 4, $::nameservers[0])
+ $builders = [ipresolve(hiera('docker::builder_host'), 4,
$::nameservers[0])]
$user = hiera('docker::username')
$hash = hiera('docker::password_hash')
@@ -20,7 +20,7 @@
class { '::docker::registry::web':
docker_username => $user,
docker_password_hash => $hash,
- allow_push_from => $builder,
+ allow_push_from => $builders,
ssl_certificate_name => 'star.tools.wmflabs.org',
ssl_settings => ssl_ciphersuite('nginx', 'compat'),
}
--
To view, visit https://gerrit.wikimedia.org/r/318062
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I64edad7ee3cdc694d6f1a82afdce1d7d7e1208c4
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
