| OLD | NEW | 
|   1 node 'web2' { |   1 node 'web2' { | 
|   2   include statsclient |   2   include statsclient | 
|   3  |   3  | 
|   4   class {'web::server': |   4   class {'web::server': | 
|   5     vhost => 'adblockplus.org', |   5     vhost => 'adblockplus.org', | 
|   6     certificate => 'adblockplus.org_sslcert.pem', |   6     certificate => 'adblockplus.org_sslcert.pem', | 
|   7     private_key => 'adblockplus.org_sslcert.key', |   7     private_key => 'adblockplus.org_sslcert.key', | 
|   8     is_default => true, |   8     is_default => true, | 
|   9     aliases => ['www.adblockplus.org'], |   9     aliases => ['www.adblockplus.org'], | 
|  10     custom_config => template('web/adblockplus.org.conf.erb'), |  10     custom_config => template('web/adblockplus.org.conf.erb'), | 
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  44     timeout => 0, |  44     timeout => 0, | 
|  45     onlyif => "test ! -d $subscriptions_repo", |  45     onlyif => "test ! -d $subscriptions_repo", | 
|  46     require => [Package['mercurial'], File[$sitescripts_var_dir]] |  46     require => [Package['mercurial'], File[$sitescripts_var_dir]] | 
|  47   } |  47   } | 
|  48  |  48  | 
|  49   cron {'update_repository_subscriptionlist': |  49   cron {'update_repository_subscriptionlist': | 
|  50     ensure => present, |  50     ensure => present, | 
|  51     environment => hiera('cron::environment', []), |  51     environment => hiera('cron::environment', []), | 
|  52     command => "hg pull --quiet --repository $subscriptions_repo", |  52     command => "hg pull --quiet --repository $subscriptions_repo", | 
|  53     user => 'sitescripts', |  53     user => 'sitescripts', | 
|  54     minute => '*/10', |  54     minute => '1-59/20', | 
|  55     require => Exec['fetch_repository_subscriptionlist'] |  55     require => Exec['fetch_repository_subscriptionlist'] | 
|  56   } |  56   } | 
|  57  |  57  | 
|  58   # We have to set up the APT source and install the jsdoc package via npm |  58   # We have to set up the APT source and install the jsdoc package via npm | 
|  59   # manually. Once we're on Puppet 3, we can use the official nodejs module for |  59   # manually. Once we're on Puppet 3, we can use the official nodejs module for | 
|  60   # all this: https://forge.puppetlabs.com/puppetlabs/nodejs |  60   # all this: https://forge.puppetlabs.com/puppetlabs/nodejs | 
|  61  |  61  | 
|  62   apt::source {'nodesource': |  62   apt::source {'nodesource': | 
|  63     location => 'https://deb.nodesource.com/node_4.x', |  63     location => 'https://deb.nodesource.com/node_4.x', | 
|  64     release => 'precise', |  64     release => 'precise', | 
| (...skipping 21 matching lines...) Expand all  Loading... | 
|  86       Class['sitescripts'], |  86       Class['sitescripts'], | 
|  87       Exec['install_jsdoc'], |  87       Exec['install_jsdoc'], | 
|  88       Package['make', 'doxygen'], |  88       Package['make', 'doxygen'], | 
|  89       File['/var/www/docs'], |  89       File['/var/www/docs'], | 
|  90     ], |  90     ], | 
|  91     command => 'python -m sitescripts.docs.bin.generate_docs', |  91     command => 'python -m sitescripts.docs.bin.generate_docs', | 
|  92     user => www, |  92     user => www, | 
|  93     minute => '5-55/10', |  93     minute => '5-55/10', | 
|  94   } |  94   } | 
|  95 } |  95 } | 
| OLD | NEW |