diff --git a/trellis/deploys.md b/trellis/deploys.md index bd4e0f3c..609231ce 100644 --- a/trellis/deploys.md +++ b/trellis/deploys.md @@ -35,7 +35,7 @@ Deploy with a single command: `./deploy.sh ` `deploy.sh` is a very simple Bash script which just runs the actual `ansible-playbook` command which can be a little annoying to type out. -The actual command looks like this: `ansible-playbook -i hosts/ deploy.yml --extra-vars="site="`. +The actual command looks like this: `ansible-playbook deploy.yml -e "site= env="`. You can always use this command itself since it can take any additional `ansible-playbook` options. @@ -143,9 +143,9 @@ Deploy command: Or alternatively: ``` -ansible-playbook -i hosts/production deploy.yml --extra-vars="site-mysite.com" +ansible-playbook deploy.yml -e "site=mysite.com env=production" ``` ## Rollbacks -To rollback a deploy, run `ansible-playbook -i hosts/ rollback.yml --extra-vars="site="` \ No newline at end of file +To rollback a deploy, run `ansible-playbook rollback.yml -e "site= env="` \ No newline at end of file diff --git a/trellis/remote-server-setup.md b/trellis/remote-server-setup.md index cb3b88c5..50037095 100644 --- a/trellis/remote-server-setup.md +++ b/trellis/remote-server-setup.md @@ -22,4 +22,4 @@ Setting up remote servers (staging/production) is similar to the [local developm 2. Add your server IP/hostnames to `hosts/`. 3. Specify public SSH keys for `users` in `group_vars/all/users.yml`. See the [SSH Keys docs](https://roots.io/trellis/docs/ssh-keys/). 4. Consider setting `sshd_permit_root_login: false` in `group_vars/all/security.yml`. See the [Security docs](https://roots.io/trellis/docs/security/). -5. Run `ansible-playbook -i hosts/ server.yml`. \ No newline at end of file +5. Run `ansible-playbook server.yml -e env=`. \ No newline at end of file diff --git a/trellis/security.md b/trellis/security.md index 6368e4f4..224c831b 100644 --- a/trellis/security.md +++ b/trellis/security.md @@ -32,7 +32,7 @@ When you set `sshd_permit_root_login: false` and run the `server.yml` playbook, With `root` login disabled, the `admin_user` will need to run commands using `sudo` with a password, so you will need to add the option [`--ask-become-pass`](http://docs.ansible.com/ansible/become.html#new-ansible-variables) when running `server.yml`. ``` -ansible-playbook -i hosts/production server.yml --ask-become-pass +ansible-playbook server.yml -e env=production --ask-become-pass ``` This prompts you to enter the sudoer password described in the "Admin User Sudoer Password" section below. See the [SSH Keys docs](https://roots.io/trellis/docs/ssh-keys/) for more information about Trellis SSH users.