Merge branch 'release/0.1.3'

CHANGELOG

@@ -1,3 +1,6 @@
+2015-12-18 Release 0.1.3
+- bugfix: using multiple pem-files failed.  Tests added.
+
 2015-12-18 Release 0.1.2
 - relax too-strict validation of strings containing keys and certificates
 

manifests/domain.pp

@@ -67,7 +67,7 @@
   # Add a line to the hitch config file
   concat::fragment { "hitch::domain ${title}":
     target  => $config_file,
-    content => "pem-file = \"${pem_file}\"",
+    content => "pem-file = \"${pem_file}\"\n",
   }
 
   # Create the pem file, with (optional) ca certificate chain, a

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "ssm-hitch",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "author": "ssm",
   "summary": "Install and configure Hitch TLS proxy",
   "license": "Apache-2.0",

spec/acceptance/class_spec.rb

@@ -10,6 +10,10 @@ class { 'hitch': }
         key_source  => '/tmp/example.org_key.pem',
         cert_source => '/tmp/example.org_cert.pem',
       }
+      hitch::domain { 'example.com':
+        key_source  => '/tmp/example.com_key.pem',
+        cert_source => '/tmp/example.com_cert.pem',
+      }
       EOS
 
       # Run it twice and test for idempotency

spec/spec_helper_acceptance.rb

@@ -18,7 +18,9 @@
     hosts.each do |host|
       on host, puppet('module', 'install', 'puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
       on host, puppet('module', 'install', 'puppetlabs-concat'), { :acceptable_exit_codes => [0,1] }
-      on host, 'openssl req -newkey rsa:2048 -sha256 -keyout /tmp/example.org_key.pem  -nodes -x509 -days 365 -out /tmp/example.org_cert.pem -subj "/CN=example.org"'
+      ['example.com', 'example.org'].each do |domain|
+        on host, 'openssl req -newkey rsa:2048 -sha256 -keyout /tmp/%s_key.pem -nodes -x509 -days 365 -out /tmp/%s_cert.pem -subj "/CN=%s"' % [ domain, domain, domain ]
+      end
       on host, 'ls -l /tmp'
     end
   end