Gergő Tisza has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/394835 )
Change subject: Add systemd override for redis-service
......................................................................
Add systemd override for redis-service
On jessie, there was no systemd service for redis so puppet just
used provider:debian. On stretch, there is one, and it restricts
writable directories so the directory with the rdb file needs an
exception.
Bug: T181917
Change-Id: I1abb0dba3459a2c8efaec827df62bf63b77317c3
---
M puppet/modules/redis/manifests/init.pp
A puppet/modules/redis/templates/systemd/redis-server.erb
2 files changed, 14 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/35/394835/1
diff --git a/puppet/modules/redis/manifests/init.pp
b/puppet/modules/redis/manifests/init.pp
index c95a5be..98fbcd1 100644
--- a/puppet/modules/redis/manifests/init.pp
+++ b/puppet/modules/redis/manifests/init.pp
@@ -78,11 +78,17 @@
require => [ Package['redis-server'], File[$dir] ],
}
- service { 'redis-server':
- ensure => running,
- enable => true,
- provider => 'debian',
- subscribe => File['/etc/redis/redis.conf'],
- require => File['/etc/redis/redis.conf'],
+ systemd::service { 'redis-server':
+ is_override => true,
+ service_params => {
+ enable => true,
+ subscribe => [
+ Package['redis-server'],
+ File['/etc/redis/redis.conf'],
+ ],
+ require => [
+ File[$dir],
+ ],
+ },
}
}
diff --git a/puppet/modules/redis/templates/systemd/redis-server.erb
b/puppet/modules/redis/templates/systemd/redis-server.erb
new file mode 100644
index 0000000..55e3565
--- /dev/null
+++ b/puppet/modules/redis/templates/systemd/redis-server.erb
@@ -0,0 +1,2 @@
+[Service]
+ReadWriteDirectories=-<%= scope['redis::dir'] %>
--
To view, visit https://gerrit.wikimedia.org/r/394835
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1abb0dba3459a2c8efaec827df62bf63b77317c3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: Gergő Tisza <gti...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
