Yuvipanda has submitted this change and it was merged.
Change subject: tools: Add authentication for docker registry
......................................................................
tools: Add authentication for docker registry
Bug: T118758
Change-Id: I33bb4c1e664d208dddf79fa4739c582554fb6e32
---
M modules/docker/manifests/registry.pp
1 file changed, 16 insertions(+), 0 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/docker/manifests/registry.pp
b/modules/docker/manifests/registry.pp
index 8fbbf81..9424aa7 100644
--- a/modules/docker/manifests/registry.pp
+++ b/modules/docker/manifests/registry.pp
@@ -31,6 +31,12 @@
'key' =>
'/var/lib/docker-registry/ssl/private_keys/server.key'
},
},
+ 'auth' => {
+ 'htpasswd' => {
+ 'realm' => 'docker-auth',
+ 'path' => '/etc/docker/registry/htpasswd',
+ }
+ }
}
file { $datapath:
@@ -47,6 +53,16 @@
mode => '0555',
}
+ $docker_username = hiera('docker::username')
+ $docker_password_hash = hiera('docker::password_hash')
+ file { '/etc/docker/registry/htpasswd':
+ content => "${docker_username}:${docker_password_hash}",
+ owner => 'docker-registry',
+ group => 'docker-registry',
+ mode => '0440',
+ notify => Service['docker-registry'],
+ }
+
file { '/etc/docker/registry/config.yml':
content => ordered_yaml($config),
owner => 'docker-registry',
--
To view, visit https://gerrit.wikimedia.org/r/273840
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I33bb4c1e664d208dddf79fa4739c582554fb6e32
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[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
