Browse Source

More thorough removal of FooBar from the GPL wording.

Attribute the Open Source Puppet project.
Aaron Hicks 7 years ago
parent
commit
9846cc5271
3 changed files with 26 additions and 15 deletions
  1. 9
    12
      README.markdown
  2. 3
    3
      manifests/init.pp.orig
  3. 14
    0
      tests/init.pp.orig

+ 9
- 12
README.markdown View File

@@ -14,19 +14,16 @@ This module is derived from the puppet-blank module by Aaron Hicks (aethylred@gm
14 14
 
15 15
 * https://github.com/Aethylred/puppet-blank
16 16
 
17
-# Gnu Public License
17
+This module has been developed for the use with Open Source Puppet (Apache 2.0 license) for automating server & service deployment.
18 18
 
19
-This file is the blank Puppet module.
19
+* http://puppetlabs.com/puppet/puppet-open-source/
20 20
 
21
-The blank Puppet module is free software: you can redistribute it and/or modify
22
-it under the terms of the GNU General Public License as published by
23
-the Free Software Foundation, either version 3 of the License, or
24
-(at your option) any later version.
21
+# Gnu General Public License
25 22
 
26
-Foobar is distributed in the hope that it will be useful,
27
-but WITHOUT ANY WARRANTY; without even the implied warranty of
28
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
29
-GNU General Public License for more details.
23
+This file is part of the blank Puppet module.
30 24
 
31
-You should have received a copy of the GNU General Public License
32
-along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
25
+The blank Puppet module 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.
26
+
27
+The blank Puppet module 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.
28
+
29
+You should have received a copy of the GNU General Public License along with the blank Puppet module.  If not, see <http://www.gnu.org/licenses/>.

+ 3
- 3
manifests/init.pp.orig View File

@@ -13,18 +13,18 @@
13 13
 
14 14
 # This file is part of the blank Puppet module.
15 15
 #
16
-#     blank Puppet module is free software: you can redistribute it and/or modify
16
+#     The blank Puppet module is free software: you can redistribute it and/or modify
17 17
 #     it under the terms of the GNU General Public License as published by
18 18
 #     the Free Software Foundation, either version 3 of the License, or
19 19
 #     (at your option) any later version.
20 20
 #
21
-#     Foobar is distributed in the hope that it will be useful,
21
+#     The blank Puppet module is distributed in the hope that it will be useful,
22 22
 #     but WITHOUT ANY WARRANTY; without even the implied warranty of
23 23
 #     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
24 24
 #     GNU General Public License for more details.
25 25
 #
26 26
 #     You should have received a copy of the GNU General Public License
27
-#     along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
27
+#     along with the blank Puppet module.  If not, see <http://www.gnu.org/licenses/>.
28 28
 
29 29
 # [Remember: No empty lines between comments and class definition]
30 30
 class blank {

+ 14
- 0
tests/init.pp.orig View File

@@ -1 +1,15 @@
1
+# This file is part of the blank Puppet module.
2
+#
3
+#     The blank Puppet module is free software: you can redistribute it and/or modify
4
+#     it under the terms of the GNU General Public License as published by
5
+#     the Free Software Foundation, either version 3 of the License, or
6
+#     (at your option) any later version.
7
+#
8
+#     The blank Puppet module is distributed in the hope that it will be useful,
9
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
10
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
+#     GNU General Public License for more details.
12
+#
13
+#     You should have received a copy of the GNU General Public License
14
+#     along with the blank Puppet module.  If not, see <http://www.gnu.org/licenses/>.
1 15
 include blank

Loading…
Cancel
Save