Unified Diff: modules/nginx/manifests/init.pp
Issue 29481620:
#1990 - Introduce nginx::module type (Closed)
Patch Set:
Created July 6, 2017, 11:08 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« hiera/roles/filterserver.yaml ('k')
|
modules/nginx/manifests/module.pp » ('j')
|
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/nginx/manifests/init.pp |
| diff --git a/modules/nginx/manifests/init.pp b/modules/nginx/manifests/init.pp |
| index 696291218c8f7d15afc59d18323e3fe82f92d8e8..0eee7c81bcf2486cf643630e9fd123d7ad75928c 100644 |
| --- a/modules/nginx/manifests/init.pp |
| +++ b/modules/nginx/manifests/init.pp |
| @@ -66,13 +66,20 @@ class nginx ( |
| logoutput => 'on_failure', |
| } |
| + concat {'/etc/nginx/nginx.conf': |
| + require => Package['nginx'], |
| + } |
| - file {'/etc/nginx/nginx.conf': |
| + concat::fragment {'nginx.conf#main': |
| content => template('nginx/nginx.conf.erb'), |
| - require => Package['nginx'], |
| - notify => Service['nginx'] |
| + notify => Service['nginx'], |
| + order => '10', |
| + target => '/etc/nginx/nginx.conf', |
| } |
| + $modules = hiera_hash('nginx::modules', {}) |
| + create_resources('nginx::module', $modules) |
| + |
| file {'/etc/nginx/sites-available': |
| ensure => directory, |
| require => Package['nginx'] |
« no previous file with comments
|
« hiera/roles/filterserver.yaml ('k')
|
modules/nginx/manifests/module.pp » ('j')
|
no next file with comments »
