Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: rsync: qualify vars
......................................................................
rsync: qualify vars
Change-Id: I9f1cfcb09d7edb654182e447d767d588358ed616
---
M modules/rsync/templates/header.erb
M modules/rsync/templates/module.erb
M modules/rsync/templates/rsync.default.erb
3 files changed, 20 insertions(+), 20 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/rsync/templates/header.erb
b/modules/rsync/templates/header.erb
index 358ae5b..1ce0ba8 100644
--- a/modules/rsync/templates/header.erb
+++ b/modules/rsync/templates/header.erb
@@ -3,10 +3,10 @@
uid = nobody
gid = nogroup
-use chroot = <%= use_chroot %>
-<% if log_file != 'UNSET' %>log file = <%= log_file %><% end %>
+use chroot = <%= @use_chroot %>
+<% if @log_file != 'UNSET' %>log file = <%= @log_file %><% end %>
log format = %t %a %m %f %b
syslog facility = local3
timeout = 300
-address = <%= address %>
-<% if motd_file != 'UNSET' %>motd file = <%= motd_file %><% end %>
+address = <%= @address %>
+<% if @motd_file != 'UNSET' %>motd file = <%= @motd_file %><% end %>
diff --git a/modules/rsync/templates/module.erb
b/modules/rsync/templates/module.erb
index 33aacbf..f37a474 100644
--- a/modules/rsync/templates/module.erb
+++ b/modules/rsync/templates/module.erb
@@ -1,19 +1,19 @@
# This file is being maintained by Puppet.
# DO NOT EDIT
-[ <%= name %> ]
-path = <%= path %>
-read only = <%= read_only %>
-write only = <%= write_only %>
-list = <%= list %>
-uid = <%= uid %>
-gid = <%= gid %>
-max connections = <%= max_connections %>
-<% if Integer(max_connections) > 0 %>lock file = <%= lock_file %><% end %>
-<% if comment != :undef %>comment = <%= comment %><% end %>
-<% if secrets_file != :undef %>secrets file = <%= secrets_file %><% end %>
-<% if auth_users != :undef %>auth users = <%= auth_users.to_a.join(', ')%><%
end %>
-<% if hosts_allow != :undef %>hosts allow = <%= hosts_allow.to_a.join(' ')%><%
end %>
-<% if hosts_deny != :undef %>hosts deny = <%= hosts_deny.to_a.join(' ')%><%
end %>
+[ <%= @name %> ]
+path = <%= @path %>
+read only = <%= @read_only %>
+write only = <%= @write_only %>
+list = <%= @list %>
+uid = <%= @uid %>
+gid = <%= @gid %>
+max connections = <%= @max_connections %>
+<% if Integer(@max_connections) > 0 %>lock file = <%= @lock_file %><% end
%>
+<% if @comment %>comment = <%= @comment %><% end %>
+<% if @secrets_file %>secrets file = <%= @secrets_file %><% end %>
+<% if @auth_users %>auth users = <%= @auth_users.to_a.join(', ')%><% end %>
+<% if @hosts_allow %>hosts allow = <%= @hosts_allow.to_a.join(' ')%><% end %>
+<% if @hosts_deny %>hosts deny = <%= @hosts_deny.to_a.join(' ')%><% end %>
diff --git a/modules/rsync/templates/rsync.default.erb
b/modules/rsync/templates/rsync.default.erb
index eb138b2..e120f48 100644
--- a/modules/rsync/templates/rsync.default.erb
+++ b/modules/rsync/templates/rsync.default.erb
@@ -10,7 +10,7 @@
# Use "inetd" if you want to start the rsyncd from inetd,
# all this does is prevent the init.d script from printing a message
# about not starting rsyncd (you still need to modify inetd's config
yourself).
-RSYNC_ENABLE=<%= use_xinetd == true ? 'false' : 'true' %>
+RSYNC_ENABLE=<%= @use_xinetd == true ? 'false' : 'true' %>
# which file should be used as the configuration file for rsync.
# This file is used instead of the default /etc/rsyncd.conf
@@ -18,7 +18,7 @@
# using a remote shell. When using a different file for
# rsync you might want to symlink /etc/rsyncd.conf to
# that file.
-RSYNC_CONFIG_FILE=<%= rsync_conf %>
+RSYNC_CONFIG_FILE=<%= @rsync_conf %>
# what extra options to give rsync --daemon?
# that excludes the --daemon; that's always done in the init.d script
--
To view, visit https://gerrit.wikimedia.org/r/159462
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9f1cfcb09d7edb654182e447d767d588358ed616
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <mata...@foss.co.il>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Matanya <mata...@foss.co.il>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
