Merge pull request #1314 from aleksmark/fix-syntax

Fixed varibale name and code style
voxpupuli · Feb 13, 2019 · a3e6f57 · a3e6f57
2 parents 52ecfd7 + 5907c4c
commit a3e6f57
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/manifests/resource/upstream/member.pp b/manifests/resource/upstream/member.pp
@@ -85,7 +85,7 @@
     target  => "${conf_dir}/${upstream}-upstream.conf",
     order   => 40,
     content => epp('nginx/upstream/upstream_member.epp', {
-      _server        => $_server,
+      server         => $_server,
       backup         => $backup,
       comment        => $comment,
       fail_timeout   => $fail_timeout,

diff --git a/templates/upstream/upstream_member.epp b/templates/upstream/upstream_member.epp
@@ -1,4 +1,4 @@
-<%- | $_server,
+<%- | $server,
       Boolean                         $backup           = false,
       Optional[String[1]]             $comment          = undef,
       Optional[Nginx::Time]           $fail_timeout     = undef,
@@ -13,7 +13,7 @@
       Optional[Enum['drain','down']]  $state            = undef,
       Optional[Integer[1]]            $weight           = undef,
 | -%>
-  server <%= $_server -%>
+  server <%= $server -%>
 <%- if $params_prepend { %> <%= $params_prepend %><% } -%>
 <%- if $state { %> <%= $state %><% } -%>
 <%- if $weight { %> weight=<%= $weight %><% } -%>

diff --git a/types/upstreammember.pp b/types/upstreammember.pp
@@ -1,5 +1,5 @@
 type Nginx::UpstreamMember = Struct[{
-  server         => Optional[Nginx::UpstreamMemberServer], 
+  server         => Optional[Nginx::UpstreamMemberServer],
   port           => Optional[Stdlib::Port],
   weight         => Optional[Integer[1]],
   max_conns      => Optional[Integer[1]],