Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
fbrehm committed Jan 27, 2022
2 parents 2e1861e + 8e80e27 commit 865ff3b
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 12 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [2.5.0.1] - 2022-01-27

### Changed
* Updating dependencies and source information in metadata.json

### Fixed
* Fixing parameters of creating ssl objects
* Fixing manifests/replication.pp because of wrong command parameter on
creating a replica as a supplier

## [2.5.0] - 2021-01-20

### Added
Expand Down
4 changes: 2 additions & 2 deletions manifests/instance.pp
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@
# Generate the private key for the CA.
-> ssl_pkey { "Generate CA private key: ${server_id}":
ensure => 'present',
name => $ca_key,
path => $ca_key,
size => 4096,
}

Expand All @@ -316,7 +316,7 @@
# Create the CA certificate.
-> x509_cert { "Create CA cert: ${server_id}":
ensure => 'present',
name => $ca_cert,
path => $ca_cert,
template => $ca_conf,
private_key => $ca_key,
days => 3650,
Expand Down
2 changes: 1 addition & 1 deletion manifests/replication.pp
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@
if ($replica != $name) and ($replica != $facts['networking']['fqdn']) {
# Command to enable replication for the specified suffix.
$repl_enable_done = sprintf($_repl_enable_done, 'supplier', $replica)
$repl_enable_command = sprintf($_repl_enable_command, 'master', $_id, $repl_enable_done)
$repl_enable_command = sprintf($_repl_enable_command, 'supplier', $_id, $repl_enable_done)

# Command to create a replication agreement between these hosts.
$repl_agreement_done = sprintf($_repl_agreement_done, 'supplier', $replica)
Expand Down
18 changes: 9 additions & 9 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
{
"name": "fraenki-ds_389",
"version": "2.5.0",
"author": "markt.de",
"version": "2.5.0.1",
"author": "pixelpark",
"summary": "Module for installing and managing 389 Directory Server",
"license": "Apache-2.0",
"source": "https://github.com/markt-de/puppet-ds_389.git",
"project_page": "https://github.com/markt-de/puppet-ds_389",
"issues_url": "https://github.com/markt-de/puppet-ds_389/issues",
"source": "https://github.com/pixelpark/puppet-ds_389.git",
"project_page": "https://github.com/pixelpark/puppet-ds_389",
"issues_url": "https://github.com/pixelpark/puppet-ds_389/issues",
"dependencies": [
{
"name": "puppetlabs-concat",
"version_requirement": ">=4.0.0 <7.0.0"
"version_requirement": ">=7.1.0 <6.0.0"
},
{
"name": "puppetlabs-inifile",
"version_requirement": ">=3.0.0 <5.0.0"
"version_requirement": ">=5.2.0 <6.0.0"
},
{
"name": "camptocamp-openssl",
"version_requirement": ">=1.14.0 <2.0.0"
"version_requirement": ">=2.0.0 <3.0.0"
},
{
"name": "puppetlabs-stdlib",
"version_requirement": ">=4.25.0 <7.0.0"
"version_requirement": ">=8.1.0 <9.0.0"
}
],
"operatingsystem_support": [
Expand Down

0 comments on commit 865ff3b

Please sign in to comment.