From 2d38b2c205a36945f492495fc73f9be85fadcc78 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 6 Sep 2018 08:03:34 -0400 Subject: [PATCH 1/3] Nextcloud 13.x -> 14.x --- roles/nextcloud/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/nextcloud/defaults/main.yml b/roles/nextcloud/defaults/main.yml index 1ad40ffb9..4ec76e221 100644 --- a/roles/nextcloud/defaults/main.yml +++ b/roles/nextcloud/defaults/main.yml @@ -8,7 +8,7 @@ nextcloud_url: /nextcloud nextcloud_prefix: /opt nextcloud_data_dir: "{{ content_base }}/nextcloud/data" nextcloud_dl_url: https://download.nextcloud.com/server/releases/ -nextcloud_orig_src_file: latest-13.tar.bz2 +nextcloud_orig_src_file: latest-14.tar.bz2 nextcloud_src_file: nextcloud_{{ nextcloud_orig_src_file }} # we install on mysql with these setting or those from default_vars, etc. From fb21010a3feb857c02fb2fcc6878238bf679a23a Mon Sep 17 00:00:00 2001 From: root Date: Thu, 6 Sep 2018 07:45:13 -0700 Subject: [PATCH 2/3] fix .htaccess error nextcloud --- roles/nextcloud/templates/nextcloud.conf.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/nextcloud/templates/nextcloud.conf.j2 b/roles/nextcloud/templates/nextcloud.conf.j2 index 7a24d512f..615bebdfc 100644 --- a/roles/nextcloud/templates/nextcloud.conf.j2 +++ b/roles/nextcloud/templates/nextcloud.conf.j2 @@ -2,6 +2,7 @@ Alias {{ nextcloud_url }} {{ nextcloud_prefix }}/nextcloud Options -Indexes + AllowOverride All # Apache 2.4 From d93b325a491be4228754b29d96d44bb2078cc964 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 6 Sep 2018 11:38:35 -0400 Subject: [PATCH 3/3] Update calibre-serve.service.j2 --- roles/calibre/templates/calibre-serve.service.j2 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/calibre/templates/calibre-serve.service.j2 b/roles/calibre/templates/calibre-serve.service.j2 index db62f5a31..85255fcab 100644 --- a/roles/calibre/templates/calibre-serve.service.j2 +++ b/roles/calibre/templates/calibre-serve.service.j2 @@ -5,9 +5,10 @@ After=syslog.target network.target local-fs.target [Service] Type=forking PIDFile=/var/run/calibre.pid -TimeoutStartSec=400 +TimeoutStartSec=600 ExecStart=/usr/bin/calibre-server --daemonize --log=/var/log/calibre.log --pidfile=/var/run/calibre.pid --port={{ calibre_port }} --enable-auth --userdb={{ calibre_userdb }} {{ calibre_dbpath }} [Install] -TimeoutStartSec=900 +# 2018-09-06: @jvonau believes the line below is bogus, so we're removing it per #1096 +#TimeoutStartSec=900 WantedBy=multi-user.target