diff options
| author | Dan Fandrich <danf@mageia.org> | 2024-10-04 21:44:50 -0700 |
|---|---|---|
| committer | Dan Fandrich <danf@mageia.org> | 2024-10-04 21:48:08 -0700 |
| commit | f5b2645d869b76598c18527d388ed76719c06bdd (patch) | |
| tree | 659f3ee719b437817a02db4a31dbd37a65972412 /modules/postgresql/templates/pg_hba.conf | |
| parent | ae1976228660588902a904f7509a106b790531cb (diff) | |
| download | puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.gz puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.bz2 puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.xz puppet-f5b2645d869b76598c18527d388ed76719c06bdd.zip | |
Revert "Use @ when accessing variables in templates"
Variables defined within a template can't be accessed with @. This
change needs to be reworked to eliminate those cases.
This reverts commits 2c7da665 and ae197622.
Diffstat (limited to 'modules/postgresql/templates/pg_hba.conf')
| -rw-r--r-- | modules/postgresql/templates/pg_hba.conf | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/modules/postgresql/templates/pg_hba.conf b/modules/postgresql/templates/pg_hba.conf index a1da9c10..e4232a4e 100644 --- a/modules/postgresql/templates/pg_hba.conf +++ b/modules/postgresql/templates/pg_hba.conf @@ -79,7 +79,7 @@ <%- for line in @conf_lines -%> -<%= @line %> +<%= line %> <%- end -%> @@ -92,10 +92,10 @@ # fetch it for i in db %> -host <%= @i %> <%= @i %> 127.0.0.1/32 md5 -host <%= @i %> <%= @i %> ::1/128 md5 -hostssl <%= @i %> <%= @i %> <%= @ipaddress %>/32 md5 -hostssl <%= @i %> <%= @i %> 2a02:2178:2:7::2/128 md5 +host <%= i %> <%= i %> 127.0.0.1/32 md5 +host <%= i %> <%= i %> ::1/128 md5 +hostssl <%= i %> <%= i %> <%= ipaddress %>/32 md5 +hostssl <%= i %> <%= i %> 2a02:2178:2:7::2/128 md5 <% end %> @@ -104,12 +104,12 @@ end lang = ['en','de'] for l in lang %> -host phpbb_<%= @l %> phpbb 127.0.0.1/32 md5 -host phpbb_<%= @l %> phpbb ::1/128 md5 -hostssl phpbb_<%= @l %> phpbb <%= @ipaddress %>/32 md5 -hostssl phpbb_<%= @l %> phpbb 2a02:2178:2:7::2/128 md5 +host phpbb_<%= l %> phpbb 127.0.0.1/32 md5 +host phpbb_<%= l %> phpbb ::1/128 md5 +hostssl phpbb_<%= l %> phpbb <%= ipaddress %>/32 md5 +hostssl phpbb_<%= l %> phpbb 2a02:2178:2:7::2/128 md5 # temporary, for the forum on friteuse vm -hostssl phpbb_<%= @l %> phpbb 192.168.122.0/24 md5 +hostssl phpbb_<%= l %> phpbb 192.168.122.0/24 md5 <% end %> |