forked from roots/trellis
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'trellis/master' into uptodate-trellis
* trellis/master: (292 commits) Bump Ansible version_tested_max to 2.4.2.0 (roots#932) Add MariaDB 10.2 PPA Remove cron_file if WP system cron disabled (roots#927) Add Code of Conduct [ci skip] Expose the deploy_helper keep_releases option (roots#922) Close roots#580 - Switch from .dev to .test Update acme-tiny commit hash Enable select deploy configs to optionally vary by site (roots#919) 1.0.0-rc.2 Update to WP-CLI 1.4.1. Disallow duplicate site keys within a host's wordpress_sites (roots#910) Replace bare Dataloader() with pre-loaded play._loader (roots#917) Remove outdated to_unicode import from plugin utils (roots#916) Fix raw_vars functionality for Ansible 2.4.1 (roots#915) Enable ioapic Update vagrant_box_version to current release Dynamically increase ansible_group_priority for selected env (roots#909) Bump Ansible version_tested_max to 2.4.1.0 (roots#911) Clarify DB task name. Update wp-cli to 1.4.0. ...
- Loading branch information
Showing
95 changed files
with
2,414 additions
and
1,018 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
# Contributor Covenant 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. | ||
|
||
## Our Standards | ||
|
||
Examples of behavior that contributes to creating a positive environment | ||
include: | ||
|
||
* 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 | ||
* Public or private harassment | ||
* Publishing others' private information, such as a physical or electronic | ||
address, without explicit permission | ||
* Other conduct which could reasonably be considered inappropriate in a | ||
professional setting | ||
|
||
## Our Responsibilities | ||
|
||
Project maintainers are responsible for clarifying the standards of acceptable | ||
behavior and are expected to take appropriate and fair corrective action in | ||
response to any instances of unacceptable behavior. | ||
|
||
Project maintainers have the right and responsibility to remove, edit, or | ||
reject comments, commits, code, wiki edits, issues, and other contributions | ||
that are not aligned to this Code of Conduct, or to ban temporarily or | ||
permanently any contributor for other behaviors that they deem inappropriate, | ||
threatening, offensive, or harmful. | ||
|
||
## Scope | ||
|
||
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. | ||
|
||
## Enforcement | ||
|
||
Instances of abusive, harassing, or otherwise unacceptable behavior may be | ||
reported by contacting the project team at [email protected]. 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 https://www.contributor-covenant.org/version/1/4/code-of-conduct.html | ||
|
||
[homepage]: https://www.contributor-covenant.org | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,9 +12,9 @@ Ansible playbooks for setting up a LEMP stack for WordPress. | |
|
||
Trellis will configure a server with the following and more: | ||
|
||
* Ubuntu 14.04 Trusty LTS | ||
* Ubuntu 16.04 Xenial LTS | ||
* Nginx (with optional FastCGI micro-caching) | ||
* PHP 7.0 | ||
* PHP 7.1 | ||
* MariaDB (a drop-in MySQL replacement) | ||
* SSL support (scores an A+ on the [Qualys SSL Labs Test](https://www.ssllabs.com/ssltest/)) | ||
* Let's Encrypt integration for free SSL certificates | ||
|
@@ -26,15 +26,16 @@ Trellis will configure a server with the following and more: | |
* Fail2ban | ||
* ferm | ||
|
||
## Documentation | ||
|
||
Full documentation is available at [https://roots.io/trellis/docs/](https://roots.io/trellis/docs/). | ||
|
||
## Requirements | ||
|
||
Make sure all dependencies have been installed before moving on: | ||
|
||
* [Ansible](http://docs.ansible.com/ansible/intro_installation.html#latest-releases-via-pip) 2.0.2 | ||
* [Virtualbox](https://www.virtualbox.org/wiki/Downloads) >= 4.3.10 | ||
* [Vagrant](http://www.vagrantup.com/downloads.html) >= 1.5.4 | ||
* [vagrant-bindfs](https://github.com/gael-ian/vagrant-bindfs#installation) >= 0.3.1 (Windows users may skip this) | ||
* [vagrant-hostmanager](https://github.com/smdahlen/vagrant-hostmanager#installation) | ||
* [Vagrant](https://www.vagrantup.com/downloads.html) >= 1.8.5 | ||
|
||
## Installation | ||
|
||
|
@@ -54,7 +55,6 @@ See a complete working example in the [roots-example-project.com repo](https://g | |
1. Create a new project directory: `$ mkdir example.com && cd example.com` | ||
2. Clone Trellis: `$ git clone --depth=1 [email protected]:roots/trellis.git && rm -rf trellis/.git` | ||
3. Clone Bedrock: `$ git clone --depth=1 [email protected]:roots/bedrock.git site && rm -rf site/.git` | ||
4. Install the Ansible Galaxy roles: `$ cd trellis && ansible-galaxy install -r requirements.yml` | ||
|
||
Windows user? [Read the Windows docs](https://roots.io/trellis/docs/windows/) for slightly different installation instructions. VirtualBox is known to have poor performance in Windows — use VMware or [see some possible solutions](https://discourse.roots.io/t/virtualbox-performance-in-windows/3932). | ||
|
||
|
@@ -73,7 +73,9 @@ Additional pt-ops documentation is available at [Google Docs](https://drive.goog | |
|
||
## Remote server setup (staging/production) | ||
|
||
A base Ubuntu 14.04 server is required for setting up remote servers. | ||
For remote servers, installing Ansible locally is an additional requirement. See the [docs](https://roots.io/trellis/docs/remote-server-setup/#requirements) for more information. | ||
|
||
A base Ubuntu 16.04 server is required for setting up remote servers. OS X users must have [passlib](http://pythonhosted.org/passlib/install.html#installation-instructions) installed. | ||
|
||
1. Configure your WordPress sites in `group_vars/<environment>/wordpress_sites.yml` and in `group_vars/<environment>/vault.yml` (see the [Vault docs](https://roots.io/trellis/docs/vault/) for how to encrypt files containing passwords) | ||
2. Add your server IP/hostnames to `hosts/<environment>` | ||
|
@@ -82,6 +84,15 @@ A base Ubuntu 14.04 server is required for setting up remote servers. | |
|
||
[Read the remote server docs](https://roots.io/trellis/docs/remote-server-setup/) for more information. | ||
|
||
## Deploying to remote servers | ||
|
||
1. Add the `repo` (Git URL) of your Bedrock WordPress project in the corresponding `group_vars/<environment>/wordpress_sites.yml` file | ||
2. Set the `branch` you want to deploy | ||
3. Run `./bin/deploy.sh <environment> <site name>` | ||
4. To rollback a deploy, run `ansible-playbook rollback.yml -e "site=<site name> env=<environment>"` | ||
|
||
[Read the deploys docs](https://roots.io/trellis/docs/deploys/) for more information. | ||
|
||
## Community | ||
|
||
Keep track of development and community news. | ||
|
Oops, something went wrong.