Showing with 32 additions and 9 deletions.
  1. +15 −0 LICENSE
  2. +2 −2 Modulefile
  3. +15 −7 lib/puppet/type/java_ks.rb
15 changes: 15 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Copyright (C) 2013 Puppet Labs Inc

Puppet Labs can be contacted at: info@puppetlabs.com

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
4 changes: 2 additions & 2 deletions Modulefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name 'puppetlabs-java_ks'
version '0.0.2'
version '0.0.4'
source 'https://github.com/puppetlabs/puppetlabs-java_ks.git'
author 'puppetlabs'
license 'APL 2.0'
license 'ASL 2.0'
summary 'Manage arbitrary Java keystore files'
description 'Uses a combination of keytool and openssl to manage entries in a Java keystore.'
project_page 'https://github.com/puppetlabs/puppetlabs-java_ks'
22 changes: 15 additions & 7 deletions lib/puppet/type/java_ks.rb
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,21 @@ def insync?(is)
# composite namevars.
def self.title_patterns
identity = lambda {|x| x}
[[
/^(.*):(.*)$/,
[
[ :name, identity ],
[ :target, identity ]
]
]]
[
[
/^([^:]+)$/,
[
[ :name, identity ]
]
],
[
/^(.*):(.*)$/,
[
[ :name, identity ],
[ :target, identity ]
]
]
]
end
end
end