Unified Diff: modules/web/manifests/server.pp
Issue 29339227:
Issue 3881 - Ensure sitescripts.ini being present even if empty (Closed)
Patch Set:
Created March 31, 2016, 4:14 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« modules/sitescripts/manifests/init.pp ('k')
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: modules/web/manifests/server.pp |
| diff --git a/modules/web/manifests/server.pp b/modules/web/manifests/server.pp |
| index 169d1139c1018b36e6c48b0f37cfd42222f6cfc3..e9d80e5808786821869aba3c3ef3b9947f37c897 100644 |
| --- a/modules/web/manifests/server.pp |
| +++ b/modules/web/manifests/server.pp |
| @@ -10,6 +10,8 @@ class web::server( |
| $geoip = false, |
| ) { |
| + include sitescripts |
| + |
| # Ensure there is at least one character in the respective strings; |
| # see https://codereview.adblockplus.org/29329028/#msg3 |
| validate_re($vhost, '.+') |
| @@ -54,8 +56,8 @@ class web::server( |
| include spawn-fcgi |
| package {'python-flup':} |
| - class {'sitescripts': |
| - sitescriptsini_source => 'puppet:///modules/web/sitescripts', |
| + sitescripts::configfragment {$title: |
| + source => 'puppet:///modules/web/sitescripts', |
| } |
| spawn-fcgi::pool {"multiplexer": |
« no previous file with comments
|
« modules/sitescripts/manifests/init.pp ('k')
|
no next file »
|
no next file with comments »
