Delta Between Two Patch Sets: modules/sitescripts/manifests/init.pp
Issue 29438564:
#301 - Provision formmail templates with absolute paths (Closed)
Left Patch Set:
Created May 16, 2017, 12:29 a.m.
Right Patch Set: For comments 7 and 8
Created March 7, 2018, 11:08 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« modules/sitescripts/manifests/formmail.pp ('k')
|
no next file »
|
no next file with change/comment »
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')
| LEFT | RIGHT |
|---|---|
| (no file at all) | |
| 1 class sitescripts ( | 1 class sitescripts ( |
| 2 $directory = {}, | |
| 2 $sitescriptsini_source = '', | 3 $sitescriptsini_source = '', |
| 3 $sitescriptsini_content = '', | 4 $sitescriptsini_content = '', |
| 4 ){ | 5 ){ |
| 5 | 6 |
| 6 ensure_resource('adblockplus::sitescripts::repository', 'sitescripts') | 7 ensure_resource('adblockplus::sitescripts::repository', 'sitescripts') |
| 8 | |
| 9 ensure_resource('file', $title, merge({ | |
| 10 'ensure' => 'directory', | |
| 11 'path' => '/var/sitescripts', | |
| 12 }, $directory)) | |
| 13 | |
| 14 $directory_path = getparam(File[$title], 'path') | |
| 7 | 15 |
| 8 @concat {'/etc/sitescripts.ini': | 16 @concat {'/etc/sitescripts.ini': |
| 9 mode => '644', | 17 mode => '644', |
| 10 owner => root, | 18 owner => root, |
| 11 group => root, | 19 group => root, |
| 12 } | 20 } |
| 13 | 21 |
| 14 define configfragment($content = '', $source = '') { | 22 define configfragment($content = '', $source = '') { |
| 15 | 23 |
| 16 realize(Concat['/etc/sitescripts.ini']) | 24 realize(Concat['/etc/sitescripts.ini']) |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 37 } | 45 } |
| 38 | 46 |
| 39 configfragment {'/etc/sitescripts.ini': | 47 configfragment {'/etc/sitescripts.ini': |
| 40 content => $content, | 48 content => $content, |
| 41 source => $source, | 49 source => $source, |
| 42 } | 50 } |
| 43 | 51 |
| 44 $configfragments = hiera('sitescripts::configfragments', {}) | 52 $configfragments = hiera('sitescripts::configfragments', {}) |
| 45 create_resources('sitescripts::configfragment', $configfragments) | 53 create_resources('sitescripts::configfragment', $configfragments) |
| 46 } | 54 } |
| LEFT | RIGHT |
« modules/sitescripts/manifests/formmail.pp ('k')
|
no next file »
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
