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

Unified Diff: modules/nginx/manifests/init.pp

Issue 29344646: Issue 4073 - Improve Nginx integration with "upstart" service provider (Closed)
Patch Set: Created May 26, 2016, 8:47 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: modules/nginx/manifests/init.pp
diff --git a/modules/nginx/manifests/init.pp b/modules/nginx/manifests/init.pp
index 78a1cb537e07ca92796f11d308c0934bc5d6e040..398154e2a6dac7bf00913a4f38b3c554aaf77331 100644
--- a/modules/nginx/manifests/init.pp
+++ b/modules/nginx/manifests/init.pp
@@ -47,7 +47,6 @@ class nginx (
file {'/etc/nginx/nginx.conf':
content => template('nginx/nginx.conf.erb'),
require => Package['nginx'],
Wladimir Palant 2016/05/27 11:15:08 If I see it correctly, you replaced notify here by
mathias 2016/05/27 11:43:53 Beside the notify for the service in this section
Wladimir Palant 2016/05/27 12:33:01 Well, you require the package now - it should inst
mathias 2016/05/27 14:16:16 I do forgive you, but again this is not the full p
Wladimir Palant 2016/05/27 14:41:34 You are free to remove unrelated changes from this
- notify => Service['nginx']
}
file {'/etc/nginx/sites-available':
@@ -189,9 +188,10 @@ class nginx (
service {'nginx':
ensure => running,
enable => true,
- restart => '/etc/init.d/nginx reload',
+ hasrestart => true,
Wladimir Palant 2016/05/27 11:15:08 Do I see it correctly that we will now restart Ngi
mathias 2016/05/27 11:43:53 No, not with Puppet, at least not without a custom
Wladimir Palant 2016/05/27 12:33:01 That's not how I think it works - the original pro
mathias 2016/05/27 14:16:16 Using the restart parameter for this approach is n
Wladimir Palant 2016/05/27 14:41:34 Thank you.
hasstatus => true,
- require => File['/etc/nginx/nginx.conf']
+ require => Package['nginx'],
+ subscribe => File['/etc/nginx/nginx.conf'],
}
file {'/usr/share/nginx/html/50x.html':
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld