Skip to content

Commit

Permalink
Change license to BSD
Browse files Browse the repository at this point in the history
  • Loading branch information
jonathanio committed Jun 26, 2016
1 parent 452cc64 commit e84f142
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 27 deletions.
32 changes: 22 additions & 10 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,12 +1,24 @@
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.
Copyright (c) 2016, Jonathan Wright <[email protected]>
All rights reserved.

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.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
3. Neither the name of Jonathan Wright nor the names of its contributors may be
used to endorse or promote products derived from this software without
specific prior written permission.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ Including an example of how to use your role (for instance, with variables passe

## License

GPLv3
This project is under the *BSD* License. See the `LICENSE` file for the full license text.

## Author Information

Expand Down
35 changes: 19 additions & 16 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,25 @@ galaxy_info:
author: Jonathan Wright <[email protected]>
description: Custom user-management role for linux-based systems, with test-kitchen/serverspec tests.
issue_tracker_url: https://github.com/jonathanio/ansible-role-users/issues
license: GPLv3
github_branch: master
license: BSD
min_ansible_version: 2.0
platforms:
- name: EL
versions:
- all
- name: Amazon
versions:
- all
- name: Ubuntu
versions:
- all
- name: Debian
versions:
- all
categories:
- system
- users
- name: EL
versions:
- all
- name: Debian
versions:
- all
- name: Ubuntu
versions:
- all
- name: ArchLinux
versions:
- all
galaxy_tags:
- system
- users
- test-kitchen

dependencies: []

0 comments on commit e84f142

Please sign in to comment.