Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/180124
Change subject: cdh: fix templates causing warnings ...................................................................... cdh: fix templates causing warnings Change-Id: I1d8b47e0aac84a440d7a830ae2831342c663c84d Signed-off-by: Giuseppe Lavagetto <[email protected]> --- M templates/hadoop/log4j.properties.erb M templates/hue/hue.ini.erb 2 files changed, 14 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/cdh refs/changes/24/180124/1 diff --git a/templates/hadoop/log4j.properties.erb b/templates/hadoop/log4j.properties.erb index 51e2f14..bd658f5 100644 --- a/templates/hadoop/log4j.properties.erb +++ b/templates/hadoop/log4j.properties.erb @@ -40,8 +40,8 @@ # log4j.appender.gelf=biz.paluch.logging.gelf.log4j.GelfLogAppender log4j.appender.gelf.Threshold=INFO -log4j.appender.gelf.Host=<%= gelf_logging_host %> -log4j.appender.gelf.Port=<%= gelf_logging_port %> +log4j.appender.gelf.Host=<%= @gelf_logging_host %> +log4j.appender.gelf.Port=<%= @gelf_logging_port %> log4j.appender.gelf.Facility=Hadoop log4j.appender.gelf.ExtractStackTrace=true log4j.appender.gelf.FilterStackTrace=false diff --git a/templates/hue/hue.ini.erb b/templates/hue/hue.ini.erb index be68f40..231ae84 100644 --- a/templates/hue/hue.ini.erb +++ b/templates/hue/hue.ini.erb @@ -157,33 +157,33 @@ [[ldap]] # The search base for finding users and groups - <%= @ldap_base_dn ? "base_dn=\"#{ldap_base_dn}\"" : '## base_dn="DC=mycompany,DC=com"' %> + <%= @ldap_base_dn ? "base_dn=\"#{@ldap_base_dn}\"" : '## base_dn="DC=mycompany,DC=com"' %> # The NT domain to connect to (only for use with Active Directory) - <%= @ldap_nt_domain ? "nt_domain=#{ldap_nt_domain}" : '## nt_domain=mycompany.com' %> + <%= @ldap_nt_domain ? "nt_domain=#{@ldap_nt_domain}" : '## nt_domain=mycompany.com' %> # URL of the LDAP server - <%= @ldap_url ? "ldap_url=\"#{ldap_url}\"" : '## ldap_url=ldap://auth.mycompany.com' %> + <%= @ldap_url ? "ldap_url=\"#{@ldap_url}\"" : '## ldap_url=ldap://auth.mycompany.com' %> # A PEM-format file containing certificates for the CA's that # Hue will trust for authentication over TLS. # The certificate for the CA that signed the # LDAP server certificate must be included among these certificates. # See more here http://www.openldap.org/doc/admin24/tls.html. - <%= @ldap_cert ? "ldap_cert=#{ldap_cert}" : '## ldap_cert=' %> + <%= @ldap_cert ? "ldap_cert=#{@ldap_cert}" : '## ldap_cert=' %> ## use_start_tls=true # Distinguished name of the user to bind as -- not necessary if the LDAP server # supports anonymous searches - <%= @ldap_bind_dn ? "bind_dn=\"#{ldap_bind_dn}\"" : '## bind_dn="CN=ServiceAccount,DC=mycompany,DC=com"' %> + <%= @ldap_bind_dn ? "bind_dn=\"#{@ldap_bind_dn}\"" : '## bind_dn="CN=ServiceAccount,DC=mycompany,DC=com"' %> # Password of the bind user -- not necessary if the LDAP server supports # anonymous searches - <%= @ldap_bind_password ? "bind_password=#{ldap_bind_password}" : '## bind_password=' %> + <%= @ldap_bind_password ? "bind_password=#{@ldap_bind_password}" : '## bind_password=' %> # Pattern for searching for usernames -- Use <username> for the parameter # For use when using LdapBackend for Hue authentication - <%= @ldap_username_pattern ? "ldap_username_pattern=\"#{ldap_username_pattern}\"" : '## ldap_username_pattern="uid=<username>,ou=People,dc=mycompany,dc=com"' %> + <%= @ldap_username_pattern ? "ldap_username_pattern=\"#{@ldap_username_pattern}\"" : '## ldap_username_pattern="uid=<username>,ou=People,dc=mycompany,dc=com"' %> # Create users in Hue when they try to login with their LDAP credentials # For use when using LdapBackend for Hue authentication @@ -201,21 +201,21 @@ [[[users]]] # Base filter for searching for users - <%= @ldap_user_filter ? "user_filter=\"#{ldap_user_filter}\"" : '## user_filter="objectclass=*"' %> + <%= @ldap_user_filter ? "user_filter=\"#{@ldap_user_filter}\"" : '## user_filter="objectclass=*"' %> # The username attribute in the LDAP schema - <%= @ldap_user_name_attr ? "user_name_attr=\"#{ldap_user_name_attr}\"" : '## user_name_attr=sAMAccountName' %> + <%= @ldap_user_name_attr ? "user_name_attr=\"#{@ldap_user_name_attr}\"" : '## user_name_attr=sAMAccountName' %> [[[groups]]] # Base filter for searching for groups - <%= @ldap_group_filter ? "group_filter=\"#{ldap_group_filter}\"" : '## group_filter="objectclass=*"' %> + <%= @ldap_group_filter ? "group_filter=\"#{@ldap_group_filter}\"" : '## group_filter="objectclass=*"' %> # The group name attribute in the LDAP schema <%= @ldap_group_name_attr ? "group_name_attr=\"#{ldap_group_name_attr}\"" : '## group_name_attr=cn' %> # The attribute of the group object which identifies the members of the group - <%= @ldap_group_member_attr ? "group_member_attr=\"#{ldap_group_member_attr}\"" : '## group_member_attr=members' %> + <%= @ldap_group_member_attr ? "group_member_attr=\"#{@ldap_group_member_attr}\"" : '## group_member_attr=members' %> # Configuration options for specifying the Desktop Database. For more info, # see http://docs.djangoproject.com/en/1.1/ref/settings/#database-engine @@ -269,7 +269,7 @@ tls=<%= (@smtp_user and !@smtp_user.empty?) ? 'yes' : 'no' %> # Default email address to use for various automated notification from Hue - <%= @smtp_from_email ? "default_from_email=#{smtp_from_email}" : '## default_from_email=hue@localhost' %> + <%= @smtp_from_email ? "default_from_email=#{@smtp_from_email}" : '## default_from_email=hue@localhost' %> # Configuration options for Kerberos integration for secured Hadoop clusters -- To view, visit https://gerrit.wikimedia.org/r/180124 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1d8b47e0aac84a440d7a830ae2831342c663c84d Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet/cdh Gerrit-Branch: master Gerrit-Owner: Giuseppe Lavagetto <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
