From c047b38f9116bf3343a07436b9036b590192c484 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 23 May 2020 21:10:29 +0200 Subject: add collabora code to sk-tomwatz-nc --- dan/host_vars/sk-tomnext-nc.yml | 26 +++++++++++++------------- dan/sk-tomnext-nc.yml | 1 + inventory/host_vars/sk-tomnext-nc.yml | 16 +++++++++++++++- 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dan/host_vars/sk-tomnext-nc.yml b/dan/host_vars/sk-tomnext-nc.yml index 74badcb1..4d3758a1 100644 --- a/dan/host_vars/sk-tomnext-nc.yml +++ b/dan/host_vars/sk-tomnext-nc.yml @@ -1,14 +1,14 @@ $ANSIBLE_VAULT;1.2;AES256;dan -39383530376638633762616162653834303633316365353238316464373534653462623962646662 -3536616637633035613832663331396236383936393331640a373033623664316136343239373935 -65323762663761333164326638363530393033626561663964313536303036333631363237613437 -3238336132626632300a636166386434646332613630623563633835306235373463633234303634 -31363236396139353833656139353537396337353864653738316631663638633539613865613864 -66343761366438373435326232616333316135313464623737333830316364333165396361383065 -39346232336662653239343837333138626263383337613762306464343231393932386635666237 -61336133316631306666633666653162653836613761363030393462633965336335316165346436 -64633032623633663761663266646234633961303531383761363064616231376163666665346563 -65646239343938313766346236616436313862623765326233656531383733663437313563613433 -33313532643436653234313833653962636265653864306331373433396338623435646562643631 -61306531663065653164663431653735633933616662663264656538343364373436366365383132 -3833 +31356637373366366135373964373331383431333233356234613565616139666262393362636261 +3664303764633061666262326134656162346438303634610a303434636562376435333733633164 +35323734313462363936386231363962643631313033363766323230633134616532373639373936 +3439646464326230380a353638343834303036353335396236626239393330393466383064306266 +36396631393366333932323761343933316266386632363032656566343530323236353539313763 +39353463333466373335313230623361393434353939623039646235346566306535613865363263 +38313432633632316435373139333263636635636563356266396434373733313538643865363939 +62343862336666393261383336376163373038623165313966643839626166613066323536646135 +66646565323135656665316263653132633432306630386262313933666435316435663436363865 +39643965353664376237636266623437336339376465333834663139656630633731383762313766 +66306437396437623938353734646161373534646362666639646138663264333830633332386130 +61616231346561346332326637373864303562626538313461386238626435356665373766303535 +3966 diff --git a/dan/sk-tomnext-nc.yml b/dan/sk-tomnext-nc.yml index b1cf028a..ff475fb9 100644 --- a/dan/sk-tomnext-nc.yml +++ b/dan/sk-tomnext-nc.yml @@ -15,3 +15,4 @@ - role: acmetool/base - role: nginx/base - role: apps/nextcloud + - role: apps/collabora/code diff --git a/inventory/host_vars/sk-tomnext-nc.yml b/inventory/host_vars/sk-tomnext-nc.yml index 4394db99..a163c35d 100644 --- a/inventory/host_vars/sk-tomnext-nc.yml +++ b/inventory/host_vars/sk-tomnext-nc.yml @@ -75,7 +75,7 @@ kubernetes_standalone_cni_variant: with-portmap acmetool_directory_server: "{{ acmetool_directory_server_le_live_v2 }}" - +nginx_server_names_hash_bucket_size: 64 nextcloud_zfs: pool: storage @@ -94,3 +94,17 @@ nextcloud_instances: type: mariadb version: 10.5.3 password: "{{ vault_nextcloud_database_passwords['team.tomwaitz.eu'] }}" + + +collabora_code_base_path: /srv/storage/collabora/code + +collabora_code_instances: + o.tomwaitz.eu: + version: 4.2.3.1 + port: 8200 + hostname: o.tomwaitz.eu + admin: + username: admin + password: "{{ vault_collabora_code_admin_passwords['o.tomwaitz.eu'] }}" + backend_storages: + - team.tomwaitz.eu -- cgit v1.2.3