Skip to content

Commit

Permalink
Update tasks, docs, meta
Browse files Browse the repository at this point in the history
- Add TLS directory task to TLS tasks (thanks @cwill747)
- Update CONTRIBUTORS
- Update CONTRIBUTING
- Update documentation
  • Loading branch information
brianshumate committed Apr 27, 2017
1 parent 612759f commit b7fa795
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 37 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -239,3 +239,10 @@
## v1.5.6

- Update remote tasks

## v1.5.7

- Add TLS directory task to TLS tasks (thanks @cwill747)
- Update CONTRIBUTORS
- Update CONTRIBUTING
- Update documentation
66 changes: 35 additions & 31 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,48 +1,51 @@
# Contributing

When contributing to this repository, please first discuss the change you wish to make via issue,
email, or any other method with the owners of this repository before making a change.
When contributing to this repository, please first discuss the change you wish
to make via issue, email, or any other method with the owners of this repository before making a change.

Please note we have a code of conduct, please follow it in all your interactions with the project.
Do note that this project has a code of conduct; please be sure to follow it
in all of your project interactions.

## Pull Request Process

1. Ensure any install or build dependencies are removed before the end of the layer when doing a
build.
2. Update the README.md with details of changes to the interface, this includes new environment
variables, exposed ports, useful file locations and container parameters.
3. Increase the version numbers in any examples files and the README.md to the new version that this
Pull Request would represent. The versioning scheme we use is [SemVer](http://semver.org/).
4. You may merge the Pull Request in once you have the sign-off of two other developers, or if you
do not have permission to do that, you may request the second reviewer to merge it for you.
1. Ensure any install or build artifacts are removed before the end of
the layer when doing a build
2. Update the README.md or README_VAGRANT.md with details of changes to the
interface, this includes new environment variables, exposed ports, useful
file locations and container parameters
3. Increase the version numbers in any examples files and the README.md
to the new version that this Pull Request would represent. The versioning scheme we use is (mostly) [SemVer](http://semver.org/)
4. You may merge the Pull Request in once you have the sign-off of two other
project contributors, or if you do not have permission to do that, you can
request the second reviewer to merge it for you

## Code of Conduct

### Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, gender identity and expression, level of experience,
nationality, personal appearance, race, religion, or sexual identity and
orientation.
contributors and maintainers pledge to making participation in our project
and our community a harassment-free experience for everyone, regardless of age,
body size, disability, ethnicity, gender identity and expression, level of
experience, nationality, personal appearance, race, religion, or sexual
identity and orientation.

### Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Showing empathy towards other community members
* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Use of sexualized language or imagery and unwelcome sexual attention
or advances
* Insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
Expand All @@ -66,27 +69,28 @@ threatening, offensive, or harmful.
This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.
address, posting via an official social media account, or acting as an
appointed representative at an online or offline event. Representation of a
project may be further defined and clarified by project maintainers.

### Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project leadership: brian [at] brianshumate [dot] com. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.
reported by contacting the project leadership: brian <at> brianshumate <dot> com.

All complaints will be reviewed and investigated and will result in a response
that is deemed necessary and appropriate to the circumstances. The project
team is obligated to maintain confidentiality with regard to the reporter of
an incident. Further details of specific enforcement policies may be posted
separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

### Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at [http://contributor-covenant.org/version/1/4][version]
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
[version]: http://contributor-covenant.org/version/1/4/
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ Thank you to all these fine folks for helping with ansible-vault!
- [@pierrefh](https://github.com/pierrefh)
- [@arledesma](https://github.com/arledesma)
- [@bilke](https://github.com/bilke)
- [@cwill747](https://github.com/bilke/cwill747)
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ This role requires FreeBSD, or a Debian or RHEL based Linux distribution. It
might work with other software versions, but does work with the following
specific software and versions:

* Ansible: 2.2.2.0
* Ansible: 2.3.0.0
* Vault: 0.7.0
* Debian: 8
* FreeBSD 11
Expand Down
6 changes: 3 additions & 3 deletions examples/README_VAGRANT.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ BOX_NAME="centos/7" vagrant up

1. This project functions with the following software versions:
* Vault version 0.7.0
* Ansible: 2.2.2.0
* VirtualBox version 5.1.18
* Vagrant version 1.9.3
* Ansible: 2.3.0.0
* VirtualBox version 5.1.20
* Vagrant version 1.9.4
* Vagrant Hosts version 2.8.0
2. This project uses Debian 8 (Jessie) by default, but you can choose another
OS distribution with the *BOX_NAME* environment variable
Expand Down
2 changes: 1 addition & 1 deletion tasks/tls.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
# File: tasks/tls.yml - TLS tasks for Vault

- name: Create tls directory
- name: Create TLS directory
file:
dest: "{{ item }}"
state: directory
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.5.6
v1.5.7

0 comments on commit b7fa795

Please sign in to comment.