Skip to content

Commit 339dec3

Browse files
vexx32vexx32
authored
📝 Move to GPL v3.0 license (#6)
* 📝 Move to GPL v3.0 license Original licensing on the code in the collection is GPL3. It makes more sense for us to adopt that license than try to relicense the entire codebase. * 📝 Update license headers * 📝 Add license in collection directory itself
1 parent 2a33773 commit 339dec3

13 files changed

+698
-33
lines changed

‎LICENSE

+674-21
Large diffs are not rendered by default.

‎chocolatey/LICENSE

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../LICENSE

‎chocolatey/plugins/modules/win_chocolatey.ps1

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
# Copyright: (c) 2014, Trond Hindenes <[email protected]>
44
# Copyright: (c) 2017, Dag Wieers <[email protected]>
55
# Copyright: (c) 2018, Ansible Project
6-
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
6+
# Copyright: (c) 2020, Chocolatey Software
7+
# GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
78

89
#Requires -Module Ansible.ModuleUtils.ArgvParser
910
#Requires -Module Ansible.ModuleUtils.CommandUtil
@@ -326,7 +327,7 @@ Function Install-Chocolatey {
326327
$module.Warn("Chocolatey was older than v0.10.5 so it was upgraded during this task run.")
327328
Update-ChocolateyPackage -choco_path $choco_app.Path -packages @("chocolatey") `
328329

329-
-proxy_url $proxy_url -proxy_username $proxy_username `
330+
-proxy_url $proxy_url -proxy_username $proxy_username `
330331
-proxy_password $proxy_password -source $source `
331332
-source_username $source_username -source_password $source_password
332333
}

‎chocolatey/plugins/modules/win_chocolatey.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33

44
# Copyright: (c) 2014, Trond Hindenes <[email protected]>
55
# Copyright: (c) 2018, Ansible Project
6-
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
6+
# Copyright: (c) 2020, Chocolatey Software
7+
# GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
78

89
# this is a windows documentation stub. actual code lives in the .ps1
910
# file of the same name

‎chocolatey/plugins/modules/win_chocolatey_config.ps1

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#!powershell
22

33
# Copyright: (c) 2018, Ansible Project
4-
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
4+
# Copyright: (c) 2020, Chocolatey Software
5+
# GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
56

67
#Requires -Module Ansible.ModuleUtils.ArgvParser
78
#Requires -Module Ansible.ModuleUtils.CommandUtil

‎chocolatey/plugins/modules/win_chocolatey_config.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
# -*- coding: utf-8 -*-
33

44
# Copyright: (c) 2018, Ansible Project
5-
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
5+
# Copyright: (c) 2020, Chocolatey Software
6+
# GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
67

78
ANSIBLE_METADATA = {'metadata_version': '1.1',
89
'status': ['preview'],

‎chocolatey/plugins/modules/win_chocolatey_facts.ps1

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
# Copyright: (c) 2018, Ansible Project
44
# Copyright: (c) 2018, Simon Baerlocher <[email protected]>
55
# Copyright: (c) 2018, ITIGO AG <[email protected]>
6-
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
6+
# Copyright: (c) 2020, Chocolatey Software
7+
# GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
78

89
#Requires -Module Ansible.ModuleUtils.ArgvParser
910
#Requires -Module Ansible.ModuleUtils.CommandUtil

‎chocolatey/plugins/modules/win_chocolatey_facts.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
# Copyright: (c) 2018, Ansible Project
55
# Copyright: (c) 2018, Simon Baerlocher <[email protected]>
66
# Copyright: (c) 2018, ITIGO AG <[email protected]>
7-
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
7+
# Copyright: (c) 2020, Chocolatey Software
8+
# GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
89

910
ANSIBLE_METADATA = {'metadata_version': '1.1',
1011
'status': ['preview'],

‎chocolatey/plugins/modules/win_chocolatey_feature.ps1

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#!powershell
22

33
# Copyright: (c), 2018 Ansible Project
4-
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
4+
# Copyright: (c) 2020, Chocolatey Software
5+
# GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
56

67
#Requires -Module Ansible.ModuleUtils.CommandUtil
78
#Requires -Module Ansible.ModuleUtils.Legacy

‎chocolatey/plugins/modules/win_chocolatey_feature.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
# -*- coding: utf-8 -*-
33

44
# Copyright: (c) 2018, Ansible Project
5-
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
5+
# Copyright: (c) 2020, Chocolatey Software
6+
# GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
67

78
ANSIBLE_METADATA = {'metadata_version': '1.1',
89
'status': ['preview'],

‎chocolatey/plugins/modules/win_chocolatey_source.ps1

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#!powershell
22

33
# Copyright: (c) 2018, Ansible Project
4-
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
4+
# Copyright: (c) 2020, Chocolatey Software
5+
# GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
56

67
#Requires -Module Ansible.ModuleUtils.ArgvParser
78
#Requires -Module Ansible.ModuleUtils.CommandUtil

‎chocolatey/plugins/modules/win_chocolatey_source.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
# -*- coding: utf-8 -*-
33

44
# Copyright: (c) 2018, Ansible Project
5-
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
5+
# Copyright: (c) 2020, Chocolatey Software
6+
# GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
67

78
ANSIBLE_METADATA = {'metadata_version': '1.1',
89
'status': ['preview'],

‎chocolatey/tests/integration/targets/win_chocolatey_source/library/choco_source.ps1

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#!powershell
22

33
# Copyright: (c) 2019, Ansible Project
4-
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
4+
# Copyright: (c) 2020, Chocolatey Software
5+
# GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
56

67
#Requires -Module Ansible.ModuleUtils.Legacy
78

0 commit comments

Comments
 (0)