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