| OLD | NEW | 
|   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': | 
 |  28   } | 
 |  29  | 
|  27   $subscription_repo = '/home/www/subscriptionlist' |  30   $subscription_repo = '/home/www/subscriptionlist' | 
|  28  |  31  | 
|  29   $fetch_repo_cmd = [ |  32   $fetch_repo_cmd = [ | 
|  30     'hg', 'clone', |  33     'hg', 'clone', | 
|  31     '--noupdate', |  34     '--noupdate', | 
|  32     'https://hg.adblockplus.org/subscriptionlist', |  35     'https://hg.adblockplus.org/subscriptionlist', | 
|  33     $subscription_repo, |  36     $subscription_repo, | 
|  34   ] |  37   ] | 
|  35  |  38  | 
|  36   exec {'fetch_repository_subscriptionlist': |  39   exec {'fetch_repository_subscriptionlist': | 
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  68       Class['sitescripts'], |  71       Class['sitescripts'], | 
|  69       Class['web::server'], |  72       Class['web::server'], | 
|  70       Class['nodejs'], |  73       Class['nodejs'], | 
|  71     ], |  74     ], | 
|  72     command => shellquote($generate_docs_cmd), |  75     command => shellquote($generate_docs_cmd), | 
|  73     user => www, |  76     user => www, | 
|  74     minute => '5-55/10', |  77     minute => '5-55/10', | 
|  75   } |  78   } | 
|  76 } |  79 } | 
|  77  |  80  | 
| OLD | NEW |