| Revisión | dd8eda8faa486065d591bd4beccaff21f4607ebd (tree) |
|---|---|
| Tiempo | 2016-01-07 19:40:46 |
| Autor | whitestar <whitestar@gaea...> |
| Commiter | whitestar |
add {ca_cert,server_key,server_cert}_file_prefix attributes.
cookbooks/ssl_cert/CHANGELOG.md (diff) cookbooks/ssl_cert/README.md (diff) cookbooks/ssl_cert/attributes/default.rb (diff) cookbooks/ssl_cert/metadata.rb (diff)| @@ -1,6 +1,10 @@ | ||
| 1 | 1 | ssl_cert CHANGELOG |
| 2 | 2 | ================== |
| 3 | 3 | |
| 4 | +0.1.3 | |
| 5 | +----- | |
| 6 | +- add {ca_cert,server_key,server_cert}_file_prefix attributes. | |
| 7 | + | |
| 4 | 8 | 0.1.2 |
| 5 | 9 | ----- |
| 6 | 10 | - add some attributes. |
| @@ -26,13 +26,16 @@ Attributes | ||
| 26 | 26 | |`['ssl_cert']['vault_item_suffix']`|String|vault item name's suffix.|`".#{node['ssl_cert']['env_context']}"`| |
| 27 | 27 | |`['ssl_cert']['ca_cert_vault']`|String|CA certificate stored vault name.|`'ca_certs'`| |
| 28 | 28 | |`['ssl_cert']['ca_cert_vault_item_key']`|String|CA certificate stored vault item key name.|`'public'`| |
| 29 | +|`['ssl_cert']['ca_cert_file_prefix']`|String|CA certificate file name's prefix.|`''`| | |
| 29 | 30 | |`['ssl_cert']['server_key_vault']`|String|SSL server key stored vault name.|`'ssl_server_keys'`| |
| 30 | 31 | |`['ssl_cert']['server_key_vault_item_key']`|String|SSL server key stored vault item key name.|`'private'`| |
| 32 | +|`['ssl_cert']['server_key_file_prefix']`|String|SSL server key file name's prefix.|`''`| | |
| 31 | 33 | |`['ssl_cert']['server_cert_vault']`|String|SSL server certificate stored vault name.|`'ssl_server_certs'`| |
| 32 | 34 | |`['ssl_cert']['server_cert_vault_item_key']`|String|SSL server certificate stored vault item key name.|`'public'`| |
| 33 | -|`['ssl_cert']["#{ca}_cert_path"]`|String|deployed CA certificate file path.|`"#{node['ssl_cert']['certs_dir']}/00#{ca}.crt"`| | |
| 34 | -|`['ssl_cert']["#{undotted_cn}_key_path"]`|String|deployed SSL server key file path.|`"#{node['ssl_cert']['private_dir']}/01#{undotted_cn}.key"`| | |
| 35 | -|`['ssl_cert']["#{undotted_cn}_cert_path"]`|String|deployed SSL server certificate file path.|`"#{node['ssl_cert']['certs_dir']}/01#{undotted_cn}.crt"`| | |
| 35 | +|`['ssl_cert']['server_cert_file_prefix']`|String|SSL server certificate file name's prefix.|`''`| | |
| 36 | +|`['ssl_cert']["#{ca}_cert_path"]`|String|deployed CA certificate file path.|`"#{node['ssl_cert']['certs_dir']}/#{node['ssl_cert']['ca_cert_file_prefix']}#{ca}.crt"`| | |
| 37 | +|`['ssl_cert']["#{undotted_cn}_key_path"]`|String|deployed SSL server key file path.|`"#{node['ssl_cert']['private_dir']}/#{node['ssl_cert']['server_key_file_prefix']}#{undotted_cn}.key"`| | |
| 38 | +|`['ssl_cert']["#{undotted_cn}_cert_path"]`|String|deployed SSL server certificate file path.|`"#{node['ssl_cert']['certs_dir']}/#{node['ssl_cert']['server_cert_file_prefix']}#{undotted_cn}.crt"`| | |
| 36 | 39 | |
| 37 | 40 | Usage |
| 38 | 41 | ----- |
| @@ -40,6 +40,7 @@ default['ssl_cert']['vault_item_suffix'] = \ | ||
| 40 | 40 | |
| 41 | 41 | default['ssl_cert']['ca_cert_vault'] = 'ca_certs' |
| 42 | 42 | default['ssl_cert']['ca_cert_vault_item_key'] = 'public' |
| 43 | +default['ssl_cert']['ca_cert_file_prefix'] = '' | |
| 43 | 44 | =begin |
| 44 | 45 | CA certificate vault item name is |
| 45 | 46 | each CA name + ".#{node['ssl_cert']['vault_item_suffix']}". |
| @@ -55,6 +56,7 @@ default['ssl_cert']['ca_cert_vault_item_key'] = 'public' | ||
| 55 | 56 | |
| 56 | 57 | default['ssl_cert']['server_key_vault'] = 'ssl_server_keys' |
| 57 | 58 | default['ssl_cert']['server_key_vault_item_key'] = 'private' |
| 59 | +default['ssl_cert']['server_key_file_prefix'] = '' | |
| 58 | 60 | =begin |
| 59 | 61 | server key vault item name is |
| 60 | 62 | each common name + "#{node['ssl_cert']['vault_item_suffix']}". |
| @@ -70,6 +72,7 @@ default['ssl_cert']['server_key_vault_item_key'] = 'private' | ||
| 70 | 72 | |
| 71 | 73 | default['ssl_cert']['server_cert_vault'] = 'ssl_server_certs' |
| 72 | 74 | default['ssl_cert']['server_cert_vault_item_key'] = 'public' |
| 75 | +default['ssl_cert']['server_cert_file_prefix'] = '' | |
| 73 | 76 | =begin |
| 74 | 77 | server certificate vault item name is |
| 75 | 78 | each common name + ".#{node['ssl_cert']['vault_item_suffix']}". |
| @@ -98,11 +101,14 @@ default['ssl_cert']['private_dir'] = node.value_for_platform_family( | ||
| 98 | 101 | ) |
| 99 | 102 | |
| 100 | 103 | node['ssl_cert']['ca_names'].each {|ca| |
| 101 | - default['ssl_cert']["#{ca}_cert_path"] = "#{node['ssl_cert']['certs_dir']}/00#{ca}.crt" | |
| 104 | + default['ssl_cert']["#{ca}_cert_path"] \ | |
| 105 | + = "#{node['ssl_cert']['certs_dir']}/#{node['ssl_cert']['ca_cert_file_prefix']}#{ca}.crt" | |
| 102 | 106 | } |
| 103 | 107 | |
| 104 | 108 | undotted_cns.each {|cn| |
| 105 | - default['ssl_cert']["#{cn}_key_path"] = "#{node['ssl_cert']['private_dir']}/01#{cn}.key" | |
| 106 | - default['ssl_cert']["#{cn}_cert_path"] = "#{node['ssl_cert']['certs_dir']}/01#{cn}.crt" | |
| 109 | + default['ssl_cert']["#{cn}_key_path"] \ | |
| 110 | + = "#{node['ssl_cert']['private_dir']}/#{node['ssl_cert']['server_key_file_prefix']}#{cn}.key" | |
| 111 | + default['ssl_cert']["#{cn}_cert_path"] \ | |
| 112 | + = "#{node['ssl_cert']['certs_dir']}/#{node['ssl_cert']['server_cert_file_prefix']}#{cn}.crt" | |
| 107 | 113 | } |
| 108 | 114 |
| @@ -4,4 +4,5 @@ maintainer_email '' | ||
| 4 | 4 | license 'Apache 2.0' |
| 5 | 5 | description 'Installs/Configures ssl_cert' |
| 6 | 6 | long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) |
| 7 | -version '0.1.2' | |
| 7 | +version '0.1.3' | |
| 8 | + |
Fork