From c89b4498dd2096fed18dc172c0bb70c077cfc323 Mon Sep 17 00:00:00 2001 From: Robin Schneider Date: Sun, 19 Jun 2016 18:15:52 +0200 Subject: [PATCH] Switched from :any: to :envvar: to refer to variables. Related to: https://github.com/debops/docs/pull/140#issuecomment-227002058 --- CHANGES.rst | 8 ++++---- defaults/main.yml | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index e5f32c6..2d68660 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -7,7 +7,7 @@ v0.3.0 *Unreleased* - Remove most of the Ansible role dependencies. - Note that :any:`owncloud_autosetup` requires that a webserver is installed to + Note that :envvar:`owncloud_autosetup` requires that a webserver is installed to initialize the ownCloud database. Further configuration will not be possible when the database has not been initialized. @@ -20,7 +20,7 @@ v0.3.0 - Remove the ``owncloud-server`` package from list of installed packages, it has been dropped as of ownCloud 9.0. [drybjed] -- Update :any:`owncloud_release` to ``9.0``. [drybjed] +- Update :envvar:`owncloud_release` to ``9.0``. [drybjed] - Installation of the wrapper script for the :command:`occ` command is no longer optional as it is needed by the role internally. @@ -84,7 +84,7 @@ v0.2.0 - Allow to use :command:`occ` via Ansible’s inventory. Can be used to enable apps and create users. [ypid] -- Setup shortcut for the :command:`occ` command when not logged in as :any:`owncloud_user` user and sudo allows it. +- Setup shortcut for the :command:`occ` command when not logged in as :envvar:`owncloud_user` user and sudo allows it. Disabled by default. Can be enabled via ``owncloud_enable_occ_shortcut``. [ypid] - Improved LDAP support. Now role will create service account (default: ``cn=owncloud,dc=ansible,dc=fqdn``) @@ -92,7 +92,7 @@ v0.2.0 - New PostgreSQL role support. Now PostgreSQL and MariaDB/MySQL support is unified. [scibi] -- New variable: :any:`owncloud_timeout` needed to handle very large files uploads. [scibi] +- New variable: :envvar:`owncloud_timeout` needed to handle very large files uploads. [scibi] - Switch ownCloud APT repository to upstream repository, support different Linux distributions and releases out of the box. [drybjed] diff --git a/defaults/main.yml b/defaults/main.yml index 10eb27c..837f7af 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -143,7 +143,7 @@ owncloud_deploy_path: '{{ owncloud_home }}' # # ownCloud recommends MySQL or MariaDB as database. Set to ``False`` to use SQLite. # https://doc.owncloud.org/server/8.1/admin_manual/configuration_database/linux_database_configuration.html#database-configuration -# Choices see :any:`owncloud_database_map`. +# Choices see :envvar:`owncloud_database_map`. owncloud_database: 'mariadb' @@ -341,11 +341,11 @@ owncloud_app_user_webfinger_support: False # Dict keys can be overridden when they are present in multiple dicts. # Order of priority from least specific to most specific: # -# * :any:`owncloud_config_role_optional` -# * :any:`owncloud_config_role_required` -# * :any:`owncloud_config` -# * :any:`owncloud_config_group` -# * :any:`owncloud_config_host` +# * :envvar:`owncloud_config_role_optional` +# * :envvar:`owncloud_config_role_required` +# * :envvar:`owncloud_config` +# * :envvar:`owncloud_config_group` +# * :envvar:`owncloud_config_host` # @@ -467,13 +467,13 @@ owncloud_run_occ_global_commands: # .. envvar:: owncloud_run_occ_group_commands # -# See :any:`owncloud_run_occ_global_commands`. +# See :envvar:`owncloud_run_occ_global_commands`. owncloud_run_occ_group_commands: [] # .. envvar:: owncloud_run_occ_host_commands # -# See :any:`owncloud_run_occ_global_commands`. +# See :envvar:`owncloud_run_occ_global_commands`. owncloud_run_occ_host_commands: [] @@ -495,13 +495,13 @@ owncloud_occ_bin_file_path: '/usr/local/bin/occ' # # Enable LDAP support. ownCloud support multiple LDAP servers but this role # configures only default one. If you need something more complex you can -# use :any:`owncloud_run_occ_global_commands`. +# use :envvar:`owncloud_run_occ_global_commands`. owncloud_ldap_enable: False # .. envvar:: owncloud_ldap_create_user # -# Should the :any:`owncloud_ldap_binddn` LDAP user be created if it does not exist? +# Should the :envvar:`owncloud_ldap_binddn` LDAP user be created if it does not exist? owncloud_ldap_create_user: True @@ -676,7 +676,7 @@ owncloud_ldap_cache_ttl: '600' # empty for default behaviour. Changes will affect only newly mapped LDAP # users. # -# You will need to add this variable yourself to :any:`owncloud_ldap_conf_map` +# You will need to add this variable yourself to :envvar:`owncloud_ldap_conf_map` # right now. # # Settings this to:: @@ -744,14 +744,14 @@ owncloud_mail_smtpmode: 'sendmail' # This may contain multiple # hosts separated by a semi-colon. If you need to specify the port number # append it to the IP address separated by a colon, like this: 127.0.0.1:24. -# This depends on :any:`owncloud_mail_smtpmode`. +# This depends on :envvar:`owncloud_mail_smtpmode`. owncloud_mail_smtphost: '' # .. envvar:: owncloud_mail_smtpport # -# Port for sending mail. Can also be specified via :any:`owncloud_mail_smtphost`. -# This depends on :any:`owncloud_mail_smtpmode`. +# Port for sending mail. Can also be specified via :envvar:`owncloud_mail_smtphost`. +# This depends on :envvar:`owncloud_mail_smtpmode`. owncloud_mail_smtpport: ''