Merge pull request #505 from mikeashley/oc-fix

Update ownCloud role for ownCloud 8.2

README.md

@@ -203,7 +203,7 @@ Similarly, to access the server monitoring page, use another SSH tunnel:
 
 Again proceeding to http://localhost:2812 in your web browser.
 
-Finally, sign into ownCloud to set it up. You should select PostgreSQL as the configuration backend.
+Finally, sign into ownCloud with a new administrator account to set it up. You should select PostgreSQL as the configuration backend. Use `owncloud` as the database user and the database name. For the database password use the password you set for `owncloud_db_password` in `vars/user.yml`.
 
 How To Use Your New Personal Cloud
 ----------------------------------

roles/owncloud/tasks/owncloud.yml

@@ -1,32 +1,27 @@
 ---
 # Installs the ownCloud personal cloud software.
 
-- name: Install ownCloud  dependencies
+- name: Install ownCloud dependencies
   apt: pkg={{ item }} state=present
   with_items:
     - postgresql
-    - libapache2-mod-php5
-    - php-apc
     - python-psycopg2
   tags:
     - dependencies
 
-- name: Set postgres password
-  command: sudo -u {{ db_admin_username }} psql -d {{ db_admin_username }} -c "ALTER USER postgres with  password '{{ db_admin_password }}';"
+- name: Set postgres administrator password
+  command: sudo -u {{ db_admin_username }} psql -c "ALTER USER postgres with password '{{ db_admin_password }}';"
 
 - name: Create database user for ownCloud
-  postgresql_user: login_host=localhost login_user={{ db_admin_username }} login_password="{{ db_admin_password }}" name={{ owncloud_db_username }} password="{{ owncloud_db_password }}" state=present
-
-- name: Create database for ownCloud
-  postgresql_db: login_host=localhost login_user={{ db_admin_username }} login_password="{{ db_admin_password }}" name={{ owncloud_db_database }} state=present owner={{ owncloud_db_username }}
+  postgresql_user: login_host=localhost login_user={{ db_admin_username }} login_password="{{ db_admin_password }}" name={{ owncloud_db_username }} password="{{ owncloud_db_password }}" role_attr_flags=CREATEDB state=present
 
 - name: Ensure repository key for ownCloud is in place
-  apt_key: url=http://download.opensuse.org/repositories/isv:ownCloud:community/Debian_8.0/Release.key state=present
+  apt_key: url=https://download.owncloud.org/download/repositories/stable/Debian_8.0/Release.key state=present
   tags:
     - dependencies
 
-- name: Add ownCloud OpenSuSE repository
-  apt_repository: repo='deb http://download.opensuse.org/repositories/isv:/ownCloud:/community/Debian_8.0/ /'
+- name: Add ownCloud repository
+  apt_repository: repo='deb http://download.owncloud.org/download/repositories/stable/Debian_8.0/ /'
   tags:
     - dependencies
 
@@ -42,27 +37,12 @@
   command: mv /var/www/owncloud/data /decrypted/owncloud-data creates=/decrypted/owncloud-data
 - file: src=/decrypted/owncloud-data dest=/var/www/owncloud/data owner=www-data group=www-data state=link
 
-- name: Enable Apache rewrite module
-  command: a2enmod rewrite creates=/etc/apache2/mods-enabled/rewrite.load
-  notify: restart apache
-
-- name: Enable Apache headers module
-  command: a2enmod headers creates=/etc/apache2/mods-enabled/headers.load
-  notify: restart apache
-
-- name: Enable Apache expires module
-  command: a2enmod expires creates=/etc/apache2/mods-enabled/expires.load
+- name: Remove conf-enabled/owncloud symlink
+  file: path=/etc/apache2/conf-enabled/owncloud.conf state=absent
   notify: restart apache
 
-- name: Rename existing Apache owncloud virtualhost
-  command: mv /etc/apache2/sites-available/owncloud /etc/apache2/sites-available/owncloud.conf removes=/etc/apache2/sites-available/owncloud
-
-- name: Remove old sites-enabled/owncloud symlink (new one will be created by a2ensite)
-  file: path=/etc/apache2/sites-enabled/owncloud state=absent
-
 - name: Configure the Apache HTTP server for ownCloud
-  template: src=etc_apache2_sites-available_owncloud.j2 dest=/etc/apache2/sites-available/owncloud.conf group=root owner=root
-
+  template: src=etc_apache2_sites-available_owncloud.j2 dest=/etc/apache2/sites-available/owncloud.conf group=root
 - name: Enable the owncloud site
   command: a2ensite owncloud.conf creates=/etc/apache2/sites-enabled/owncloud.conf
   notify: restart apache

roles/owncloud/templates/etc_apache2_sites-available_owncloud.j2

@@ -16,24 +16,25 @@
 
     php_value session_cache_limiter "public"
 
-    <Directory /var/www/owncloud>
+    <Directory "/var/www/owncloud">
+        Options +FollowSymLinks
         AllowOverride All
-        Order allow,deny
-        allow from all
-        DirectoryIndex index.php
-
-        SetOutputFilter DEFLATE
-
-        ExpiresActive On
-        ExpiresDefault "access plus 2 weeks"
-        ExpiresByType text/css "access plus 2 weeks"
-        ExpiresByType image/svg+xml "access plus 2 weeks"
-        ExpiresByType image/png "access plus 2 weeks"
-        ExpiresByType text/javascript "access plus 2 weeks"
-        ExpiresByType application/x-javascript "access plus 2 weeks"
-        ExpiresByType application/javascript "access plus 2 weeks"
-        ExpiresByType application/x-icon "access plus 2 weeks"
-
-        Header set Cache-Control "public"
+
+        <IfModule mod_dav.c>
+          Dav off
+        </IfModule>
+
+        SetEnv HOME /var/www/owncloud
+        SetEnv HTTP_HOME /var/www/owncloud
     </Directory>
+
+    <Directory "/var/www/owncloud/data/">
+      # just in case if .htaccess gets disabled
+      Require all denied
+    </Directory>
+
+    ## Please enable this manually, if needed. See also
+    ## https://doc.owncloud.org/server/8.2/admin_manual/issues/index.html#apple-ios
+    # Redirect 301 /.well-known/carddav /owncloud/remote.php/carddav
+    # Redirect 301 /.well-known/caldav  /owncloud/remote.php/caldav
 </VirtualHost>