Filippo Giunchedi has submitted this change and it was merged.
Change subject: redis: create /var/run/redis at boot
......................................................................
redis: create /var/run/redis at boot
Bug: T130147
Change-Id: I55a84b5c8e7be7a35c4d82cc6e2fa6682d0fc679
---
M modules/redis/manifests/init.pp
A modules/redis/templates/initscripts/redis-startup.upstart.erb
2 files changed, 25 insertions(+), 0 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
Giuseppe Lavagetto: Looks good to me, but someone else must approve
diff --git a/modules/redis/manifests/init.pp b/modules/redis/manifests/init.pp
index df99c15..32a232e 100644
--- a/modules/redis/manifests/init.pp
+++ b/modules/redis/manifests/init.pp
@@ -40,4 +40,22 @@
path => '/etc/redis/redis.conf',
}
}
+
+ # ensure that /var/run/redis is created at boot
+ if os_version('debian >= jessie') {
+ file { '/etc/tmpfiles.d/redis-startup.conf':
+ ensure => present,
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ content => 'd /var/run/redis 0755 redis redis',
+ }
+ } else {
+ base::service_unit { 'redis-startup':
+ ensure => present,
+ template_name => 'redis-startup',
+ upstart => true,
+ declare_service => false,
+ }
+ }
}
diff --git a/modules/redis/templates/initscripts/redis-startup.upstart.erb
b/modules/redis/templates/initscripts/redis-startup.upstart.erb
new file mode 100644
index 0000000..ff7b030
--- /dev/null
+++ b/modules/redis/templates/initscripts/redis-startup.upstart.erb
@@ -0,0 +1,7 @@
+description "create required directories for redis"
+
+start on mounted MOUNTPOINT=/run TYPE=tmpfs
+
+task
+
+exec install -d -o redis -g redis /var/run/redis
--
To view, visit https://gerrit.wikimedia.org/r/297259
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I55a84b5c8e7be7a35c4d82cc6e2fa6682d0fc679
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[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
