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

Side by Side Diff: modules/filterserver/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/downloadserver/manifests/init.pp ('k') | modules/nagios/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 filterserver($is_default = false) { 1 class filterserver($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 20 matching lines...) Expand all
31 owner => root, 31 owner => root,
32 group => root, 32 group => root,
33 mode => 0644, 33 mode => 0644,
34 } 34 }
35 35
36 file {'/var/www/easylist': 36 file {'/var/www/easylist':
37 ensure => directory, 37 ensure => directory,
38 owner => rsync 38 owner => rsync
39 } 39 }
40 40
41 file {'/etc/nginx/sites-available/inc.easylist-downloads':
42 ensure => absent,
43 }
44
45 file {'/etc/nginx/sites-available/inc.easylist-downloads-txt':
46 ensure => absent
47 }
48
49 file {'/etc/nginx/sites-available/inc.easylist-downloads-tpl':
50 ensure => absent
51 }
52
53 nginx::hostconfig{'easylist-downloads.adblockplus.org': 41 nginx::hostconfig{'easylist-downloads.adblockplus.org':
54 alt_names => 'easylist-msie.adblockplus.org', 42 alt_names => 'easylist-msie.adblockplus.org',
55 source => 'puppet:///modules/filterserver/site.conf', 43 source => 'puppet:///modules/filterserver/site.conf',
56 is_default => $is_default, 44 is_default => $is_default,
57 certificate => 'adblockplus.org_sslcert.pem', 45 certificate => 'easylist-downloads.adblockplus.org_sslcert.pem',
58 private_key => 'adblockplus.org_sslcert.key', 46 private_key => 'easylist-downloads.adblockplus.org_sslcert.key',
59 log => 'access_log_easylist_downloads' 47 log => 'access_log_easylist_downloads'
60 } 48 }
61 49
62 file {'/home/rsync/.ssh': 50 file {'/home/rsync/.ssh':
63 ensure => directory, 51 ensure => directory,
64 require => User['rsync'], 52 require => User['rsync'],
65 owner => rsync, 53 owner => rsync,
66 mode => 0600; 54 mode => 0600;
67 } 55 }
68 56
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 File['/home/rsync/.ssh/id_rsa'], 100 File['/home/rsync/.ssh/id_rsa'],
113 User['rsync'] 101 User['rsync']
114 ], 102 ],
115 command => 'rsync -e "ssh -o CheckHostIP=no" -ltprz --delete rsync@filtermas ter.adblockplus.org:. /var/www/easylist/', 103 command => 'rsync -e "ssh -o CheckHostIP=no" -ltprz --delete rsync@filtermas ter.adblockplus.org:. /var/www/easylist/',
116 environment => ['MAILTO=admins@adblockplus.org,root'], 104 environment => ['MAILTO=admins@adblockplus.org,root'],
117 user => rsync, 105 user => rsync,
118 hour => '*', 106 hour => '*',
119 minute => '2-52/10' 107 minute => '2-52/10'
120 } 108 }
121 } 109 }
OLDNEW
« no previous file with comments | « modules/downloadserver/manifests/init.pp ('k') | modules/nagios/manifests/server.pp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld