jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/400206 )
Change subject: https: Add port number to reverse proxy
......................................................................
https: Add port number to reverse proxy
Bug: T183304
Change-Id: I464fd73c8183500f875364384b3deba15d3e1116
---
M puppet/modules/role/manifests/https.pp
R puppet/modules/role/templates/https/nginx.conf.erb
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Smalyshev: Looks good to me, but someone else must approve
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/role/manifests/https.pp
b/puppet/modules/role/manifests/https.pp
index a2fa2c7..551f580 100644
--- a/puppet/modules/role/manifests/https.pp
+++ b/puppet/modules/role/manifests/https.pp
@@ -11,8 +11,8 @@
}
nginx::site { 'devwiki':
- source => 'puppet:///modules/role/https/nginx.conf',
- notify => Service['nginx'],
+ content => template('role/https/nginx.conf.erb'),
+ notify => Service['nginx'],
}
mediawiki::settings { 'SSL-related settings':
diff --git a/puppet/modules/role/files/https/nginx.conf
b/puppet/modules/role/templates/https/nginx.conf.erb
similarity index 87%
rename from puppet/modules/role/files/https/nginx.conf
rename to puppet/modules/role/templates/https/nginx.conf.erb
index bdbfd32..44aa994 100644
--- a/puppet/modules/role/files/https/nginx.conf
+++ b/puppet/modules/role/templates/https/nginx.conf.erb
@@ -14,6 +14,6 @@
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto https;
proxy_read_timeout 180s;
- proxy_pass http://127.0.0.1;
+ proxy_pass http://127.0.0.1:<%= scope['::forwarded_port'] %>;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/400206
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I464fd73c8183500f875364384b3deba15d3e1116
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org>
Gerrit-Reviewer: Gergő Tisza <gti...@wikimedia.org>
Gerrit-Reviewer: Smalyshev <smalys...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
