Improved documentation

Author: tersmitten

README.md

@@ -10,12 +10,15 @@ Set up the latest or a specific version of supervisor in Debian-like systems.
 * `python` (will be installed)
 * `pip` (will not be installed)
 
+when using `supervisor_install_method: pip`
+
 #### Variables
 
-* `supervisor_python_version_major` [default: `2`]: Python version to install `supervisor` for.
-* `supervisor_python_version` [default: `supervisor_python_version`]: Deprecated
+* `supervisor_install_method`: [default: `native`]: The way to install supervisor (e.g. `native` (from Ubuntu repo) or `pip`)
+
+* `supervisor_pip_python_version_major` [default: `3`]: Python version to install `supervisor` for. Only relevant when using `supervisor_install_method: pip`
+* `supervisor_pip_package_version` [default: `latest`]: Supervisor version to install (e.g. `latest`, `3.3.1`). Only relevant when using `supervisor_install_method: pip`
 
-* `supervisor_version` [default: `latest`]: Supervisor version to install (e.g. `latest`, `3.3.1`)
 * `supervisor_unix_http_server_file` [default: `/var/run/supervisor.sock`]: A path to a UNIX domain socket (e.g. `/tmp/supervisord.sock`) on which supervisor will listen for HTTP/XML-RPC requests. `supervisorctl` uses XML-RPC to communicate with supervisord over this port
 * `supervisor_unix_http_server_chmod` [default: `'0700'`]: Change the UNIX permission mode bits of the UNIX domain socket to this value at startup
 * `supervisor_unix_http_server_chown` [optional]: The user and group of `supervisor_unix_http_server_file` file. Use the following format: `user:group`

defaults/main.yml

@@ -1,12 +1,8 @@
 # defaults file
 ---
 supervisor_install_method: native
-supervisor_native_dependencies:
-  - "{{ supervisor_package_name }}"
 
-supervisor_pip_python_version_major: 2
-supervisor_pip_dependencies:
-  - "python{{ supervisor_pip_python_version_major is version('3', '>=') | ternary('3', '') }}"
+supervisor_pip_python_version_major: 3
 supervisor_pip_package_version: latest
 
 supervisor_unix_http_server_file: /var/run/supervisor.sock

vars/main.yml

@@ -2,6 +2,12 @@
 ---
 supervisor_package_name: supervisor
 
+supervisor_native_dependencies:
+  - "{{ supervisor_package_name }}"
+
+supervisor_pip_dependencies:
+  - "python{{ supervisor_pip_python_version_major is version('3', '>=') | ternary('3', '') }}"
+
 supervisor_install_prefix: "/usr/{{ (supervisor_install_method == 'native') | ternary('', 'local/') }}bin"
 
 supervisor_default_file: "/etc/default/{{ supervisor_package_name }}"