[MediaWiki-commits] [Gerrit] syslog: qualify vars - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: syslog: qualify vars
......................................................................


syslog: qualify vars

Change-Id: I22eae353f4979b77f10ac80f7c3419a5de7a0ff7
---
M templates/syslog-ng/remote-logs.erb
M templates/syslog-ng/syslog-ng.conf.nfs.erb
2 files changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Alexandros Kosiaris: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/templates/syslog-ng/remote-logs.erb 
b/templates/syslog-ng/remote-logs.erb
index ef1fb6b..009d2e4 100644
--- a/templates/syslog-ng/remote-logs.erb
+++ b/templates/syslog-ng/remote-logs.erb
@@ -3,10 +3,10 @@
 ### puppet:///templates/syslog-ng/remote-logs.erb
 #####################################################################
 
-<%= basepath %>/* {
+<%= @basepath %>/* {
        rotate 7
        dateext
-       olddir <%= basepath %>/archive
+       olddir <%= @basepath %>/archive
        daily
        compress
        missingok
diff --git a/templates/syslog-ng/syslog-ng.conf.nfs.erb 
b/templates/syslog-ng/syslog-ng.conf.nfs.erb
index 8bd859d..6ff736b 100644
--- a/templates/syslog-ng/syslog-ng.conf.nfs.erb
+++ b/templates/syslog-ng/syslog-ng.conf.nfs.erb
@@ -358,17 +358,17 @@
 
 # Remote log messages
 destination df_remote {
-       file("<%= basepath %>/syslog" group(500));
+       file("<%= @basepath %>/syslog" group(500));
  };
 
 # Apache messages
 destination df_remote_apache {
-       file("<%= basepath %>/apache.log" group(500));
+       file("<%= @basepath %>/apache.log" group(500));
 };
 
 # OpenSwift messages
 destination df_swift {
-       file("<%= basepath %>/swift" group(500));
+       file("<%= @basepath %>/swift" group(500));
 };
 
 # Wikimedia filters

-- 
To view, visit https://gerrit.wikimedia.org/r/156022
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I22eae353f4979b77f10ac80f7c3419a5de7a0ff7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <mata...@foss.co.il>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits