Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/161926
Change subject: udp2log: qualify vars
......................................................................
udp2log: qualify vars
Change-Id: I4c21321dead3b40df9ed7ee5838c6bd67ad978f8
---
M templates/udp2log/logrotate_udp2log.erb
M templates/udp2log/udp2log.init.erb
2 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/26/161926/1
diff --git a/templates/udp2log/logrotate_udp2log.erb
b/templates/udp2log/logrotate_udp2log.erb
index ff268fb..8308a3a 100644
--- a/templates/udp2log/logrotate_udp2log.erb
+++ b/templates/udp2log/logrotate_udp2log.erb
@@ -2,10 +2,10 @@
# THIS FILE IS MANAGED BY PUPPET #
##################################
-# Rotate anything in <%= log_directory %>/*.log daily
-<%= log_directory %>/*.log {
+# Rotate anything in <%= @log_directory %>/*.log daily
+<%= @log_directory %>/*.log {
daily
- olddir <%= log_directory %>/archive
+ olddir <%= @log_directory %>/archive
notifempty
nocreate
maxage 180
diff --git a/templates/udp2log/udp2log.init.erb
b/templates/udp2log/udp2log.init.erb
index 9b17cf6..6030762 100644
--- a/templates/udp2log/udp2log.init.erb
+++ b/templates/udp2log/udp2log.init.erb
@@ -5,7 +5,7 @@
#######################################################################
### BEGIN INIT INFO
-# Provides: udp2log-<%= name %>
+# Provides: udp2log-<%= @name %>
# Required-Start: $remote_fs $syslog
# Required-Stop: $remote_fs $syslog
# Default-Start: 2 3 4 5
@@ -20,15 +20,15 @@
# PATH should only include /usr/* if it runs after the mountnfs.sh script
PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="UDP log receiver (udp2log)"
-NAME=udp2log-<%= name %>
+NAME=udp2log-<%= @name %>
DAEMON=/usr/bin/udp2log
PIDFILE=/var/run/$NAME.pid
-DAEMON_ARGS="--daemon --pid-file $PIDFILE -p <%= port %><% if multicast then
-%> --multicast <%= (multicast.class == String) ? multicast : '233.58.59.1'
%><% end %>"
+DAEMON_ARGS="--daemon --pid-file $PIDFILE -p <%= @port %><% if multicast then
-%> --multicast <%= (multicast.class == String) ? multicast : '233.58.59.1'
%><% end %>"
SCRIPTNAME=/etc/init.d/$NAME
-CONFFILE=/etc/udp2log/<%= name %>
+CONFFILE=/etc/udp2log/<%= @name %>
<% if @recv_queue %>
-queue=<%= recv_queue %>
+queue=<%= @recv_queue %>
<% end -%>
if [ -f /proc/sys/net/core/rmem_max -a -z "${queue}" ] ; then
--
To view, visit https://gerrit.wikimedia.org/r/161926
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c21321dead3b40df9ed7ee5838c6bd67ad978f8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <mata...@foss.co.il>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
