opendev/puppet-jenkins
Code Issues Proposed changes

Make Jenkins vhost a host-based

Browse Source 
Currently, when Apache2 is deciding on which vhost to service the requests,
it first looks for the VirtualHost that has the same IP and port as in the request.
(http://httpd.apache.org/docs/current/vhosts/details.html)
This means, providing "jenkins::master::vhost_name" is resolved on host,
and the host has only one IP address, that all requests match this vhost.

This prevents from hosting Jenkins on CI host together with zuul and logserver.

Change-Id: Idf16c2925ab700107a6fd311e276dc1cdb8ad44d
This commit is contained in:
Evgeny Antyshev 2015-11-19 12:24:07 +00:00
parent 3501262d49
commit cfe2a52c1a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
templates/jenkins.vhost.erb
View File

@ -1,4 +1,5 @@
<VirtualHost <%= scope.lookupvar("::jenkins::master::vhost_name") %>:80>
<VirtualHost *:80>
ServerName <%= scope.lookupvar("::jenkins::master::vhost_name") %>
ServerAdmin <%= scope.lookupvar("::jenkins::master::serveradmin") %>
ErrorLog ${APACHE_LOG_DIR}/<%= scope.lookupvar("::jenkins::master::vhost_name") %>-error.log