Permalink
Browse files

Add LICENSE file. Update Modulefile to use ASL instead of APL to refe…

…r to the Apache License.
  • Loading branch information...
haus committed Jan 17, 2013
1 parent c91e49a commit 00594aff83442cc4e8e66c2abced2bc6694c9f56
Showing with 16 additions and 1 deletion.
  1. +15 −0 LICENSE
  2. +1 −1 Modulefile
View
15 LICENSE
@@ -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.
View
@@ -2,7 +2,7 @@ name 'puppetlabs-java_ks'
version '0.0.3'
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'

0 comments on commit 00594af

Please sign in to comment.