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

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

Issue 29337894: Issue 3686 - Replace sitescripts exec- with class-reference in class updateserver (Closed)
Patch Set: Created March 6, 2016, 11:19 p.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 | « no previous file | no next file » | 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, 2 $domain,
3 $certificate, 3 $certificate,
4 $private_key, 4 $private_key,
5 $is_default=false 5 $is_default=false
6 ) { 6 ) {
7 class {'nginx': 7 class {'nginx':
8 worker_connections => 4000, 8 worker_connections => 4000,
9 ssl_session_cache => off, 9 ssl_session_cache => off,
10 } 10 }
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 } 98 }
99 99
100 $update_update_manifests_dependencies = ['python-m2crypto', 'python-jinja2'] 100 $update_update_manifests_dependencies = ['python-m2crypto', 'python-jinja2']
101 101
102 package {$update_update_manifests_dependencies:} 102 package {$update_update_manifests_dependencies:}
103 103
104 exec {'update_update_manifests': 104 exec {'update_update_manifests':
105 command => $update_update_manifests_script, 105 command => $update_update_manifests_script,
106 user => 'sitescripts', 106 user => 'sitescripts',
107 timeout => 0, 107 timeout => 0,
108 require => [Exec['fetch_sitescripts'], 108 require => [Class['sitescripts'],
109 Fetch_repository[$repositories_to_sync], 109 Fetch_repository[$repositories_to_sync],
110 File[$update_update_manifests_script], 110 File[$update_update_manifests_script],
111 File[$update_manifest_dirs], File[$safari_certificate_path], 111 File[$update_manifest_dirs], File[$safari_certificate_path],
112 Package[$update_update_manifests_dependencies]] 112 Package[$update_update_manifests_dependencies]]
113 } 113 }
114 114
115 cron {'update_update_manifests': 115 cron {'update_update_manifests':
116 ensure => present, 116 ensure => present,
117 environment => ['MAILTO=admins@adblockplus.org'], 117 environment => ['MAILTO=admins@adblockplus.org'],
118 command => $update_update_manifests_script, 118 command => $update_update_manifests_script,
119 user => 'sitescripts', 119 user => 'sitescripts',
120 minute => '*/10', 120 minute => '*/10',
121 require => Exec['update_update_manifests'] 121 require => Exec['update_update_manifests']
122 } 122 }
123 123
124 include spawn-fcgi 124 include spawn-fcgi
125 package {'python-flup':} 125 package {'python-flup':}
126 126
127 spawn-fcgi::pool {"multiplexer": 127 spawn-fcgi::pool {"multiplexer":
128 ensure => present, 128 ensure => present,
129 fcgi_app => '/opt/sitescripts/multiplexer.fcgi', 129 fcgi_app => '/opt/sitescripts/multiplexer.fcgi',
130 socket => '/tmp/multiplexer-fastcgi.sock', 130 socket => '/tmp/multiplexer-fastcgi.sock',
131 mode => '0666', 131 mode => '0666',
132 user => 'nginx', 132 user => 'nginx',
133 children => 1, 133 children => 1,
134 require => [ 134 require => [
135 Exec["fetch_sitescripts"], 135 Class["sitescripts"],
136 Package["python-flup"], 136 Package["python-flup"],
137 ], 137 ],
138 } 138 }
139 } 139 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld