Skip to content

Commit

Permalink
Add param to pass to apt-key adv
Browse files Browse the repository at this point in the history
  • Loading branch information
pwf authored Feb 15, 2023
1 parent 443c9e3 commit 9881323
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 2 deletions.
27 changes: 27 additions & 0 deletions REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ The following parameters are available in the `redis` class:
* [`apt_release`](#-redis--apt_release)
* [`apt_key_id`](#-redis--apt_key_id)
* [`apt_key_server`](#-redis--apt_key_server)
* [`apt_key_options`](#-redis--apt_key_options)
* [`rdbcompression`](#-redis--rdbcompression)
* [`rename_commands`](#-redis--rename_commands)
* [`repl_announce_ip`](#-redis--repl_announce_ip)
Expand All @@ -170,6 +171,7 @@ The following parameters are available in the `redis` class:
* [`slave_read_only`](#-redis--slave_read_only)
* [`slave_serve_stale_data`](#-redis--slave_serve_stale_data)
* [`slaveof`](#-redis--slaveof)
* [`replicaof`](#-redis--replicaof)
* [`slowlog_log_slower_than`](#-redis--slowlog_log_slower_than)
* [`slowlog_max_len`](#-redis--slowlog_max_len)
* [`stop_writes_on_bgsave_error`](#-redis--stop_writes_on_bgsave_error)
Expand Down Expand Up @@ -705,6 +707,14 @@ Specify the PGP key server to use for apt.

Default value: `'hkp://keyserver.ubuntu.com/'`

##### <a name="-redis--apt_key_options"></a>`apt_key_options`

Data type: `Optional[String]`

Passes additional options to `apt-key adv --keyserver-options`.

Default value: `undef`

##### <a name="-redis--rdbcompression"></a>`rdbcompression`

Data type: `Boolean`
Expand Down Expand Up @@ -913,6 +923,14 @@ Use slaveof to make a Redis instance a copy of another Redis server.

Default value: `undef`

##### <a name="-redis--replicaof"></a>`replicaof`

Data type: `Optional[String[1]]`

Use replicaof to make a Redis instance a copy of another Redis server.

Default value: `undef`

##### <a name="-redis--slowlog_log_slower_than"></a>`slowlog_log_slower_than`

Data type: `Integer[-1]`
Expand Down Expand Up @@ -1917,6 +1935,7 @@ The following parameters are available in the `redis::instance` defined type:
* [`slave_read_only`](#-redis--instance--slave_read_only)
* [`slave_serve_stale_data`](#-redis--instance--slave_serve_stale_data)
* [`slaveof`](#-redis--instance--slaveof)
* [`replicaof`](#-redis--instance--replicaof)
* [`slowlog_log_slower_than`](#-redis--instance--slowlog_log_slower_than)
* [`slowlog_max_len`](#-redis--instance--slowlog_max_len)
* [`stop_writes_on_bgsave_error`](#-redis--instance--stop_writes_on_bgsave_error)
Expand Down Expand Up @@ -2524,6 +2543,14 @@ Use slaveof to make a Redis instance a copy of another Redis server.

Default value: `$redis::slaveof`

##### <a name="-redis--instance--replicaof"></a>`replicaof`

Data type: `Optional[String[1]]`

Use replicaof to make a Redis instance a copy of another Redis server.

Default value: `$redis::replicaof`

##### <a name="-redis--instance--slowlog_log_slower_than"></a>`slowlog_log_slower_than`

Data type: `Integer[-1]`
Expand Down
3 changes: 3 additions & 0 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,8 @@
# Specify the PGP key id to use for apt.
# @param apt_key_server
# Specify the PGP key server to use for apt.
# @param apt_key_options
# Passes additional options to `apt-key adv --keyserver-options`.
# @param rdbcompression
# Enable/disable compression of string objects using LZF when dumping.
# @param rename_commands
Expand Down Expand Up @@ -387,6 +389,7 @@
Optional[String] $apt_release = undef,
String[1] $apt_key_id = '54318FA4052D1E61A6B6F7BB5F4349D6BF53AA0C',
String[1] $apt_key_server = 'hkp://keyserver.ubuntu.com/',
Optional[String] $apt_key_options = undef,
Boolean $rdbcompression = true,
Hash[String,String] $rename_commands = {},
Optional[Stdlib::Host] $repl_announce_ip = undef,
Expand Down
5 changes: 3 additions & 2 deletions manifests/preinstall.pp
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@
release => $redis::apt_release,
repos => $redis::apt_repos,
key => {
id => $redis::apt_key_id,
server => $redis::apt_key_server,
id => $redis::apt_key_id,
server => $redis::apt_key_server,
key_options => $redis::apt_key_options,
},
}
}
Expand Down

0 comments on commit 9881323

Please sign in to comment.