Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399706 )
Change subject: WIP template https nginx conf ...................................................................... WIP template https nginx conf Need to pass through to the right port Change-Id: I8c0b5062f8967539892f92d3cc72c0e7a059e6dc --- M puppet/modules/role/manifests/https.pp R puppet/modules/role/templates/https/nginx.conf.erb 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/06/399706/1 diff --git a/puppet/modules/role/manifests/https.pp b/puppet/modules/role/manifests/https.pp index a2fa2c7..de2160b 100644 --- a/puppet/modules/role/manifests/https.pp +++ b/puppet/modules/role/manifests/https.pp @@ -11,7 +11,7 @@ } nginx::site { 'devwiki': - source => 'puppet:///modules/role/https/nginx.conf', + source => template('role/https/nginx.conf.erb'), notify => Service['nginx'], } diff --git a/puppet/modules/role/files/https/nginx.conf b/puppet/modules/role/templates/https/nginx.conf.erb similarity index 89% rename from puppet/modules/role/files/https/nginx.conf rename to puppet/modules/role/templates/https/nginx.conf.erb index bdbfd32..c44c8c8 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:<%= @forwarded_port %>; } } -- To view, visit https://gerrit.wikimedia.org/r/399706 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8c0b5062f8967539892f92d3cc72c0e7a059e6dc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Ejegg <ej...@ejegg.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits