Merge branch '#80'

CHANGES.rst

@@ -51,6 +51,9 @@ Changed
   and has already been updated in the `debops-playbooks repository <https://github.com/debops/debops-playbooks>`_
   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
 ~~~~~~~
 

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'
 

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;
    '

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 }}';
 	}
 
 	/**