diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/config.pp | 6 | ||||
| -rw-r--r-- | manifests/dependencies.pp | 11 | ||||
| -rw-r--r-- | manifests/master.pp | 21 |
3 files changed, 6 insertions, 32 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 deleted file mode 100644 index b033269..0000000 --- a/manifests/dependencies.pp +++ /dev/null @@ -1,11 +0,0 @@ -# manage trocla's dependencies -# -# [*provider*] How to install the dependencies. -class trocla::dependencies( - $provider = gem, -) { - package { [ 'moneta', 'highline', 'bcrypt' ]: - ensure => present, - provider => $provider, - } -} diff --git a/manifests/master.pp b/manifests/master.pp index f7bb32f..8ea324b 100644 --- a/manifests/master.pp +++ b/manifests/master.pp @@ -2,33 +2,12 @@ # # This module manages the necessary things for trocla on a master. # -# [*install_deps*]: Whether to directly install the necessary dependencies -# [*use_rubygems*]: Use the rubygems module to manage your dependencies -# [*provider*]: Which provider to use to install your dependencies, if you -# don't use the rubygems module class trocla::master ( - $install_deps = true, - $use_rubygems = false, $provider = gem, ) { - - #Select if the upstream rubygems modules should be required for install - if $use_rubygems { - require rubygems::moneta - require rubygems::highline - } - - #Manually install requirements via gem - if $install_deps { - class{'trocla::dependencies': - provider => $provider, - } - } - #Main trocla install package {'trocla': ensure => present, provider => $provider, } - } |