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

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

Issue 4894914248704000: Issue 254 - Switch from wildcard certificate to certificates for individual hosts (Closed)
Patch Set: Created April 10, 2014, 9 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/discourse/manifests/init.pp ('k') | modules/filterserver/manifests/init.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 downloadserver( 1 class downloadserver(
2 $domain, 2 $domain,
3 $certificate,
4 $private_key,
3 $is_default = false 5 $is_default = false
4 ) { 6 ) {
5 7
6 class {'nginx': 8 class {'nginx':
7 worker_processes => 2, 9 worker_processes => 2,
8 worker_connections => 4000, 10 worker_connections => 4000,
9 ssl_session_cache => off, 11 ssl_session_cache => off,
10 } 12 }
11 13
12 user {'hg': 14 user {'hg':
(...skipping 20 matching lines...) Expand all
33 35
34 File { 36 File {
35 owner => root, 37 owner => root,
36 group => root, 38 group => root,
37 mode => 0644, 39 mode => 0644,
38 } 40 }
39 41
40 nginx::hostconfig{$domain: 42 nginx::hostconfig{$domain:
41 source => 'puppet:///modules/downloadserver/site.conf', 43 source => 'puppet:///modules/downloadserver/site.conf',
42 is_default => $is_default, 44 is_default => $is_default,
43 certificate => 'adblockplus.org_sslcert.pem', 45 certificate => $certificate,
44 private_key => 'adblockplus.org_sslcert.key', 46 private_key => $private_key,
45 log => 'access_log_downloads' 47 log => 'access_log_downloads'
46 } 48 }
47 49
48 cron {'mirror': 50 cron {'mirror':
49 ensure => present, 51 ensure => present,
50 command => 'hg pull -q -u -R /var/www/downloads/', 52 command => 'hg pull -q -u -R /var/www/downloads/',
51 environment => ['MAILTO=admins@adblockplus.org,root'], 53 environment => ['MAILTO=admins@adblockplus.org,root'],
52 user => hg, 54 user => hg,
53 minute => '*/10' 55 minute => '*/10'
54 } 56 }
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 require => [File['/home/rsync/.ssh/known_hosts'], 99 require => [File['/home/rsync/.ssh/known_hosts'],
98 File['/home/rsync/.ssh/id_rsa'], 100 File['/home/rsync/.ssh/id_rsa'],
99 File['/var/www/devbuilds']], 101 File['/var/www/devbuilds']],
100 command => 'rsync -e ssh -ltprz --delete devbuilds@ssh.adblockplus.org:. /va r/www/devbuilds', 102 command => 'rsync -e ssh -ltprz --delete devbuilds@ssh.adblockplus.org:. /va r/www/devbuilds',
101 environment => ['MAILTO=admins@adblockplus.org,root'], 103 environment => ['MAILTO=admins@adblockplus.org,root'],
102 user => rsync, 104 user => rsync,
103 hour => '*', 105 hour => '*',
104 minute => '4-54/10' 106 minute => '4-54/10'
105 } 107 }
106 } 108 }
OLDNEW
« no previous file with comments | « modules/discourse/manifests/init.pp ('k') | modules/filterserver/manifests/init.pp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld