opendev/system-config
Code Issues Proposed changes

Make jenkins vhost config more like gerrit.

Browse Source 
Take full filename parameters for SSL files, to better accomodate
dev sites.

Rename apache.conf.erb to jenkins.vhost.erb, because it's actually
a vhost config, not the apache.conf (which is a different file).

Change-Id: I0cf9857fd8860c199081f50ead7218b09955cfab
This commit is contained in:
James E. Blair 2012-04-24 11:02:23 -07:00
parent 57657bd2bb
commit 695ee3f4dc
4 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/site.pp
View File

@ -146,7 +146,10 @@ node "jenkins.openstack.org" {
class { 'jenkins_master': class { 'jenkins_master':
site => 'jenkins.openstack.org', site => 'jenkins.openstack.org',
serveradmin => 'webmaster@openstack.org', serveradmin => 'webmaster@openstack.org',
logo => 'openstack.png' logo => 'openstack.png',
ssl_cert_file => '/etc/ssl/certs/jenkins.openstack.org.pem',
ssl_key_file => '/etc/ssl/private/jenkins.openstack.org.key',
ssl_chain_file => '/etc/ssl/certs/intermediate.pem',
} }
class { "jenkins_jobs": class { "jenkins_jobs":
site => "openstack", site => "openstack",
@ -161,7 +164,10 @@ node "jenkins-dev.openstack.org" {
class { 'jenkins_master': class { 'jenkins_master':
site => 'openstack', site => 'openstack',
serveradmin => 'webmaster@openstack.org', serveradmin => 'webmaster@openstack.org',
logo => 'openstack.png' logo => 'openstack.png',
ssl_cert_file => '/etc/ssl/certs/ssl-cert-snakeoil.pem',
ssl_key_file => '/etc/ssl/private/ssl-cert-snakeoil.key',
ssl_chain_file => '',
} }
} }

5
manifests/stackforge.pp
View File

@ -59,7 +59,10 @@ node "jenkins.stackforge.org" {
class { 'jenkins_master': class { 'jenkins_master':
serveradmin => 'webmaster@stackforge.org', serveradmin => 'webmaster@stackforge.org',
site => 'jenkins.stackforge.org', site => 'jenkins.stackforge.org',
logo => 'stackforge.png' logo => 'stackforge.png',
ssl_cert_file => '/etc/ssl/certs/jenkins.stackforge.org.pem',
ssl_key_file => '/etc/ssl/private/jenkins.stackforge.org.key',
ssl_chain_file => '/etc/ssl/certs/intermediate.pem',
} }
class { "jenkins_jobs": class { "jenkins_jobs":

8
modules/jenkins_master/manifests/init.pp
View File

@ -1,4 +1,8 @@
class jenkins_master($site, $serveradmin, $logo) { class jenkins_master($site, $serveradmin, $logo,
$ssl_cert_file='',
$ssl_key_file='',
$ssl_chain_file=''
) {
#This key is at http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key #This key is at http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key
apt::key { "D50582E6": apt::key { "D50582E6":
@ -21,7 +25,7 @@ class jenkins_master($site, $serveradmin, $logo) {
group => 'root', group => 'root',
mode => 444, mode => 444,
ensure => 'present', ensure => 'present',
content => template("jenkins_master/apache.conf.erb"), content => template("jenkins_master/jenkins.vhost.erb"),
replace => 'true', replace => 'true',
require => Package['apache2'], require => Package['apache2'],
} }

8
modules/jenkins_master/templates/apache.conf.erb → modules/jenkins_master/templates/jenkins.vhost.erb
View File

@ -28,9 +28,11 @@
# Enable/Disable SSL for this virtual host. # Enable/Disable SSL for this virtual host.
SSLEngine on SSLEngine on
SSLCertificateFile /etc/ssl/certs/<%= site %>.pem SSLCertificateFile <%= ssl_cert_file %>
SSLCertificateKeyFile /etc/ssl/private/<%= site %>.key SSLCertificateKeyFile <%= ssl_key_file %>
SSLCertificateChainFile /etc/ssl/certs/intermediate.pem <% if ssl_chain_file != "" %>
SSLCertificateChainFile <%= ssl_chain_file %>
<% end %>
BrowserMatch "MSIE [2-6]" \ BrowserMatch "MSIE [2-6]" \
nokeepalive ssl-unclean-shutdown \ nokeepalive ssl-unclean-shutdown \