external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

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

Browse source
This commit is contained in:
root 2018-09-06 14:07:16 -04:00
commit 7b9086ec92
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
roles/calibre/templates/calibre-serve.service.j2
View file

@ -5,9 +5,10 @@ After=syslog.target network.target local-fs.target
[Service] [Service]
Type=forking Type=forking
PIDFile=/var/run/calibre.pid 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 }} 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] [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 WantedBy=multi-user.target

2
roles/nextcloud/defaults/main.yml
View file

@ -8,7 +8,7 @@ nextcloud_url: /nextcloud
nextcloud_prefix: /opt nextcloud_prefix: /opt
nextcloud_data_dir: "{{ content_base }}/nextcloud/data" nextcloud_data_dir: "{{ content_base }}/nextcloud/data"
nextcloud_dl_url: https://download.nextcloud.com/server/releases/ 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 }} nextcloud_src_file: nextcloud_{{ nextcloud_orig_src_file }}
# we install on mysql with these setting or those from default_vars, etc. # we install on mysql with these setting or those from default_vars, etc.

1
roles/nextcloud/templates/nextcloud.conf.j2
View file

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