summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--inventory/host_vars/sk-cloudio/nextcloud.yml8
-rw-r--r--inventory/host_vars/sk-tomnext-nc.yml34
-rw-r--r--roles/apps/nextcloud/tasks/main.yml5
-rw-r--r--roles/apps/nextcloud/templates/pod-spec-with-mariadb.yml.j22
4 files changed, 23 insertions, 26 deletions
diff --git a/inventory/host_vars/sk-cloudio/nextcloud.yml b/inventory/host_vars/sk-cloudio/nextcloud.yml
index fdd042af..94a81d74 100644
--- a/inventory/host_vars/sk-cloudio/nextcloud.yml
+++ b/inventory/host_vars/sk-cloudio/nextcloud.yml
@@ -8,7 +8,7 @@ nextcloud_zfs:
nextcloud_instances:
wolke.elevate.at:
# new: true
- version: 19.0.3
+ version: 19.0.4
port: 8100
hostnames:
- wolke.elevate.at
@@ -20,7 +20,7 @@ nextcloud_instances:
password: "{{ vault_nextcloud_database_passwords['wolke.elevate.at'] }}"
insomnia.skillz.biz:
# new: true
- version: 19.0.3
+ version: 19.0.4
port: 8101
hostnames:
- insomnia.skillz.biz
@@ -32,7 +32,7 @@ nextcloud_instances:
password: "{{ vault_nextcloud_database_passwords['insomnia.skillz.biz'] }}"
nc.skillz.biz:
# new: true
- version: 19.0.3
+ version: 19.0.4
port: 8102
hostnames:
- nc.skillz.biz
@@ -44,7 +44,7 @@ nextcloud_instances:
password: "{{ vault_nextcloud_database_passwords['nc.skillz.biz'] }}"
wae.elevate.at:
# new: true
- version: 19.0.3
+ version: 19.0.4
port: 8104
hostnames:
- wae.elevate.at
diff --git a/inventory/host_vars/sk-tomnext-nc.yml b/inventory/host_vars/sk-tomnext-nc.yml
index fa8cb0d3..0fd2390c 100644
--- a/inventory/host_vars/sk-tomnext-nc.yml
+++ b/inventory/host_vars/sk-tomnext-nc.yml
@@ -17,23 +17,23 @@ install:
size: 800g
properties:
compression: off
- system_lvm:
- - name: root
- size: 3G
- filesystem: ext4
- mountpoint: /
- - name: var
- size: 1280M
- filesystem: ext4
- mountpoint: /var
- - name: var+log
- size: 768M
- filesystem: ext4
- mountpoint: /var/log
- mount_options:
- - noatime
- - nodev
- - noexec
+ system_lvm:
+ - name: root
+ size: 3G
+ filesystem: ext4
+ mountpoint: /
+ - name: var
+ size: 1280M
+ filesystem: ext4
+ mountpoint: /var
+ - name: var+log
+ size: 768M
+ filesystem: ext4
+ mountpoint: /var/log
+ mount_options:
+ - noatime
+ - nodev
+ - noexec
interfaces:
- bridge: br-public
name: primary0
diff --git a/roles/apps/nextcloud/tasks/main.yml b/roles/apps/nextcloud/tasks/main.yml
index d09773ab..53eb080d 100644
--- a/roles/apps/nextcloud/tasks/main.yml
+++ b/roles/apps/nextcloud/tasks/main.yml
@@ -200,9 +200,4 @@
** $ nextcloud-occ {{ item.key }} db:add-missing-indices
** $ nextcloud-occ {{ item.key }} db:convert-filecache-bigint
**
- ** Also please add the following option to the file
- ** "{{ nextcloud_base_path }}/{{ item.key }}/nextcloud/config/config.php"
- **
- ** 'overwriteprotocol' => 'https',
- **
****************************************
diff --git a/roles/apps/nextcloud/templates/pod-spec-with-mariadb.yml.j2 b/roles/apps/nextcloud/templates/pod-spec-with-mariadb.yml.j2
index 6100a2ab..b77ddeb2 100644
--- a/roles/apps/nextcloud/templates/pod-spec-with-mariadb.yml.j2
+++ b/roles/apps/nextcloud/templates/pod-spec-with-mariadb.yml.j2
@@ -14,6 +14,8 @@ containers:
env:
- name: NEXTCLOUD_TRUSTED_DOMAINS
value: "{{ item.value.hostnames | join(' ') }}"
+ - name: OVERWRITEPROTOCOL
+ value: "https"
- name: MYSQL_HOST
value: 127.0.0.1
- name: MYSQL_DATABASE