Skip to content

Commit 91d10f8

Browse files
author
Tim Meusel
committed
added nginx dependency and moved to template for vhost
1 parent b2423b8 commit 91d10f8

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

Modulefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ dependency 'puppetlabs/inifile', '>= 1.0.0'
1111
dependency 'puppetlabs/apache', '>= 1.0.1'
1212
dependency 'puppetlabs/puppetdb', '>= 2.0.0'
1313
dependency 'puppetlabs/stdlib', '>= 3.0.0'
14+
dependency 'jfryman/nginx', '>= 0.1.1'

manifests/unicorn.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
# hacky vhost
3737
file {'puppetmaster-vhost':
3838
path => '/etc/nginx/sites-available/puppetmaster',
39-
source => 'puppet:///modules/puppet/puppetmaster',
39+
source => 'puppet:///templates/puppet/puppetmaster',
4040
} ->
4141
file {'enable-puppetmaster-vhost':
4242
path => '/etc/nginx/sites-enabled/puppetmaster',

files/puppetmaster renamed to templates/puppetmaster

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ upstream puppetmaster_unicorn {
66
# define our proxy for breaking up SSL
77
server {
88
ssl on;
9-
ssl_certificate /var/lib/puppet/ssl/certs/puppet.vps.hosteurope.de.pem;
10-
ssl_certificate_key /var/lib/puppet/ssl/private_keys/puppet.vps.hosteurope.de.pem;
9+
ssl_certificate /var/lib/puppet/ssl/certs/<%= @fqdn %>.pem;
10+
ssl_certificate_key /var/lib/puppet/ssl/private_keys/<%= @fqdn %>.pem;
1111
ssl_verify_client optional;
1212
ssl_client_certificate /var/lib/puppet/ssl/ca/ca_crt.pem;
1313
ssl_protocols TLSv1.2;

0 commit comments

Comments
 (0)