convert ERB templates to EPP

Author: SimonHoenscheid

manifests/server/instance/systemd.pp

@@ -19,7 +19,12 @@
     unit    => "${service_name}.service",
     owner   => 'root',
     group   => 'root',
-    content => template('postgresql/systemd-override.erb'),
+    content => epp('postgresql/systemd-override.conf.epp', {
+        port                 => $port,
+        datadir              => $datadir,
+        extra_systemd_config => $extra_systemd_config,
+      }
+    ),
     notify  => Class['postgresql::server::service'],
     before  => Class['postgresql::server::reload'],
   }

manifests/server/pg_hba_rule.pp

@@ -69,7 +69,18 @@
     $fragname = "pg_hba_rule_${name}"
     concat::fragment { $fragname:
       target  => $target,
-      content => template('postgresql/pg_hba_rule.conf'),
+      content => epp('postgresql/pg_hba_rule.conf.epp', {
+          name        => $name,
+          description => $description,
+          order       => $order,
+          type        => $type,
+          database    => $database,
+          user        => $user,
+          address     => $address,
+          auth_method => $auth_method,
+          auth_option => $auth_option,
+        }
+      ),
       order   => $_order,
     }
   }

manifests/server/pg_ident_rule.pp

@@ -24,7 +24,15 @@
     $fragname = "pg_ident_rule_${name}"
     concat::fragment { $fragname:
       target  => $target,
-      content => template('postgresql/pg_ident_rule.conf'),
+      content => epp('postgresql/pg_ident_rule.conf.epp', {
+          name              => $name,
+          description       => $description,
+          order             => $order,
+          map_name          => $map_name,
+          system_username   => $system_username,
+          database_username => $database_username,
+        }
+      ),
       order   => $order,
     }
   }

manifests/server/recovery.pp

@@ -63,7 +63,24 @@
     # Create the recovery.conf content
     concat::fragment { "${name}-recovery.conf":
       target  => $target,
-      content => template('postgresql/recovery.conf.erb'),
+      content => epp('postgresql/recovery.conf.epp', {
+          restore_command           => $restore_command,
+          archive_cleanup_command   => $archive_cleanup_command,
+          recovery_end_command      => $recovery_end_command,
+          recovery_target_name      => $recovery_target_name,
+          recovery_target_time      => $recovery_target_time,
+          recovery_target_xid       => $recovery_target_xid,
+          recovery_target_inclusive => $recovery_target_inclusive,
+          recovery_target           => $recovery_target,
+          recovery_target_timeline  => $recovery_target_timeline,
+          pause_at_recovery_target  => $pause_at_recovery_target,
+          standby_mode              => $standby_mode,
+          primary_conninfo          => $primary_conninfo,
+          primary_slot_name         => $primary_slot_name,
+          trigger_file              => $trigger_file,
+          recovery_min_apply_delay  => $recovery_min_apply_delay,
+        }
+      ),
     }
   }
 }

templates/pg_hba_rule.conf

@@ -0,0 +1,5 @@
+
+# Rule Name: <%= $name %>
+# Description: <%= $description %>
+# Order: <%= $order %>
+<%= $type %>	<%= $database %>	<%= $user %>	<%= $address %>	<%= $auth_method %>	<%= $auth_option %>

templates/pg_hba_rule.conf.epp

@@ -0,0 +1,5 @@
+
+# Rule Name: <%= $name %>
+# Description: <%= $description %>
+# Order: <%= $order %>
+<%= $map_name %>	<%= $system_username %>	<%= $database_username %>

templates/pg_ident_rule.conf

@@ -0,0 +1,47 @@
+<% if $restore_command { -%>
+restore_command = '<%= $restore_command %>'
+<% } -%>
+<% if $archive_cleanup_command { -%>
+archive_cleanup_command = '<%= $archive_cleanup_command %>'
+<% } -%>
+<% if $recovery_end_command { -%>
+recovery_end_command = '<%= $recovery_end_command %>'
+<% } -%>
+
+<% if $recovery_target_name { -%>
+recovery_target_name = '<%= $recovery_target_name %>'
+<% } -%>
+<% if $recovery_target_time { -%>
+recovery_target_time = '<%= $recovery_target_time %>'
+<% } -%>
+<% if $recovery_target_xid { -%>
+recovery_target_xid = '<%= $recovery_target_xid %>'
+<% } -%>
+<% if $recovery_target_inclusive { -%>
+recovery_target_inclusive = <%= $recovery_target_inclusive %>
+<% } -%>
+<% if $recovery_target { -%>
+recovery_target = '<%= $recovery_target %>'
+<% } -%>
+<% if $recovery_target_timeline { -%>
+recovery_target_timeline = '<%= $recovery_target_timeline %>'
+<% } -%>
+<% if $pause_at_recovery_target { -%>
+pause_at_recovery_target = <%= $pause_at_recovery_target %>
+<% } -%>
+
+<% if $standby_mode { -%>
+standby_mode = <%= $standby_mode %>
+<% } -%>
+<% if $primary_conninfo { -%>
+primary_conninfo = '<%= $primary_conninfo  %>'
+<% } -%>
+<% if $primary_slot_name { -%>
+primary_slot_name = '<%= $primary_slot_name %>'
+<% } -%>
+<% if $trigger_file { -%>
+trigger_file = '<%= $trigger_file %>'
+<% } -%>
+<% if $recovery_min_apply_delay { -%>
+recovery_min_apply_delay = <%= $recovery_min_apply_delay %>
+<% } -%>

templates/pg_ident_rule.conf.epp

@@ -0,0 +1,10 @@
+[Service]
+Environment=PGPORT=<%= $port %>
+<%- if $facts['os']['family'] == 'Gentoo' { -%>
+Environment=DATA_DIR=<%= $datadir %>
+<%- } else { -%>
+Environment=PGDATA=<%= $datadir %>
+<%- } -%>
+<% if $extra_systemd_config { -%>
+<%= $extra_systemd_config %>
+<% } -%>