Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334385 )
Change subject: profile::etcd::tlsproxy: minor fixes
......................................................................
profile::etcd::tlsproxy: minor fixes
Change-Id: Ifdd59c23221a52bc1a029ebd5070fc9d5c884faa
---
M modules/profile/manifests/etcd/tlsproxy.pp
M modules/profile/templates/etcd/tls_proxy.conf.erb
2 files changed, 3 insertions(+), 4 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/modules/profile/manifests/etcd/tlsproxy.pp
b/modules/profile/manifests/etcd/tlsproxy.pp
index ef1284d..42f9453 100644
--- a/modules/profile/manifests/etcd/tlsproxy.pp
+++ b/modules/profile/manifests/etcd/tlsproxy.pp
@@ -30,8 +30,7 @@
# Simulate the etcd auth error
file { '/etc/nginx/etcd-errors/401.json':
ensure => present,
- mode => '0440',
-
+ mode => '0444',
}
# I know, this is pretty horrible. Puppet is too, with its
diff --git a/modules/profile/templates/etcd/tls_proxy.conf.erb
b/modules/profile/templates/etcd/tls_proxy.conf.erb
index d748626..dac31e6 100644
--- a/modules/profile/templates/etcd/tls_proxy.conf.erb
+++ b/modules/profile/templates/etcd/tls_proxy.conf.erb
@@ -38,8 +38,8 @@
}
<%- @acls.each do |url, users| -%>
- location /v2/keys<%= url %>/ {
- proxy_pass http://etcd/v2/keys<%= url %>/;
+ location /v2/keys<%= url %> {
+ proxy_pass http://etcd/v2/keys<%= url %>;
<%- if users.empty? -%>
auth_basic off;
<%- else -%>
--
To view, visit https://gerrit.wikimedia.org/r/334385
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifdd59c23221a52bc1a029ebd5070fc9d5c884faa
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
