From f3e39b3a6a8680916219fad9815d5997b05d1feb Mon Sep 17 00:00:00 2001
From: Michael Weiser <m.weiser@science-computing.de>
Date: Mon, 16 Feb 2015 18:29:28 +0100
Subject: Fix dependency handling

---
 manifests/dependencies.pp | 6 +-----
 manifests/master.pp       | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

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 8bc5cd9..f7bb32f 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,
 ) {
 
-- 
cgit v1.2.3


From 91d91c253b792b5a176159e083eb1a3f301a7e86 Mon Sep 17 00:00:00 2001
From: Timo Goebel <mail@timogoebel.name>
Date: Sun, 1 Mar 2015 19:13:57 +0100
Subject: add support for encryption and ssl_options

---
 manifests/config.pp         | 6 ++++++
 templates/troclarc.yaml.erb | 9 +++++++++
 2 files changed, 15 insertions(+)

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/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 -%>
-- 
cgit v1.2.3