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

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

Issue 29323727: Issue 2910 - Setup sitescripts::configfragment with Hiera (Closed)
Patch Set: Created Aug. 15, 2015, 6:47 p.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 sitescripts ( 1 class sitescripts (
2 $sitescriptsini_source = '', 2 $sitescriptsini_source = '',
3 $sitescriptsini_content = '', 3 $sitescriptsini_content = '',
4 ){ 4 ){
5 5
6 concat {'/etc/sitescripts.ini': 6 concat {'/etc/sitescripts.ini':
7 mode => 644, 7 mode => 644,
8 owner => root, 8 owner => root,
9 group => root, 9 group => root,
10 } 10 }
11 11
12 define configfragment($content = '', $source = '') 12 define configfragment($content = '', $source = '')
13 { 13 {
14 concat::fragment {"/etc/sitescripts.ini#$title": 14 concat::fragment {"/etc/sitescripts.ini#$title":
15 target => '/etc/sitescripts.ini', 15 target => '/etc/sitescripts.ini',
16 content => $content, 16 content => $content,
17 source => "$source$content" ? { 17 source => "$source$content" ? {
18 '' => $title, 18 '' => $title,
19 default => $source, 19 default => $source,
20 } 20 }
21 } 21 }
22 } 22 }
23 23
24 configfragment {'/etc/sitescripts.ini': 24 configfragment {'/etc/sitescripts.ini':
25 content => $sitescriptsini_content, 25 content => $sitescriptsini_content,
26 source => $sitescriptsini_source, 26 source => $sitescriptsini_source,
27 } 27 }
28 28
29 $configfragments = hiera('sitescripts::configfragments', {})
30 create_resources('sitescripts::configfragment', $configfragments)
31
29 exec { "fetch_sitescripts": 32 exec { "fetch_sitescripts":
30 command => "hg clone https://hg.adblockplus.org/sitescripts /opt/sitescripts ", 33 command => "hg clone https://hg.adblockplus.org/sitescripts /opt/sitescripts ",
31 path => ["/usr/bin/", "/bin/"], 34 path => ["/usr/bin/", "/bin/"],
32 require => Package['mercurial'], 35 require => Package['mercurial'],
33 onlyif => "test ! -d /opt/sitescripts" 36 onlyif => "test ! -d /opt/sitescripts"
34 } 37 }
35 38
36 cron {"update_sitescripts": 39 cron {"update_sitescripts":
37 ensure => present, 40 ensure => present,
38 command => "hg pull -q -u -R /opt/sitescripts && /opt/sitescripts/ensure_dep endencies.py -q", 41 command => "hg pull -q -u -R /opt/sitescripts && /opt/sitescripts/ensure_dep endencies.py -q",
39 environment => ['MAILTO=admins@adblockplus.org,root'], 42 environment => ['MAILTO=admins@adblockplus.org,root'],
40 user => root, 43 user => root,
41 require => Exec["fetch_sitescripts"], 44 require => Exec["fetch_sitescripts"],
42 } 45 }
43 } 46 }
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