convert ERB templates to EPP #1399
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,16 @@ | ||
| <%- | | ||
| Boolean $compress, | ||
| Array $databases, | ||
| Optional[String[1]] $db_user, | ||
| Boolean $delete_before_dump, | ||
| String[1] $dir, | ||
| Enum['plain','custom','directory','tar'] $format, | ||
| Array $optional_args, | ||
|
There was a problem hiding this comment. Is this There was a problem hiding this comment. I took over the current types in #1397 or these which are currently in the module. If there are adjustments over all, I would do these later. |
||
| Optional[String[1]] $post_script, | ||
| Optional[String[1]] $pre_script, | ||
|
Comment on lines
+9
to
+10
There was a problem hiding this comment. It calls There was a problem hiding this comment. see comment above |
||
| Integer[0] $rotate, | ||
| Stdlib::Absolutepath $success_file_path, | ||
| | -%> | ||
| <%- if $facts['kernel'] == 'Linux' { -%> | ||
| #!/bin/bash | ||
| <%- } else { -%> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <%- | | ||
| String[1] $name, | ||
| String[1] $description, | ||
| Variant[String, Integer] $order, | ||
| Postgresql::Pg_hba_rule_type $type, | ||
| String[1] $database, | ||
| String[1] $user, | ||
| Optional[Postgresql::Pg_hba_rule_address] $address, | ||
| String[1] $auth_method, | ||
| Optional[String] $auth_option, | ||
| | -%> | ||
| # Rule Name: <%= $name %> | ||
| # Description: <%= $description %> | ||
| # Order: <%= $order %> | ||
| <%= $type %> <%= $database %> <%= $user %> <%= $address %> <%= $auth_method %> <%= $auth_option %> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <%- | | ||
| String[1] $name, | ||
| String[1] $description, | ||
| String[1] $order, | ||
| String[1] $map_name, | ||
| String[1] $system_username, | ||
| String[1] $database_username, | ||
| | -%> | ||
| # Rule Name: <%= $name %> | ||
| # Description: <%= $description %> | ||
| # Order: <%= $order %> | ||
| <%= $map_name %> <%= $system_username %> <%= $database_username %> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| <%- | | ||
| Optional[String] $restore_command, | ||
| Optional[String[1]] $archive_cleanup_command, | ||
| Optional[String[1]] $recovery_end_command, | ||
| Optional[String[1]] $recovery_target_name, | ||
| Optional[String[1]] $recovery_target_time, | ||
| Optional[String[1]] $recovery_target_xid, | ||
| Optional[Boolean] $recovery_target_inclusive, | ||
| Optional[String[1]] $recovery_target, | ||
| Optional[String[1]] $recovery_target_timeline, | ||
| Optional[Boolean] $pause_at_recovery_target, | ||
|
There was a problem hiding this comment. I always find |
||
| Optional[String[1]] $standby_mode, | ||
| Optional[String[1]] $primary_conninfo, | ||
| Optional[String[1]] $primary_slot_name, | ||
| Optional[String[1]] $trigger_file, | ||
| Optional[Integer] $recovery_min_apply_delay, | ||
| | -%> | ||
| <% 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 %> | ||
| <% } -%> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <%- | | ||
| Variant[String[1], Stdlib::Port] $port, | ||
| Stdlib::Absolutepath $datadir, | ||
| Optional[String[1]] $extra_systemd_config, | ||
| | -%> | ||
| [Service] | ||
| Environment=PGPORT=<%= $port %> | ||
| <%- if $facts['os']['family'] == 'Gentoo' { -%> | ||
| Environment=DATA_DIR=<%= $datadir %> | ||
| <%- } else { -%> | ||
| Environment=PGDATA=<%= $datadir %> | ||
| <%- } -%> | ||
| <% if $extra_systemd_config { -%> | ||
| <%= $extra_systemd_config %> | ||
| <% } -%> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You could use
Array[String[1]] $databases = []and simplify the code. Right now it still deals withundefand it not being anArray.