Merge branch 'master' of https://github.com/iiab/iiab

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

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.

roles/nextcloud/templates/nextcloud.conf.j2

@@ -2,6 +2,7 @@ Alias {{ nextcloud_url }} {{ nextcloud_prefix }}/nextcloud
 
 <Directory {{ nextcloud_prefix }}/nextcloud/>
     Options -Indexes
+    AllowOverride All
 
     <IfModule mod_authz_core.c>
     # Apache 2.4