ArielGlenn has uploaded a new change for review. https://gerrit.wikimedia.org/r/64267
Change subject: adapt redis template for labs use, update labs redis role settings ...................................................................... adapt redis template for labs use, update labs redis role settings Change-Id: I53a0a5b1350af44f23a365d9d3f5203a576e4d48 --- M manifests/role/labsredis.pp M modules/redis/manifests/init.pp M modules/redis/templates/redis.conf.erb 3 files changed, 12 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/67/64267/1 diff --git a/manifests/role/labsredis.pp b/manifests/role/labsredis.pp index a0e029f..3986609 100644 --- a/manifests/role/labsredis.pp +++ b/manifests/role/labsredis.pp @@ -1,7 +1,14 @@ # See https://gerrit.wikimedia.org/r/#/c/54970/ and https://projects.puppetlabs.com/issues/2053 # before renaming. class role::labs-redis { - class { "::redis": - dir => "/var/lib/redis/", - } + require passwords::redis + + class { "::redis": + dir => "/var/lib/redis/", + maxmemory => "500mb", + persist => "aof", + redis_replication => undef, + password => $::passwords::redis::main_password, + auto_aof_rewrite_min_size => "64mb", + } } diff --git a/modules/redis/manifests/init.pp b/modules/redis/manifests/init.pp index 6e446e3..0ebad4d 100644 --- a/modules/redis/manifests/init.pp +++ b/modules/redis/manifests/init.pp @@ -13,6 +13,7 @@ $servicename = "redis-server", $monitor = true, $password = false, + $auto_aof_rewrite_min_size = "512mb", ) { case $::operatingsystem { debian, ubuntu: { diff --git a/modules/redis/templates/redis.conf.erb b/modules/redis/templates/redis.conf.erb index e31de08..8cbabcb 100644 --- a/modules/redis/templates/redis.conf.erb +++ b/modules/redis/templates/redis.conf.erb @@ -419,7 +419,7 @@ # Specify a percentage of zero in order to disable the automatic AOF # rewrite feature. auto-aof-rewrite-percentage 100 -auto-aof-rewrite-min-size 512mb +auto-aof-rewrite-min-size <%= auto_aof_rewrite_min_size %> ################################ LUA SCRIPTING ############################### -- To view, visit https://gerrit.wikimedia.org/r/64267 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I53a0a5b1350af44f23a365d9d3f5203a576e4d48 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: ArielGlenn <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
