Side by Side Diff: modules/sitescripts/manifests/init.pp
Issue 29363535:
Issue 2313 - Handle Flup dependency in module sitescripts (Closed)
Patch Set: Issue 2313 - Handle Flup dependency in module sitescripts
Created Nov. 18, 2016, 3:39 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« modules/notificationserver/manifests/init.pp ('k')
|
modules/updateserver/manifests/init.pp » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 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 realize(Concat['/etc/sitescripts.ini']) | 14 realize(Concat['/etc/sitescripts.ini']) |
| 15 | 15 |
| 16 concat::fragment {"/etc/sitescripts.ini#$title": | 16 concat::fragment {"/etc/sitescripts.ini#$title": |
| 17 target => '/etc/sitescripts.ini', | 17 target => '/etc/sitescripts.ini', |
| 18 content => $content, | 18 content => $content, |
| 19 source => "$source$content" ? { | 19 source => "$source$content" ? { |
| 20 '' => $title, | 20 '' => $title, |
| 21 default => $source, | 21 default => $source, |
| 22 } | 22 } |
| 23 } | 23 } |
| 24 } | 24 } |
| 25 | 25 |
| 26 ensure_packages(['python-flup']) | |
| 27 | |
| 26 if ($sitescriptsini_source != '') or ($sitescriptsini_content != '') { | 28 if ($sitescriptsini_source != '') or ($sitescriptsini_content != '') { |
| 27 | 29 |
| 28 $content = $sitescriptsini_content | 30 $content = $sitescriptsini_content |
| 29 $source = $sitescriptsini_source | 31 $source = $sitescriptsini_source |
| 30 } | 32 } |
| 31 else { | 33 else { |
| 32 | 34 |
| 33 $content = "# Puppet: Class['$title']\n" | 35 $content = "# Puppet: Class['$title']\n" |
| 34 $source = '' | 36 $source = '' |
| 35 } | 37 } |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 50 } | 52 } |
| 51 | 53 |
| 52 cron {"update_sitescripts": | 54 cron {"update_sitescripts": |
| 53 ensure => present, | 55 ensure => present, |
| 54 command => "hg pull -q -u -R /opt/sitescripts && /opt/sitescripts/ensure_dep endencies.py -q", | 56 command => "hg pull -q -u -R /opt/sitescripts && /opt/sitescripts/ensure_dep endencies.py -q", |
| 55 environment => hiera('cron::environment', []), | 57 environment => hiera('cron::environment', []), |
| 56 user => root, | 58 user => root, |
| 57 require => Exec["fetch_sitescripts"], | 59 require => Exec["fetch_sitescripts"], |
| 58 } | 60 } |
| 59 } | 61 } |
| OLD | NEW |
« no previous file with comments
|
« modules/notificationserver/manifests/init.pp ('k')
|
modules/updateserver/manifests/init.pp » ('j')
|
no next file with comments »
