Merge branch 'ypid-rework-2'

.gitignore

@@ -4,3 +4,8 @@ docs/Makefile
 docs/_build/
 docs/conf.py
 docs/defaults.rst
+docs/includes/global.rst
+docs/_templates/page.html
+docs/_templates/.gitkeep
+docs/_static/custom.css
+docs/_static/.gitkeep

.travis.yml

@@ -17,3 +17,6 @@ script:
   - 'git clone --depth 1 https://github.com/nickjj/rolespec'
   - 'cd rolespec ; bin/rolespec -r https://github.com/debops/test-suite'
 
+notifications:
+  webhooks:
+    - 'https://galaxy.ansible.com/api/v1/notifications/'

COPYRIGHT

@@ -1,7 +1,8 @@
 debops.nginx - Manage nginx webserver using Ansible
 
 Copyright (C) 2014-2016 Maciej Delmanowski <[email protected]>
-Copyright (C) 2014-2016 DebOps Project http://debops.org/
+Copyright (C) 2015-2016 Robin Schneider <[email protected]>
+Copyright (C) 2014-2016 DebOps https://debops.org/
 
 This Ansible role is part of DebOps.
 
@@ -15,4 +16,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with DebOps. If not, see http://www.gnu.org/licenses/.
+along with DebOps. If not, see https://www.gnu.org/licenses/.

README.md

@@ -1,51 +1,54 @@
-## [![DebOps project](http://debops.org/images/debops-small.png)](http://debops.org) nginx
+## [![DebOps](https://debops.org/images/debops-small.png)](https://debops.org) nginx
 
-[![Travis CI](http://img.shields.io/travis/debops/ansible-nginx.svg?style=flat)](http://travis-ci.org/debops/ansible-nginx) [![test-suite](http://img.shields.io/badge/test--suite-ansible--nginx-blue.svg?style=flat)](https://github.com/debops/test-suite/tree/master/ansible-nginx/)  [![Ansible Galaxy](http://img.shields.io/badge/galaxy-debops.nginx-660198.svg?style=flat)](https://galaxy.ansible.com/list#/roles/1580)
+<!-- This file was generated by Ansigenome. Do not edit this file directly but
+     instead have a look at the files in the ./meta/ directory. -->
 
-[nginx](http://nginx.org/) is a fast and light webserver with extensible
+[![Travis CI](https://img.shields.io/travis/debops/ansible-nginx.svg?style=flat)](https://travis-ci.org/debops/ansible-nginx)
+[![test-suite](https://img.shields.io/badge/test--suite-ansible--nginx-blue.svg?style=flat)](https://github.com/debops/test-suite/tree/master/ansible-nginx/)
+[![Ansible Galaxy](https://img.shields.io/badge/galaxy-debops.nginx-660198.svg?style=flat)](https://galaxy.ansible.com/debops/nginx)
+
+
+The [nginx](https://nginx.org/) is a fast and light webserver with extensible
 configuration.
 
-`debops.nginx` role can be used to install and manage `nginx` configuration
-for multiple websites at the same time. Server is configured using
-inventory variables, role can also be used as a dependency of another role
+The `debops.nginx` role can be used to install and manage `nginx` configuration
+for multiple websites at the same time. The server is configured using
+inventory variables. This role can also be used as a dependency of another role
 to configure a webserver for that role using dependency variables.
 
 ### Installation
 
-This role requires at least Ansible `v1.7.0`. To install it, run:
-
-    ansible-galaxy install debops.nginx
-
-### Documentation
-
-More information about `debops.nginx` can be found in the
-[official debops.nginx documentation](http://docs.debops.org/en/latest/ansible/roles/debops.nginx.html).
+This role requires at least Ansible `v2.0.0`. To install it, run:
 
+```Shell
+ansible-galaxy install debops.nginx
+```
 
 ### Role dependencies
 
-- `debops.ferm`
+- `debops.secret`
 - `debops.apt_preferences`
+- `debops.ferm`
 
 ### Are you using this as a standalone role without DebOps?
 
 You may need to include missing roles from the [DebOps common
 playbook](https://github.com/debops/debops-playbooks/blob/master/playbooks/common.yml)
 into your playbook.
 
-[Try DebOps now](https://github.com/debops/debops) for a complete solution to run your Debian-based infrastructure.
+[Try DebOps now](https://debops.org/) for a complete solution to run your Debian-based infrastructure.
 
 
 
 
 
 ### Authors and license
 
-`nginx` role was written by:
-- Maciej Delmanowski | [e-mail](mailto:[email protected]) | [Twitter](https://twitter.com/drybjed) | [GitHub](https://github.com/drybjed)
+- [Maciej Delmanowski](https://docs.debops.org/en/latest/debops-keyring/docs/entities.html#debops-keyring-entity-drybjed) (maintainer) | [e-mail](mailto:[email protected]) | [Twitter](https://twitter.com/drybjed) | [GitHub](https://github.com/drybjed)
+- [Robin Schneider](https://docs.debops.org/en/latest/debops-keyring/docs/entities.html#debops-keyring-entity-ypid) | [e-mail](mailto:[email protected]) | [GitHub](https://github.com/ypid)
 
-License: [GPLv3](https://tldrlegal.com/license/gnu-general-public-license-v3-%28gpl-3%29)
+License: [GPL-3.0](https://tldrlegal.com/license/gnu-general-public-license-v3-%28gpl-3%29)
 
 ***
 
-This role is part of the [DebOps](http://debops.org/) project. README generated by [ansigenome](https://github.com/nickjj/ansigenome/).
+This role is part of [DebOps](https://debops.org/). README generated by [ansigenome](https://github.com/nickjj/ansigenome/).