Merge pull request puppetlabs#97 from shamil/master

docker::registry fixes
traylenator · Jan 3, 2018 · 8f16663 · 8f16663
2 parents bda5164 + 862d788
commit 8f16663
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/manifests/registry.pp b/manifests/registry.pp
@@ -73,11 +73,14 @@
     $local_user_strip = regsubst($local_user, '-', '', 'G')
 
     $_pass_hash = $pass_hash ? {
-      'Undef'   => pw_hash("${title}${auth_environment}${auth_cmd}${local_user}", 'SHA-512', $local_user_strip),
+      Undef   => pw_hash("${title}${auth_environment}${auth_cmd}${local_user}", 'SHA-512', $local_user_strip),
       default => $pass_hash
     }
 
-    file { "/root/registry-auth-puppet_receipt_${server}_${local_user}":
+    # server may be an URI, which can contain /
+    $server_strip = regsubst($server, '/', '_', 'G')
+
+    file { "/root/registry-auth-puppet_receipt_${server_strip}_${local_user}":
       ensure  => $ensure,
       content => $_pass_hash,
       notify  => Exec["${title} auth"],