Skip to content

Commit

Permalink
Merge pull request puppetlabs#14 from blkperl/add_license_file
Browse files Browse the repository at this point in the history
Add LICENSE file and update the ModuleFile
  • Loading branch information
bodepd committed Mar 2, 2012
2 parents c3b7dcc + fd90015 commit 8b7ce08
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 0 deletions.
15 changes: 15 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Copyright (C) 2012 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.
8 changes: 8 additions & 0 deletions Modulefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
name 'puppetlabs-apache'
version '0.0.3'
source 'git://github.com/puppetlabs/puppetlabs-apache.git'
author 'puppetlabs'
license 'Apache 2.0'
summary 'Puppet module for Apache'
description 'Module for Apache configuration'
project_page 'https://github.com/puppetlabs/puppetlabs-apache'

## Add dependencies, if any:
dependency 'puppetlabs-firewall', '>= 0.0.1'

0 comments on commit 8b7ce08

Please sign in to comment.