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

Delta Between Two Patch Sets: modules/adblockplus/manifests/legacy/webserver.pp

Issue 29493618: #2007 - Move jsdoc package inside legacy module (Closed)
Left Patch Set: Created July 20, 2017, 5:38 p.m.
Right Patch Set: For comment 2 Created July 20, 2017, 6:41 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « hiera/roles/web/adblockplus.yaml ('k') | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 # == Class: adblockplus::legacy::webserver 1 # == Class: adblockplus::legacy::webserver
2 # 2 #
3 # A container for migrating obsolete resources in web2, formerly located 3 # A container for migrating obsolete resources in web2, formerly located
4 # in manifests/webserver.pp. 4 # in manifests/webserver.pp.
5 # 5 #
6 # See http://hub.eyeo.com/issues/2007 for more information. 6 # See http://hub.eyeo.com/issues/2007 for more information.
7 # 7 #
8 class adblockplus::legacy::webserver { 8 class adblockplus::legacy::webserver {
9 9
10 class {'web::server': 10 class {'web::server':
11 vhost => 'adblockplus.org', 11 vhost => 'adblockplus.org',
12 certificate => 'adblockplus.org_sslcert.pem', 12 certificate => 'adblockplus.org_sslcert.pem',
13 private_key => 'adblockplus.org_sslcert.key', 13 private_key => 'adblockplus.org_sslcert.key',
14 is_default => true, 14 is_default => true,
15 aliases => ['www.adblockplus.org'], 15 aliases => ['www.adblockplus.org'],
16 custom_config => template("web/adblockplus.org.conf.erb"), 16 custom_config => template("web/adblockplus.org.conf.erb"),
17 repository => 'web.adblockplus.org', 17 repository => 'web.adblockplus.org',
18 multiplexer_locations => ['/getSubscription'], 18 multiplexer_locations => ['/getSubscription'],
19 geoip => true, 19 geoip => true,
20 } 20 }
21 21
22 ensure_packages([ 22 ensure_packages([
23 'make', 23 'make',
24 'doxygen', 24 'doxygen',
25 ]) 25 ])
26 26
27 nodejs::package{'jsdoc':} 27 nodejs::package{'jsdoc':
mathias 2017/07/20 18:30:56 The new line before the closing bracket is conside
28 }
28 29
29 $subscription_repo = '/home/www/subscriptionlist' 30 $subscription_repo = '/home/www/subscriptionlist'
30 31
31 $fetch_repo_cmd = [ 32 $fetch_repo_cmd = [
32 'hg', 'clone', 33 'hg', 'clone',
33 '--noupdate', 34 '--noupdate',
34 'https://hg.adblockplus.org/subscriptionlist', 35 'https://hg.adblockplus.org/subscriptionlist',
35 $subscription_repo, 36 $subscription_repo,
36 ] 37 ]
37 38
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 Class['sitescripts'], 71 Class['sitescripts'],
71 Class['web::server'], 72 Class['web::server'],
72 Class['nodejs'], 73 Class['nodejs'],
73 ], 74 ],
74 command => shellquote($generate_docs_cmd), 75 command => shellquote($generate_docs_cmd),
75 user => www, 76 user => www,
76 minute => '5-55/10', 77 minute => '5-55/10',
77 } 78 }
78 } 79 }
79 80
LEFTRIGHT

Powered by Google App Engine
This is Rietveld