Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119259
Change subject: redis: hostname is a fact
......................................................................
redis: hostname is a fact
Change-Id: I32088baa585fc291bd2f504b84592cc8d14feba2
---
M modules/redis/templates/redis.conf.erb
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/59/119259/1
diff --git a/modules/redis/templates/redis.conf.erb
b/modules/redis/templates/redis.conf.erb
index 0f04a16..eed5c00 100644
--- a/modules/redis/templates/redis.conf.erb
+++ b/modules/redis/templates/redis.conf.erb
@@ -127,7 +127,7 @@
rdbchecksum yes
# The filename where to dump the DB
-dbfilename <%= hostname %>-<%= port %>.rdb
+dbfilename <%= @hostname %>-<%= port %>.rdb
# The working directory.
#
@@ -149,9 +149,9 @@
#
# slaveof <masterip> <masterport>
<% if @redis_replication and redis_replication.has_key?('site') and
redis_replication['site'] -%>
-slaveof <%= redis_replication[hostname] %>.<%= redis_replication['site'] %>
<%= port %>
-<% elsif @redis_replication and redis_replication.has_key?(hostname) -%>
-slaveof <%= redis_replication[hostname] %> <%= port %>
+slaveof <%= redis_replication[@hostname] %>.<%= redis_replication['site'] %>
<%= port %>
+<% elsif @redis_replication and redis_replication.has_key?(@hostname) -%>
+slaveof <%= redis_replication[@hostname] %> <%= port %>
<% end -%>
# If the master is password protected (using the "requirepass" configuration
@@ -358,7 +358,7 @@
appendonly no
<% end -%>
# The name of the append only file (default: "appendonly.aof")
-appendfilename <%= hostname %>-<%= port %>.aof
+appendfilename <%= @hostname %>-<%= port %>.aof
# The fsync() call tells the Operating System to actually write data on disk
# instead to wait for more data in the output buffer. Some OS will really flush
--
To view, visit https://gerrit.wikimedia.org/r/119259
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I32088baa585fc291bd2f504b84592cc8d14feba2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
