| OLD | NEW | 
|---|
| 1 class downloadserver( | 1 class downloadserver( | 
| 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 | 7 | 
|  | 8   include adblockplus::web | 
|  | 9 | 
| 8   class {'nginx': | 10   class {'nginx': | 
| 9     worker_connections => 4000, | 11     worker_connections => 4000, | 
| 10     ssl_session_cache => off, | 12     ssl_session_cache => off, | 
| 11   } | 13   } | 
| 12 | 14 | 
| 13   class {'sitescripts': | 15   class {'sitescripts': | 
| 14     sitescriptsini_source => 'puppet:///modules/downloadserver/sitescripts', | 16     sitescriptsini_source => 'puppet:///modules/downloadserver/sitescripts', | 
| 15   } | 17   } | 
| 16 | 18 | 
| 17   package {'python-jinja2':} | 19   package {'python-jinja2':} | 
| (...skipping 12 matching lines...) Expand all  Loading... | 
| 30     ], | 32     ], | 
| 31   } | 33   } | 
| 32 | 34 | 
| 33   user {'hg': | 35   user {'hg': | 
| 34     ensure => present, | 36     ensure => present, | 
| 35     comment => 'Mercurial client user', | 37     comment => 'Mercurial client user', | 
| 36     home => '/home/hg', | 38     home => '/home/hg', | 
| 37     managehome => true | 39     managehome => true | 
| 38   } | 40   } | 
| 39 | 41 | 
| 40   file {'/var/www': |  | 
| 41     ensure => directory, |  | 
| 42     owner => hg, |  | 
| 43     mode => '0644', |  | 
| 44   } |  | 
| 45 |  | 
| 46   exec { "fetch_downloads": | 42   exec { "fetch_downloads": | 
| 47     command => "hg clone https://hg.adblockplus.org/downloads /var/www/downloads
     ", | 43     command => "hg clone https://hg.adblockplus.org/downloads /var/www/downloads
     ", | 
| 48     path => ["/usr/bin/", "/bin/"], | 44     path => ["/usr/bin/", "/bin/"], | 
| 49     require => Package['mercurial'], | 45     require => Package['mercurial'], | 
| 50     user => hg, | 46     user => hg, | 
| 51     timeout => 0, | 47     timeout => 0, | 
| 52     onlyif => "test ! -d /var/www/downloads" | 48     onlyif => "test ! -d /var/www/downloads" | 
| 53   } | 49   } | 
| 54 | 50 | 
| 55   File { | 51   File { | 
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 116     ensure => present, | 112     ensure => present, | 
| 117     require => [File['/home/rsync/.ssh/id_rsa'], | 113     require => [File['/home/rsync/.ssh/id_rsa'], | 
| 118                 File['/var/www/devbuilds']], | 114                 File['/var/www/devbuilds']], | 
| 119     command => 'rsync -e ssh -ltprz --delete devbuilds@server16.adblockplus.org:
     . /var/www/devbuilds', | 115     command => 'rsync -e ssh -ltprz --delete devbuilds@server16.adblockplus.org:
     . /var/www/devbuilds', | 
| 120     environment => hiera('cron::environment', []), | 116     environment => hiera('cron::environment', []), | 
| 121     user => rsync, | 117     user => rsync, | 
| 122     hour => '*', | 118     hour => '*', | 
| 123     minute => '4-54/10' | 119     minute => '4-54/10' | 
| 124   } | 120   } | 
| 125 } | 121 } | 
| OLD | NEW | 
|---|