Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: modules/updateserver/manifests/init.pp

Issue 5734493784637440: Issue 245 - Unify SSL configuration for all servers (Closed)
Patch Set: Converted Nagios site configuration and centralized error page configuration Created April 10, 2014, 6:40 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « modules/updateserver/files/site.conf ('k') | modules/web/manifests/server.pp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 class updateserver { 1 class updateserver(
2 $domain,
3 $is_default=false
4 ) {
2 class {'nginx': 5 class {'nginx':
3 worker_processes => 2, 6 worker_processes => 2,
4 worker_connections => 4000, 7 worker_connections => 4000,
5 ssl_session_cache => off, 8 ssl_session_cache => off,
6 } 9 }
7 10
8 File { 11 File {
9 owner => root, 12 owner => root,
10 group => root 13 group => root
11 } 14 }
(...skipping 13 matching lines...) Expand all
25 ensure => directory, 28 ensure => directory,
26 mode => 0755 29 mode => 0755
27 } 30 }
28 31
29 file {'/var/www/update/adblockplusie/update.json': 32 file {'/var/www/update/adblockplusie/update.json':
30 ensure => file, 33 ensure => file,
31 source => 'puppet:///modules/updateserver/adblockplusie/update.json', 34 source => 'puppet:///modules/updateserver/adblockplusie/update.json',
32 mode => 0644 35 mode => 0644
33 } 36 }
34 37
35 file {'/etc/nginx/sites-available/adblockplus.org_sslcert.key': 38 nginx::hostconfig{$domain:
36 ensure => file, 39 source => 'puppet:///modules/updateserver/site.conf',
37 notify => Service['nginx'], 40 is_default => $is_default,
38 before => Nginx::Hostconfig['update.adblockplus.org'], 41 certificate => 'adblockplus.org_sslcert.pem',
39 mode => 0400, 42 private_key => 'adblockplus.org_sslcert.key',
40 source => 'puppet:///modules/private/adblockplus.org_sslcert.key' 43 log => 'access_log_update'
41 }
42
43 file {'/etc/nginx/sites-available/adblockplus.org_sslcert.pem':
44 ensure => file,
45 notify => Service['nginx'],
46 before => Nginx::Hostconfig['update.adblockplus.org'],
47 mode => 0400,
48 source => 'puppet:///modules/private/adblockplus.org_sslcert.pem'
49 }
50
51 nginx::hostconfig{'update.adblockplus.org':
52 source => 'puppet:///modules/updateserver/update.adblockplus.org',
53 enabled => true
54 }
55
56 file {'/etc/logrotate.d/nginx_update.adblockplus.org':
57 ensure => file,
58 mode => 0444,
59 require => Nginx::Hostconfig['update.adblockplus.org'],
60 source => 'puppet:///modules/updateserver/logrotate'
61 } 44 }
62 } 45 }
OLDNEW
« no previous file with comments | « modules/updateserver/files/site.conf ('k') | modules/web/manifests/server.pp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld