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

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

Issue 29502643: #2498 - Provide systemd unit for spawn-fcgi (Closed) Base URL: https://hg1/infrastructure
Patch Set: explain more about workaround and when it can be removed Created Aug. 8, 2017, 10:40 a.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 | « modules/spawn_fcgi/files/spawn-fcgi.service ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: modules/spawn_fcgi/manifests/init.pp
===================================================================
--- a/modules/spawn_fcgi/manifests/init.pp
+++ b/modules/spawn_fcgi/manifests/init.pp
@@ -13,7 +13,10 @@
ensure => running,
hasstatus => true,
enable => true,
- require => File['/etc/init.d/spawn-fcgi'],
+ require => [
+ File['/etc/init.d/spawn-fcgi'],
+ File['/etc/systemd/system/spawn-fcgi.service'],
+ ],
}
file { '/etc/init.d/spawn-fcgi':
@@ -25,6 +28,29 @@
require => Package['spawn-fcgi'],
}
+ file { [
+ '/etc/systemd',
+ '/etc/systemd/system',
+ ]:
+ ensure => 'directory',
+ }
+
+ # #2498: As systemd is not reliably enabling legacy sysvinit scripts, we provide the
+ # unit file (as generated by systemd when enabling the service manually).
+ # This workaround can be considered for removal with systemd 220, or when the package
+ # ships with its own systemd unit.
+ file { '/etc/systemd/system/spawn-fcgi.service':
+ ensure => present,
+ owner => root,
+ group => root,
+ mode => '0755',
+ source => 'puppet:///modules/spawn_fcgi/spawn-fcgi.service',
+ require => [
+ File['/etc/systemd/system'],
+ Package['spawn-fcgi'],
+ ]
+ }
+
file { '/etc/spawn-fcgi':
ensure => directory,
require => Package['spawn-fcgi'],
« no previous file with comments | « modules/spawn_fcgi/files/spawn-fcgi.service ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld