Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add missing parameter for ldap #24

Merged
merged 2 commits into from
Dec 9, 2022
Merged

add missing parameter for ldap #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b0842d
add missing parameter for ldap
tuxmea Dec 9, 2022
3789abb
make ldap and git settings optional
tuxmea Dec 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions REFERENCE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ Default value: ``true``

##### <a name="git_data"></a>`git_data`

Data type: `Hdm::Gitdata`
Data type: `Optional[Hdm::Gitdata]`

Configure several settings related to the option
to modify data via Webfrontend. WARNING!! untested!!
Expand All @@ -252,11 +252,11 @@ Required Array of hash data:
]
```

Default value: `[]`
Default value: ``undef``

##### <a name="ldap_settings"></a>`ldap_settings`

Data type: `Hdm::Ldap_settings`
Data type: `Optional[Hdm::Ldap_settings]`

Config for LDAP integration
Needs the following Hash:
Expand All @@ -267,10 +267,11 @@ Needs the following Hash:
'base_dn' => 'ou=hdm,dc=nodomain',
'bind_dn' => 'cn=admin,dc=nodomain',
'bind_dn_password' => 'openldap',
'ldaps' => false,
}
```

Default value: `{}`
Default value: ``undef``

##### <a name="hdm_hiera_config_file"></a>`hdm_hiera_config_file`

Expand Down Expand Up @@ -313,6 +314,7 @@ Struct[{
Optional[base_dn] => String[1],
Optional[bind_dn] => String[1],
Optional[bind_dn_password] => String[1],
'ldaps' => Boolean,
}]
```

Expand Down
8 changes: 6 additions & 2 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@
# 'base_dn' => 'ou=hdm,dc=nodomain',
# 'bind_dn' => 'cn=admin,dc=nodomain',
# 'bind_dn_password' => 'openldap',
# 'ldaps' => false,
# }
# ```
#
Expand All @@ -113,10 +114,12 @@
# @example
# include hdm
class hdm (
# installation parameter
Enum['docker', 'rvm'] $method = 'docker',
Boolean $manage_docker = true,
String[1] $version = 'main',
String[1] $ruby_version = '3.1.2',
# required application parameter
Stdlib::Port $port = 3000,
Stdlib::IP::Address::Nosubnet $bind_ip = '0.0.0.0',
String[1] $hostname = $facts['networking']['fqdn'],
Expand All @@ -128,10 +131,11 @@
Hdm::Puppetdb $puppetdb_settings = { 'server' => 'http://localhost:8080', },
Stdlib::Unixpath $puppet_code_dir = '/etc/puppetlabs/code',
String[1] $hdm_hiera_config_file = 'hiera.yaml',
# additional application parameter
Boolean $allow_encryption = false,
Boolean $read_only = true,
Hdm::Gitdata $git_data = [],
Hdm::Ldap_settings $ldap_settings = {},
Optional[Hdm::Gitdata] $git_data = undef,
Optional[Hdm::Ldap_settings] $ldap_settings = undef,
) {
case $method {
'docker': {
Expand Down
1 change: 1 addition & 0 deletions types/ldap_settings.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
Optional[base_dn] => String[1],
Optional[bind_dn] => String[1],
Optional[bind_dn_password] => String[1],
'ldaps' => Boolean,
}
]