Permalink
Browse files

Merge branch 'maint/fix_copyright_and_licensing'

* maint/fix_copyright_and_licensing:
  (maint) Fix licensing references to GNU GPL.
  • Loading branch information...
kbarber committed Nov 13, 2011
2 parents 0fb94da + c5db2c2 commit a6d9810dbe10ddd192d3ad2aefd9383e8fdb419f
Showing with 3 additions and 39 deletions.
  1. +1 −1 LICENSE
  2. +1 −19 lib/puppet/util/firewall.rb
  3. +1 −19 lib/puppet/util/ipcidr.rb
View
@@ -1,6 +1,6 @@
Puppet Firewall Module - Puppet module for managing Firewalls
-Copyright (C) 2011 Puppet Labs Inc
+Copyright (C) 2011 Puppet Labs, Inc.
Copyright (C) 2011 Jonathan Boyett
Some of the iptables code was taken from puppet-iptables which was:
@@ -1,25 +1,7 @@
-# Puppet Firewall Module
-#
-# Copyright (C) 2011 Bob.sh Limited
-# Copyright (C) 2008 Camptocamp Association
-# Copyright (C) 2007 Dmitri Priimak
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
require 'socket'
require 'puppet/util/ipcidr'
+# Util module for puppetlabs-firewall
module Puppet::Util::Firewall
# Translate the symbolic names for icmp packet types to integers
def icmp_name_to_number(value_icmp)
View
@@ -1,24 +1,6 @@
-# Puppet Firewall Module
-#
-# Copyright (C) 2011 Bob.sh Limited
-# Copyright (C) 2008 Camptocamp Association
-# Copyright (C) 2007 Dmitri Priimak
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
require 'ipaddr'
+# IPCidr object wrapper for IPAddr
module Puppet
module Util
class IPCidr < IPAddr

0 comments on commit a6d9810

Please sign in to comment.