diff options
| -rw-r--r-- | dan/ele-jitsi.yml | 15 | ||||
| -rw-r--r-- | dan/host_vars/ele-jitsi.yml | 17 | ||||
| -rw-r--r-- | inventory/host_vars/ele-jitsi.yml | 39 | ||||
| -rw-r--r-- | inventory/hosts.ini | 3 | ||||
| -rw-r--r-- | roles/apps/jitsi/meet/defaults/main.yml | 4 | ||||
| -rw-r--r-- | roles/apps/jitsi/meet/templates/pod-spec.yml.j2 | 4 |
6 files changed, 80 insertions, 2 deletions
diff --git a/dan/ele-jitsi.yml b/dan/ele-jitsi.yml new file mode 100644 index 00000000..f5213032 --- /dev/null +++ b/dan/ele-jitsi.yml @@ -0,0 +1,15 @@ +--- +- name: Basic Setup + hosts: ele-jitsi + roles: + - role: apt-repo/base + - role: core/base + - role: core/sshd/base + - role: core/zsh + - role: core/ntp + - role: kubernetes/base + - role: kubernetes/standalone/base + - role: apt-repo/spreadspace + - role: acmetool/base + - role: nginx/base + - role: apps/jitsi/meet diff --git a/dan/host_vars/ele-jitsi.yml b/dan/host_vars/ele-jitsi.yml new file mode 100644 index 00000000..d71e3c55 --- /dev/null +++ b/dan/host_vars/ele-jitsi.yml @@ -0,0 +1,17 @@ +$ANSIBLE_VAULT;1.2;AES256;dan +34623034376362646263646135343634633661633838383032623565613333383532623530366538 +3035376538376264303234383335303232303462306137330a393738356537363239643466646533 +65343864643135643831323233336435373331366638396235306632646238623266663163653763 +3133323639393964620a373461303136623063346630316165636238616666326630346331366566 +61633131653666383038316630363130613337643830643031353337393230393035623239356261 +61633264643833643130316237333236636266333231636339353537353934353439336437633764 +62336330386237646339316330623634333230313263663338356134393033626230653764356663 +66666161623262613462343666393162623166363833653233333030613933633335643763323565 +37623266336562636561653632313134356261383533363436376434356264623030643437316235 +34353133343932653338656634613065316361396538323534656539383037663138333030323661 +31613265386333393961623465313132346662383530356366363862393262396238626666663531 +61353333313935636466656637633737343133303338343834646436613430643062356536343333 +36303761623731316633316164653339363861396436316136383861343065363863356562383932 +32616338353237323438616130386538306639626636346636303935623533323632386131613038 +36616230323834663266656465336138643538356365396533363764666165363833666534383166 +35376532386431396464 diff --git a/inventory/host_vars/ele-jitsi.yml b/inventory/host_vars/ele-jitsi.yml new file mode 100644 index 00000000..cb48b466 --- /dev/null +++ b/inventory/host_vars/ele-jitsi.yml @@ -0,0 +1,39 @@ +--- +install: + cloud: + credentials: + token: "{{ vault_hcloud_api_token }}" + +network: {} + +docker_storage: + type: lvm + vg: "{{ host_name }}" + lv: docker + size: 5G + fs: ext4 + +kubelet_storage: + type: lvm + vg: "{{ host_name }}" + lv: kubelet + size: 5G + fs: ext4 + + +acmetool_directory_server: "{{ acmetool_directory_server_le_live_v2 }}" + + +kubernetes_version: 1.21.2 +kubernetes_container_runtime: docker +kubernetes_standalone_max_pods: 100 +kubernetes_standalone_pod_cidr: 192.168.255.0/24 +kubernetes_standalone_cni_variant: with-portmap + + +jitsi_meet_version: stable-5963 +jitsi_meet_hostname: remote.elev8.at + +jitsi_meet_p2p_enable: no + +jitsi_meet_secrets: "{{ vault_jitsi_meet_secrets }}" diff --git a/inventory/hosts.ini b/inventory/hosts.ini index c0c37138..d6d9624a 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -231,6 +231,7 @@ ele-tub ele-gwhetzner ele-mur ele-coturn +ele-jitsi [elevate:children] ele-ap @@ -389,6 +390,7 @@ sk-tomnext ch-mimas2 ele-lt ele-coturn +ele-jitsi glt-coturn glt-jitsi glt-stream @@ -447,6 +449,7 @@ k8s-chtest sk-cloudio ele-thetys ele-coturn +ele-jitsi lw-thetys s2-thetys sk-tomnext-nc diff --git a/roles/apps/jitsi/meet/defaults/main.yml b/roles/apps/jitsi/meet/defaults/main.yml index 527f39b9..c27726f0 100644 --- a/roles/apps/jitsi/meet/defaults/main.yml +++ b/roles/apps/jitsi/meet/defaults/main.yml @@ -1,7 +1,7 @@ --- jitsi_meet_base_path: /srv/jitsi/meet -# jitsi_meet_version: 4101-2 +# jitsi_meet_version: stable-5963 jitsi_meet_inst_name: "{{ jitsi_meet_hostname }}" # jitsi_meet_hostname: meet.example.com @@ -14,6 +14,6 @@ jitsi_meet_timezone: Europe/Vienna ### generate these using: openssl rand -hex 16 # jitsi_meet_secrets: -# jicofo_component_secret: "" +# jicofo_component_secret: "" ### only needed for versions older than stable-5765-1 # jicofo_auth_password: "" # jvb_auth_password: "" diff --git a/roles/apps/jitsi/meet/templates/pod-spec.yml.j2 b/roles/apps/jitsi/meet/templates/pod-spec.yml.j2 index 43eb0806..d7a0f7e4 100644 --- a/roles/apps/jitsi/meet/templates/pod-spec.yml.j2 +++ b/roles/apps/jitsi/meet/templates/pod-spec.yml.j2 @@ -33,8 +33,10 @@ containers: - name: XMPP_INTERNAL_MUC_DOMAIN value: internal-muc.meet.jitsi +{% if 'jicofo_component_secret' in jitsi_meet_secrets %} - name: JICOFO_COMPONENT_SECRET value: "{{ jitsi_meet_secrets.jicofo_component_secret }}" +{% endif %} - name: JICOFO_AUTH_USER value: focus - name: JICOFO_AUTH_PASSWORD @@ -75,8 +77,10 @@ containers: - name: XMPP_INTERNAL_MUC_DOMAIN value: internal-muc.meet.jitsi +{% if 'jicofo_component_secret' in jitsi_meet_secrets %} - name: JICOFO_COMPONENT_SECRET value: "{{ jitsi_meet_secrets.jicofo_component_secret }}" +{% endif %} - name: JICOFO_AUTH_USER value: focus - name: JICOFO_AUTH_PASSWORD |