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

Side by Side Diff: modules/notificationserver/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/notificationserver/files/site.conf ('k') | modules/rietveld/files/site.conf » ('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 notificationserver($is_default = false) { 1 class notificationserver($is_default = false) {
2 if !defined(Class['nginx']) { 2 if !defined(Class['nginx']) {
3 class {'nginx': 3 class {'nginx':
4 worker_processes => 2, 4 worker_processes => 2,
5 worker_connections => 4000, 5 worker_connections => 4000,
6 ssl_session_cache => off, 6 ssl_session_cache => off,
7 } 7 }
8 } 8 }
9 9
10 if !defined(File['/var/www']) { 10 if !defined(File['/var/www']) {
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 Exec["fetch_sitescripts"] 48 Exec["fetch_sitescripts"]
49 ], 49 ],
50 } 50 }
51 51
52 File { 52 File {
53 owner => root, 53 owner => root,
54 group => root, 54 group => root,
55 mode => 0644, 55 mode => 0644,
56 } 56 }
57 57
58 file {'/etc/nginx/sites-available/adblockplus.org_sslcert.key':
59 ensure => file,
60 notify => Service['nginx'],
61 before => Nginx::Hostconfig['notification.adblockplus.org'],
62 mode => 0400,
63 source => 'puppet:///modules/private/adblockplus.org_sslcert.key'
64 }
65
66 file {'/etc/nginx/sites-available/adblockplus.org_sslcert.pem':
67 ensure => file,
68 notify => Service['nginx'],
69 before => Nginx::Hostconfig['notification.adblockplus.org'],
70 mode => 0400,
71 source => 'puppet:///modules/private/adblockplus.org_sslcert.pem'
72 }
73
74 nginx::hostconfig{'notification.adblockplus.org': 58 nginx::hostconfig{'notification.adblockplus.org':
75 content => template('notificationserver/notification.adblockplus.org.erb'), 59 source => 'puppet:///modules/notificationserver/site.conf',
76 enabled => true 60 is_default => $is_default,
77 } 61 certificate => 'adblockplus.org_sslcert.pem',
78 62 private_key => 'adblockplus.org_sslcert.key',
79 file {'/etc/logrotate.d/nginx_notification.adblockplus.org': 63 log => 'access_log_notification'
80 ensure => file,
81 mode => 0444,
82 require => Nginx::Hostconfig['notification.adblockplus.org'],
83 source => 'puppet:///modules/notificationserver/logrotate'
84 } 64 }
85 } 65 }
OLDNEW
« no previous file with comments | « modules/notificationserver/files/site.conf ('k') | modules/rietveld/files/site.conf » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld