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

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

Issue 29483575: #2007 - Create abp::legacy::webserver class for hiera compatibility (Closed)
Left Patch Set: Creates a full commit for refactoring webserver manifest Created July 10, 2017, 6:29 p.m.
Right Patch Set: For comment 9 and 10 Created July 12, 2017, 7:08 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 | « manifests/webserver.pp ('k') | modules/private-stub/hiera/hosts.yaml » ('j') | 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
22 ensure_packages([
23 'make',
24 'doxygen',
25 ])
21 26
22 $subscription_repo = '/home/www/subscriptionlist' 27 $subscription_repo = '/home/www/subscriptionlist'
23 28
24 $fetch_repo_cmd = [ 29 $fetch_repo_cmd = [
25 'hg', 'clone', 30 'hg', 'clone',
26 '--noupdate', 31 '--noupdate',
27 'https://hg.adblockplus.org/subscriptionlist', 32 'https://hg.adblockplus.org/subscriptionlist',
28 $subscription_repo, 33 $subscription_repo,
29 ] 34 ]
30 35
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 Class['sitescripts'], 68 Class['sitescripts'],
64 Class['web::server'], 69 Class['web::server'],
65 Class['nodejs'], 70 Class['nodejs'],
66 ], 71 ],
67 command => shellquote($generate_docs_cmd), 72 command => shellquote($generate_docs_cmd),
68 user => www, 73 user => www,
69 minute => '5-55/10', 74 minute => '5-55/10',
70 } 75 }
71 } 76 }
72 77
LEFTRIGHT

Powered by Google App Engine
This is Rietveld