Merge pull request #25 from drybjed/switch-upstream-repository

Switch ownCloud APT repository, prepare release

CHANGES.rst

@@ -4,7 +4,7 @@ Changelog
 v0.2.0
 ------
 
-*Unreleased*
+*Released: 2015-11-12*
 
 - Add Changelog. [ypid]
 
@@ -23,3 +23,17 @@ v0.2.0
 - New PostgreSQL role support. Now PostgreSQL and MariaDB/MySQL support is unified. [scibi]
 
 - New variable: ``owncloud_timeout`` needed to handle very large files uploads. [scibi]
+
+- Switch ownCloud APT repository to upstram repository, support different Linux
+  distributions and releases out of the box. [drybjed]
+
+- Use ``http://`` protocol instead of ``https://`` for APT repository URL,
+  because encrypted connection has issues. [drybjed]
+
+v0.1.0
+------
+
+*Released: 2015-08-11*
+
+- First release. [drybjed]
+

defaults/main.yml

@@ -33,9 +33,9 @@ owncloud_dependencies: True
 owncloud_domain: [ 'owncloud.{{ ansible_domain }}' ]
 
 
-# --------------------------
+# ----------------------------------
 #   ownCloud source and deployment
-# --------------------------
+# ----------------------------------
 
 # .. envvar:: owncloud_edition
 #
@@ -51,16 +51,52 @@ owncloud_edition: 'community'
 owncloud_release: 8.1
 
 
+# .. envvar:: owncloud_distribution
+#
+# Name and version of OS distribution to use for ownCloud packages.
+owncloud_distribution: '{{ owncloud_distribution_name + "_" +
+                           owncloud_distribution_version }}'
+
+
+# .. envvar:: owncloud_distribution_name
+#
+# Name of the OS distribution to use for ownCloud URLs.
+owncloud_distribution_name: '{{ ansible_distribution }}'
+
+
+# .. envvar:: owncloud_distribution_version
+#
+# Version number of the OS distribution for ownCloud URLs.
+owncloud_distribution_version: '{{ ((ansible_distribution_major_version + ".0")
+                                    if ansible_distribution in [ "Debian" ]
+                                    else ansible_distribution_version) }}'
+
+
 # .. envvar:: owncloud_apt_repo_base
 #
 # Base APT repository URL.
-owncloud_apt_repo_base: 'http://download.opensuse.org/repositories/isv:/ownCloud:'
+owncloud_apt_repo_base: 'http://download.owncloud.org/download/repositories/stable'
 
 
-# .. envvar:: owncloud_apt_repo_key_fingerprint
+# .. envvar:: owncloud_apt_repo_key_id
 #
 # GPG fingerprint for the public key used to sign the APT repository.
-owncloud_apt_repo_key_fingerprint: 'F9EA4996747310AE79474F44977C43A8BA684223'
+owncloud_apt_repo_key_id: 'BCECA90325B072AB1245F739AB7C32C35180350A'
+
+
+# .. envvar:: owncloud_apt_repo_key_url
+#
+# URL of the GPG keys used by the ownCloud project.
+owncloud_apt_repo_key_url: '{{ owncloud_apt_repo_base + "/" +
+                               owncloud_distribution + "/"
+                               "Release.key" }}'
+
+
+# .. envvar:: owncloud_apt_repo_source
+#
+# APT ``sources.list`` URL of the ownCloud ``.deb`` repository.
+owncloud_apt_repo_source: '{{ "deb " + owncloud_apt_repo_base + "/" +
+                              owncloud_distribution + "/ /" }}'
 
 
 # .. envvar:: owncloud_user
@@ -208,6 +244,12 @@ owncloud_password_length: '20'
 owncloud_autosetup: True
 
 
+# .. envvar:: owncloud_autosetup_url
+#
+# URL which will be called to finish autosetup.
+owncloud_autosetup_url: 'http://{{ owncloud_domain[0] }}/index.php'
+
+
 # --------------------
 #   ownCloud configuration
 # --------------------

tasks/configure_owncloud.yml

@@ -67,7 +67,7 @@
 
 - name: Automatically finish setup if allowed
   uri:
-    url: 'https://{{ owncloud_domain[0] }}/index.php'
+    url: '{{ owncloud_autosetup_url }}'
   when: owncloud_config_file is defined and not owncloud_config_file.stat.exists and
         owncloud_admin_username and owncloud_autosetup
 

tasks/main.yml

@@ -2,13 +2,13 @@
 
 - name: Get ownCloud APT GPG key
   apt_key:
-    url: '{{owncloud_apt_repo_base}}/{{owncloud_edition}}:/{{owncloud_release}}/{{ansible_distribution}}_{{ansible_distribution_major_version}}.0/Release.key'
-    id: '{{ owncloud_apt_repo_key_fingerprint }}'
+    url: '{{ owncloud_apt_repo_key_url }}'
+    id: '{{ owncloud_apt_repo_key_id }}'
     state: present
 
 - name: Configure ownCloud APT repository
   apt_repository:
-    repo: 'deb {{owncloud_apt_repo_base}}/{{owncloud_edition}}:/{{owncloud_release}}/{{ansible_distribution}}_{{ansible_distribution_major_version}}.0/ /'
+    repo: '{{ owncloud_apt_repo_source }}'
     state: present
     update_cache: True