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

Side by Side Diff: modules/downloadserver/manifests/init.pp

Issue 29329601: Issue 123 - Integrate downloadserver cron::environment with Hiera (Closed)
Patch Set: Created Nov. 2, 2015, 11:49 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 68
69 file {'/etc/nginx/conf.d/adblockbrowserupdatescache.conf': 69 file {'/etc/nginx/conf.d/adblockbrowserupdatescache.conf':
70 source => 'puppet:///modules/downloadserver/adblockbrowserupdatescache.conf' , 70 source => 'puppet:///modules/downloadserver/adblockbrowserupdatescache.conf' ,
71 require => Package['nginx'], 71 require => Package['nginx'],
72 notify => Service['nginx'] 72 notify => Service['nginx']
73 } 73 }
74 74
75 cron {'mirror': 75 cron {'mirror':
76 ensure => present, 76 ensure => present,
77 command => 'hg pull -q -u -R /var/www/downloads/', 77 command => 'hg pull -q -u -R /var/www/downloads/',
78 environment => ['MAILTO=admins@adblockplus.org,root'], 78 environment => hiera('cron::environment', []),
79 user => hg, 79 user => hg,
80 minute => '*/10' 80 minute => '*/10'
81 } 81 }
82 82
83 file {'/var/www/devbuilds': 83 file {'/var/www/devbuilds':
84 ensure => directory, 84 ensure => directory,
85 owner => rsync 85 owner => rsync
86 } 86 }
87 87
88 user {'rsync': 88 user {'rsync':
(...skipping 29 matching lines...) Expand all
118 mode => 0400, 118 mode => 0400,
119 source => 'puppet:///modules/private/rsync@downloads.adblockplus.org.pub' 119 source => 'puppet:///modules/private/rsync@downloads.adblockplus.org.pub'
120 } 120 }
121 121
122 cron {'mirror-devbuilds': 122 cron {'mirror-devbuilds':
123 ensure => present, 123 ensure => present,
124 require => [File['/home/rsync/.ssh/known_hosts'], 124 require => [File['/home/rsync/.ssh/known_hosts'],
125 File['/home/rsync/.ssh/id_rsa'], 125 File['/home/rsync/.ssh/id_rsa'],
126 File['/var/www/devbuilds']], 126 File['/var/www/devbuilds']],
127 command => 'rsync -e ssh -ltprz --delete devbuilds@ssh.adblockplus.org:. /va r/www/devbuilds', 127 command => 'rsync -e ssh -ltprz --delete devbuilds@ssh.adblockplus.org:. /va r/www/devbuilds',
128 environment => ['MAILTO=admins@adblockplus.org,root'], 128 environment => hiera('cron::environment', []),
129 user => rsync, 129 user => rsync,
130 hour => '*', 130 hour => '*',
131 minute => '4-54/10' 131 minute => '4-54/10'
132 } 132 }
133 } 133 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld