From 3a6ec66a1e5da9990ba403a874406aa23788b3e3 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Wed, 18 Jan 2017 04:14:23 -0500 Subject: [PATCH 1/3] Rename owncloud__theme_entitiy_name to owncloud__theme_entity_name --- defaults/main.yml | 6 +++--- .../srv/www/sites/themes/debops-template/defaults.php.j2 | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index ed3e89c..d4085c6 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1336,17 +1336,17 @@ owncloud__theme_name: 'DebOps Cloud' owncloud__theme_name_html: '{{ owncloud__theme_name }}' -# .. envvar:: owncloud__theme_entitiy_name +# .. envvar:: owncloud__theme_entity_name # # Entity string for your ownCloud. For example the name of your company. This # string is used in the footer and the copyright. -owncloud__theme_entitiy_name: 'DebOps' +owncloud__theme_entity_name: 'DebOps' # .. envvar:: owncloud__theme_base_url # # Base URL to get more information about your ownCloud. By default, -# :envvar:`owncloud__theme_entitiy_name` links to this URL on the login page. +# :envvar:`owncloud__theme_entity_name` links to this URL on the login page. # Use an empty string to use the default URL pointing to the ownCloud website. owncloud__theme_base_url: 'https://github.com/debops/ansible-owncloud' diff --git a/templates/srv/www/sites/themes/debops-template/defaults.php.j2 b/templates/srv/www/sites/themes/debops-template/defaults.php.j2 index 1d5b4c8..9db6a70 100644 --- a/templates/srv/www/sites/themes/debops-template/defaults.php.j2 +++ b/templates/srv/www/sites/themes/debops-template/defaults.php.j2 @@ -114,7 +114,7 @@ Fallback not possible as of 9.0.2. * @return string entity name */ public function getEntity() { - return '{{ owncloud__theme_entitiy_name }}'; + return '{{ owncloud__theme_entity_name }}'; } /** From a2d8f66821afb48dfda1e42f54658bc6238c2a2c Mon Sep 17 00:00:00 2001 From: Robin Schneider Date: Wed, 18 Jan 2017 12:27:32 +0100 Subject: [PATCH 2/3] Add #80 to the changelog --- CHANGES.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 96b20e8..b3e506b 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -51,6 +51,9 @@ Changed and has already been updated in the `debops-playbooks repository `_ for feature parity with Ansible version in the future. [drybjed_] +- Fix typo in variable name by renaming ``owncloud__theme_entitiy_name`` to + :envvar:`owncloud__theme_entity_name`. [jbicha] + Removed ~~~~~~~ From be3f9a1622f0d327f94d1a167a711417ce2a7914 Mon Sep 17 00:00:00 2001 From: Robin Schneider Date: Wed, 18 Jan 2017 12:27:52 +0100 Subject: [PATCH 3/3] Update inventory migration script for #80 --- docs/scripts/upgrade-from-v0.3.X-to-v0.4.X | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/scripts/upgrade-from-v0.3.X-to-v0.4.X b/docs/scripts/upgrade-from-v0.3.X-to-v0.4.X index 536fa0e..f785e29 100755 --- a/docs/scripts/upgrade-from-v0.3.X-to-v0.4.X +++ b/docs/scripts/upgrade-from-v0.3.X-to-v0.4.X @@ -6,4 +6,5 @@ git ls-files -z "$(git rev-parse --show-toplevel)" | xargs --null -I '{}' find ' | xargs --null sed --in-place --regexp-extended ' s/owncloud__nginx__servers/owncloud__nginx__dependent_servers/g; s/owncloud__nginx__upstream_php/owncloud__nginx__dependent_upstreams/g; + s/owncloud__theme_entitiy_name/owncloud__theme_entity_name/g; '