diff options
| author | mh <mh@immerda.ch> | 2015-03-21 15:48:17 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2015-03-21 15:48:17 +0100 |
| commit | 4fa6296ee22da4397ff0d81948e35c47e8eef9e1 (patch) | |
| tree | 99a7afa93cf533cfb89c83eb9de541f171487567 | |
| parent | cc243b354e51a55b704469b92fb1f5a26555d663 (diff) | |
| parent | 47befc3a972b0745a87381cad4b280529a0514f2 (diff) | |
Merge remote-tracking branch 'github/master'
| -rw-r--r-- | manifests/config.pp | 6 | ||||
| -rw-r--r-- | manifests/dependencies.pp | 6 | ||||
| -rw-r--r-- | manifests/master.pp | 4 | ||||
| -rw-r--r-- | templates/troclarc.yaml.erb | 9 |
4 files changed, 18 insertions, 7 deletions
diff --git a/manifests/config.pp b/manifests/config.pp index a3a6e01..7b23a3e 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -5,6 +5,10 @@ # By default it's YAML # [*adapter_options*] This will contain a hash of the adapter options to pass the # trocla configuration. +# [*encryption*] Defines the encryption method for password stored in the backend. +# By default no encryption is used. +# [*ssl_options*] This will contain a hash of the ssl options to pass the +# trocla configuration. # [*password_length*] Define the length of default passwords to create. 16 by default # [*random_passwords*] Should trocla generate random passwords # if none can be found. *true* by default. @@ -14,6 +18,8 @@ class trocla::config ( $password_length = 16, $random_passwords = true, $adapter_options = {}, + $encryption = undef, + $ssl_options = {}, $manage_dependencies = true, ) { if $manage_dependencies { diff --git a/manifests/dependencies.pp b/manifests/dependencies.pp index 9a4be15..b033269 100644 --- a/manifests/dependencies.pp +++ b/manifests/dependencies.pp @@ -4,11 +4,7 @@ class trocla::dependencies( $provider = gem, ) { - package { 'moneta': - ensure => present, - provider => $provider, - } - package { 'highline': + package { [ 'moneta', 'highline', 'bcrypt' ]: ensure => present, provider => $provider, } diff --git a/manifests/master.pp b/manifests/master.pp index f78a11b..90c92b1 100644 --- a/manifests/master.pp +++ b/manifests/master.pp @@ -7,8 +7,8 @@ # [*provider*]: Which provider to use to install your dependencies, if you # don't use the rubygems module class trocla::master ( - $install_deps = false, - $use_rubygems = true, + $install_deps = true, + $use_rubygems = false, $provider = gem, ) { diff --git a/templates/troclarc.yaml.erb b/templates/troclarc.yaml.erb index d574cd9..7d4fa27 100644 --- a/templates/troclarc.yaml.erb +++ b/templates/troclarc.yaml.erb @@ -9,3 +9,12 @@ adapter_options: :<%= key %>: '<%= value %>' <% end -%> <% end -%> +<% if @encryption %> +encryption: :<%= @encryption %> +<% end -%> +<% unless @ssl_options.empty? %> +ssl_options: +<% @ssl_options.each do |key,value| -%> + :<%= key %>: '<%= value %>' +<% end -%> +<% end -%> |