diff options
| author | Jan Dittberner <jandd@cacert.org> | 2019-08-17 12:41:33 +0200 |
|---|---|---|
| committer | Jan Dittberner <jandd@cacert.org> | 2019-08-17 12:41:33 +0200 |
| commit | e7beaafdfca4cfec7baf928d0891f987f1898b03 (patch) | |
| tree | 0f344bce3fb01109c2e51dc33b615c3802fb741d | |
| parent | 03f247609f730645ea952b354ec39be806df7d35 (diff) | |
| download | cacert-puppet-e7beaafdfca4cfec7baf928d0891f987f1898b03.tar.gz cacert-puppet-e7beaafdfca4cfec7baf928d0891f987f1898b03.tar.xz cacert-puppet-e7beaafdfca4cfec7baf928d0891f987f1898b03.zip | |
Syntax and template fixes for selfservice API
| -rw-r--r-- | hieradata/nodes/email.yaml | 5 | ||||
| -rw-r--r-- | sitemodules/profiles/manifests/cacert_selfservice_api.pp | 2 | ||||
| -rw-r--r-- | sitemodules/profiles/templates/cacert_selfservice_api/config.yaml.epp | 7 |
3 files changed, 7 insertions, 7 deletions
diff --git a/hieradata/nodes/email.yaml b/hieradata/nodes/email.yaml index 0ef2e9f..026ba2d 100644 --- a/hieradata/nodes/email.yaml +++ b/hieradata/nodes/email.yaml @@ -16,8 +16,8 @@ profiles::icinga2_agent::pki_ticket: > aVBhmjBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDmO1bK1F+o/ClrvyHP qDUegDB5FE/kCJHikejLTd9x65fkNuaUMs9uTYaTUydsk/yPsD/fZWpRU3hM nUgJAjygFfc=] -profiles::cacert_selfservice_api::clients: -- client_id: cac3ad11-fa50-43f6-8ded-15f598b6ca2a +profiles::cacert_selfservice_api::client_identities: +- id: cac3ad11-fa50-43f6-8ded-15f598b6ca2a key: | -----BEGIN PUBLIC KEY----- MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEAKRX/fSOOunEETpHqPKj8k1/zv1R @@ -44,7 +44,6 @@ profiles::cacert_selfservice_api::db_username: > Nt9bzOpBkyFkqAYFzXbYyQ3JeR4Mfb9i2wP+tIw5Hd2GaeoWBEJAdaqzsOb0 5NJX+DA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCl0t3nd/FDwqktfYoZ ReaagBBkwO8Mi7X2JTPI4jX5lDrS] -profiles::cacert_selfservice_api::listen_address: :9443 profiles::cacert_selfservice_api::server_certificate: | -----BEGIN CERTIFICATE----- MIIGRjCCBC6gAwIBAgIDAtlUMA0GCSqGSIb3DQEBCwUAMFQxFDASBgNVBAoTC0NB diff --git a/sitemodules/profiles/manifests/cacert_selfservice_api.pp b/sitemodules/profiles/manifests/cacert_selfservice_api.pp index 8998131..f2e3e89 100644 --- a/sitemodules/profiles/manifests/cacert_selfservice_api.pp +++ b/sitemodules/profiles/manifests/cacert_selfservice_api.pp @@ -62,7 +62,7 @@ class profiles::cacert_selfservice_api ( String $notification_sender_address = 'returns@cacert.org', String $mail_host = 'localhost', Integer $mail_port = 25, - Array[Hash[String][String] $client_identities, + Array[Hash[String, String]] $client_identities, ) { include profiles::cacert_debrepo diff --git a/sitemodules/profiles/templates/cacert_selfservice_api/config.yaml.epp b/sitemodules/profiles/templates/cacert_selfservice_api/config.yaml.epp index b0552cf..e168952 100644 --- a/sitemodules/profiles/templates/cacert_selfservice_api/config.yaml.epp +++ b/sitemodules/profiles/templates/cacert_selfservice_api/config.yaml.epp @@ -9,7 +9,7 @@ String $notification_recipient_name, String $mail_host, Integer $mail_port, - Array[Hash[String][String]] $clients, + Array[Hash[String, Data]] $clients, String $log_directory | -%> --- @@ -25,8 +25,9 @@ mail_server: host: <%= $mail_host %> port: <%= $mail_port %> clients: -<%= $clients.each |$client| { -%> +<% $clients.each |$client| { -%> - id: <%= $client['client_id'] %> key: |- -<%= $client['key_lines'].each |$line| { %> <%= $line %><% } %> +<% $client['key_lines'].each |$line| { %> <%= $line %> +<% } -%> <% } -%> |