From 76c02abf476882a4540e24231e5ced04c45563ca Mon Sep 17 00:00:00 2001 From: Emilien Mantel Date: Thu, 11 Aug 2016 09:38:09 +0200 Subject: [PATCH] Fix owncloud js (from php) and add tests --- .../etc/nginx/sites-available/_owncloud.j2 | 4 ++-- tests/test.yml | 21 +++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/templates/etc/nginx/sites-available/_owncloud.j2 b/templates/etc/nginx/sites-available/_owncloud.j2 index 9f30ca1..8b1f359 100644 --- a/templates/etc/nginx/sites-available/_owncloud.j2 +++ b/templates/etc/nginx/sites-available/_owncloud.j2 @@ -43,7 +43,7 @@ {% else %} include fastcgi.conf; {% endif %} - } + } location ~ \.php$ { fastcgi_pass {{ php_upstream }}; @@ -61,7 +61,7 @@ } location ~* \.(?:css|js)$ { - try_files $uri /index.php$uri$is_args$args; + try_files $uri /index.php$is_args$args; add_header Cache-Control "public, max-age=7200"; expires 2h; access_log off; diff --git a/tests/test.yml b/tests/test.yml index 26d3d12..92229d2 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -312,6 +312,27 @@ register: nagios_cgi failed_when: nagios_cgi.stdout.find('Nagios Event Summary') == -1 +# -------------------------------- +# Owncloud +# -------------------------------- + - block: + - name: -- VERIFY OWNCLOUD -- + command: "curl -H 'Host: owncloud.local' http://127.0.0.1/" + changed_when: false + register: ownsimple + failed_when: ownsimple.stdout.find('ownCloud') == -1 + - name: -- VERIFY OWNCLOUD JS (FROM PHP)-- + command: "curl -H 'Host: owncloud.local' http://127.0.0.1/index.php/core/js/oc.js" + changed_when: false + register: ownjsphp + failed_when: ownjsphp.stdout.find('var oc_debug=false') == -1 + - name: -- VERIFY OWNCLOUD JS -- + command: "curl -H 'Host: owncloud.local' http://127.0.0.1/core/js/js.js" + changed_when: false + register: ownjs + failed_when: ownjs.stdout.find('var oc_debug') == -1 + when: ansible_distribution != 'FreeBSD' + # -------------------------------- # SSL # --------------------------------