[MediaWiki-commits] [Gerrit] operations/puppet[production]: docker::registry: move htpasswd file to /etc/nginx

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: docker::registry: move htpasswd file to /etc/nginx
......................................................................


docker::registry: move htpasswd file to /etc/nginx

Change-Id: Iae652d9f4869db0f5671e88c95a6b06052985e2b
---
M modules/docker/manifests/registry.pp
M modules/docker/templates/registry-nginx.conf.erb
2 files changed, 4 insertions(+), 3 deletions(-)

Approvals:
  Giuseppe Lavagetto: Verified; Looks good to me, approved



diff --git a/modules/docker/manifests/registry.pp 
b/modules/docker/manifests/registry.pp
index 63c563b..984808b 100644
--- a/modules/docker/manifests/registry.pp
+++ b/modules/docker/manifests/registry.pp
@@ -64,12 +64,13 @@
         mode   => '0555',
     }
 
-    file { '/etc/docker/registry/htpasswd':
+    file { '/etc/nginx/htpasswd.registry':
         content => "${docker_username}:${docker_password_hash}",
         owner   => 'www-data',
         group   => 'www-data',
         mode    => '0440',
-        notify  => Service['docker-registry'],
+        before  => Service['nginx'],
+        require => Package['nginx-common'],
     }
 
     file { '/etc/docker/registry/config.yml':
diff --git a/modules/docker/templates/registry-nginx.conf.erb 
b/modules/docker/templates/registry-nginx.conf.erb
index 8a87839..1a94721 100644
--- a/modules/docker/templates/registry-nginx.conf.erb
+++ b/modules/docker/templates/registry-nginx.conf.erb
@@ -67,7 +67,7 @@
       allow all;
 
       auth_basic "docker-registry";
-      auth_basic_user_file /etc/docker/registry/htpasswd;
+      auth_basic_user_file /etc/nginx/htpasswd.registry;
 
       proxy_pass http://registry;
       proxy_redirect off;

-- 
To view, visit https://gerrit.wikimedia.org/r/318059
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iae652d9f4869db0f5671e88c95a6b06052985e2b
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits