Ori.livneh has submitted this change and it was merged.
Change subject: Specify hasrestart => true for nginx and uwsgi services
......................................................................
Specify hasrestart => true for nginx and uwsgi services
Change-Id: Icaf9e3b947c6895e85e13e726630fd25fcfdd83b
---
M modules/gdash/manifests/init.pp
M modules/nginx/manifests/init.pp
M modules/uwsgi/manifests/init.pp
3 files changed, 10 insertions(+), 8 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/gdash/manifests/init.pp b/modules/gdash/manifests/init.pp
index 0989305..f613c52 100644
--- a/modules/gdash/manifests/init.pp
+++ b/modules/gdash/manifests/init.pp
@@ -91,7 +91,7 @@
uwsgi => {
'socket' => '/var/run/gdash/gdash.sock',
'stats' => '/var/run/gdash/gdash-stats.sock',
- 'rack' => '/opt/gdash/public/config.ru',
+ 'rack' => '/etc/gdash/config.ru',
'post-buffering' => 4096, # required by the Rack
specification.
'master' => true,
'die-on-term' => true,
diff --git a/modules/nginx/manifests/init.pp b/modules/nginx/manifests/init.pp
index f63d9f0..430ce6c 100644
--- a/modules/nginx/manifests/init.pp
+++ b/modules/nginx/manifests/init.pp
@@ -18,9 +18,10 @@
package { [ 'nginx-full', 'nginx-full-dbg' ]: }
service { 'nginx':
- enable => true,
- provider => 'debian',
- require => Package['nginx-full'],
+ enable => true,
+ provider => 'debian',
+ hasrestart => true,
+ require => Package['nginx-full'],
}
file { [ '/etc/nginx/conf.d', '/etc/nginx/sites-available',
'/etc/nginx/sites-enabled' ]:
diff --git a/modules/uwsgi/manifests/init.pp b/modules/uwsgi/manifests/init.pp
index 22a4e36..3bb080a 100644
--- a/modules/uwsgi/manifests/init.pp
+++ b/modules/uwsgi/manifests/init.pp
@@ -14,10 +14,11 @@
package { $plugins: }
service { 'uwsgi':
- ensure => running,
- enable => true,
- provider => 'debian',
- require => Package['uwsgi'],
+ ensure => running,
+ enable => true,
+ provider => 'debian',
+ hasrestart => true,
+ require => Package['uwsgi'],
}
file { [ '/etc/uwsgi/apps-available', '/etc/uwsgi/apps-enabled' ]:
--
To view, visit https://gerrit.wikimedia.org/r/97689
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icaf9e3b947c6895e85e13e726630fd25fcfdd83b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
