From f93faa09c4aa4d890f1f02191771ed4cd3d49c19 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 12 Apr 2022 21:40:05 +0200 Subject: add 2 jitsi instances for glt 2022 --- inventory/host_vars/glt-jitsi.yml | 48 ------------------------------------- inventory/host_vars/glt-meet1.yml | 48 +++++++++++++++++++++++++++++++++++++ inventory/host_vars/glt-meet2.yml | 48 +++++++++++++++++++++++++++++++++++++ inventory/hosts.ini | 9 ++++--- spreadspace/glt-jitsi.yml | 15 ------------ spreadspace/glt-meet1.yml | 15 ++++++++++++ spreadspace/glt-meet2.yml | 15 ++++++++++++ spreadspace/host_vars/glt-jitsi.yml | 18 -------------- spreadspace/host_vars/glt-meet1.yml | 18 ++++++++++++++ spreadspace/host_vars/glt-meet2.yml | 18 ++++++++++++++ 10 files changed, 168 insertions(+), 84 deletions(-) delete mode 100644 inventory/host_vars/glt-jitsi.yml create mode 100644 inventory/host_vars/glt-meet1.yml create mode 100644 inventory/host_vars/glt-meet2.yml delete mode 100644 spreadspace/glt-jitsi.yml create mode 100644 spreadspace/glt-meet1.yml create mode 100644 spreadspace/glt-meet2.yml delete mode 100644 spreadspace/host_vars/glt-jitsi.yml create mode 100644 spreadspace/host_vars/glt-meet1.yml create mode 100644 spreadspace/host_vars/glt-meet2.yml diff --git a/inventory/host_vars/glt-jitsi.yml b/inventory/host_vars/glt-jitsi.yml deleted file mode 100644 index 1f2c104d..00000000 --- a/inventory/host_vars/glt-jitsi.yml +++ /dev/null @@ -1,48 +0,0 @@ ---- -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 - - -spreadspace_apt_repo_components: - - container - - -kubernetes_version: 1.23.3 -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_base_path: /srv/jitsi/meet - -jitsi_meet_version: stable-6865 -jitsi_meet_hostname: jitsi.linuxtage.at - -jitsi_meet_p2p_enable: no -jitsi_meet_require_display_name: yes - -jitsi_meet_secrets: "{{ vault_jitsi_meet_secrets }}" - -jitsi_meet_auth: - enable_guests: yes - users: - operator: "{{ vault_jitsi_meet_auth_user_passwords['operator'] }}" - -jitsi_meet_streamui: - http_port: "{{ jitsi_meet_http_port + 1 }}" -# http_auth: -# operator: "{{ vault_jitsi_meet_auth_user_passwords['operator'] }}" - image_tag: latest - default_control_room: glt diff --git a/inventory/host_vars/glt-meet1.yml b/inventory/host_vars/glt-meet1.yml new file mode 100644 index 00000000..acb742ac --- /dev/null +++ b/inventory/host_vars/glt-meet1.yml @@ -0,0 +1,48 @@ +--- +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 + + +spreadspace_apt_repo_components: + - container + + +kubernetes_version: 1.23.5 +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_base_path: /srv/jitsi/meet + +jitsi_meet_version: stable-6865 +jitsi_meet_hostname: meet1.linuxtage.at + +jitsi_meet_p2p_enable: no +jitsi_meet_require_display_name: yes + +jitsi_meet_secrets: "{{ vault_jitsi_meet_secrets }}" + +jitsi_meet_auth: + enable_guests: yes + users: + operator: "{{ vault_jitsi_meet_auth_user_passwords['operator'] }}" + +jitsi_meet_streamui: + http_port: "{{ jitsi_meet_http_port + 1 }}" +# http_auth: +# operator: "{{ vault_jitsi_meet_auth_user_passwords['operator'] }}" + image_tag: latest + default_control_room: glt diff --git a/inventory/host_vars/glt-meet2.yml b/inventory/host_vars/glt-meet2.yml new file mode 100644 index 00000000..576be483 --- /dev/null +++ b/inventory/host_vars/glt-meet2.yml @@ -0,0 +1,48 @@ +--- +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 + + +spreadspace_apt_repo_components: + - container + + +kubernetes_version: 1.23.5 +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_base_path: /srv/jitsi/meet + +jitsi_meet_version: stable-6865 +jitsi_meet_hostname: meet2.linuxtage.at + +jitsi_meet_p2p_enable: no +jitsi_meet_require_display_name: yes + +jitsi_meet_secrets: "{{ vault_jitsi_meet_secrets }}" + +jitsi_meet_auth: + enable_guests: yes + users: + operator: "{{ vault_jitsi_meet_auth_user_passwords['operator'] }}" + +jitsi_meet_streamui: + http_port: "{{ jitsi_meet_http_port + 1 }}" +# http_auth: +# operator: "{{ vault_jitsi_meet_auth_user_passwords['operator'] }}" + image_tag: latest + default_control_room: glt diff --git a/inventory/hosts.ini b/inventory/hosts.ini index dfd92646..74e37925 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -147,7 +147,8 @@ glt-live-tug [glt-live-misc] glt-coturn host_name=cdn13 -glt-jitsi host_name=jitsi +glt-meet1 host_name=meet1 +glt-meet2 host_name=meet2 glt-stream host_name=stream [glt-live-r3] @@ -458,7 +459,8 @@ ele-lt ele-coturn ele-jitsi glt-coturn -glt-jitsi +glt-meet1 +glt-meet2 glt-stream [hcloud:children] @@ -519,7 +521,8 @@ s2-thetys sk-tomnext-nc ch-thetys glt-coturn -glt-jitsi +glt-meet1 +glt-meet2 glt-dione glt-helene glt-calypso diff --git a/spreadspace/glt-jitsi.yml b/spreadspace/glt-jitsi.yml deleted file mode 100644 index 2faeb036..00000000 --- a/spreadspace/glt-jitsi.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -- name: Basic Setup - hosts: glt-jitsi - roles: - - role: apt-repo/base - - role: core/base - - role: core/sshd/base - - role: core/zsh - - role: core/ntp - - role: apt-repo/spreadspace - - role: kubernetes/base - - role: kubernetes/standalone/base - - role: acmetool/base - - role: nginx/base - - role: apps/jitsi/meet diff --git a/spreadspace/glt-meet1.yml b/spreadspace/glt-meet1.yml new file mode 100644 index 00000000..1bf4d1fb --- /dev/null +++ b/spreadspace/glt-meet1.yml @@ -0,0 +1,15 @@ +--- +- name: Basic Setup + hosts: glt-meet1 + roles: + - role: apt-repo/base + - role: core/base + - role: core/sshd/base + - role: core/zsh + - role: core/ntp + - role: apt-repo/spreadspace + - role: kubernetes/base + - role: kubernetes/standalone/base + - role: acmetool/base + - role: nginx/base + - role: apps/jitsi/meet diff --git a/spreadspace/glt-meet2.yml b/spreadspace/glt-meet2.yml new file mode 100644 index 00000000..b327d267 --- /dev/null +++ b/spreadspace/glt-meet2.yml @@ -0,0 +1,15 @@ +--- +- name: Basic Setup + hosts: glt-meet2 + roles: + - role: apt-repo/base + - role: core/base + - role: core/sshd/base + - role: core/zsh + - role: core/ntp + - role: apt-repo/spreadspace + - role: kubernetes/base + - role: kubernetes/standalone/base + - role: acmetool/base + - role: nginx/base + - role: apps/jitsi/meet diff --git a/spreadspace/host_vars/glt-jitsi.yml b/spreadspace/host_vars/glt-jitsi.yml deleted file mode 100644 index 86667d10..00000000 --- a/spreadspace/host_vars/glt-jitsi.yml +++ /dev/null @@ -1,18 +0,0 @@ -$ANSIBLE_VAULT;1.2;AES256;spreadspace -38643264333664393735346437303731653234353035363865353963336361643634633762666639 -6338623461386263643839663165636334663734613938650a316434383038633664383937643137 -64623034333732643461316163303138616633353666316433613738336235323530646233373437 -3562613134613365320a653863313838326237306566336339376136313332376634626135663239 -37303232653230306463346166376464316232386638306562653937323562666162366331646234 -35333666393563336164323566353738323861333965343965333438663032303131616265333039 -34656662366130316261306536613435393834366663343763643137633030303238613538613061 -31376531366338323730353366383130616630393635386164326662646566363331636430343338 -32393737396532313261323032613766313532383536636132643166656162333834333937626663 -64323937633738353838633565366666303438333766623331643766366333653534333838643864 -30363663643836663634326230616333626265666335633863326134626635346362346261383063 -66303539663335633265363737623966313665376265613638383265356635656662663965363234 -37313230633539333231343466653630353062636164373137383064333134633363343264656262 -32633361663466306638663463383362303365303662303663386234626234363163373162326630 -38383830313434306332393334306532313363646236336438316432633364323838316232653265 -37313334343232633634666564383666646237613634313439336236336335343466616630373337 -34393039613131656437303736353139346439663538323237643930343736323438 diff --git a/spreadspace/host_vars/glt-meet1.yml b/spreadspace/host_vars/glt-meet1.yml new file mode 100644 index 00000000..27359daf --- /dev/null +++ b/spreadspace/host_vars/glt-meet1.yml @@ -0,0 +1,18 @@ +$ANSIBLE_VAULT;1.2;AES256;spreadspace +37653436633131353132383533623834613061323731356639366330303961333434303162366130 +6566653037323333396333653663656230663066393531640a313764303365623038346430646238 +32333030613535373734303030633130626439616533613932353831383630313432646564323065 +3864393963666636630a626432373633636330636136656561366133303239363932626239373036 +61623336663032376331646131363937646261333065313263303536383339376232666162636335 +64666263326236336634343962663931353638363764383336303966343533343964636566646661 +63643262616234623565333966663437366332373763326339643963366132313936643836353362 +35326332373664366366313931366433353661353232646334656539636334376134383231653865 +65383632373264623666663933313261393330613465333861373237303964316431373434306364 +37373032646164383038346431383166306364343363313964633137353438303230343133323038 +35343633333038366136663237346465666631373062633534623163656564356632333938356163 +37353036333663383764343561623634363966346237663463393165363035383061323738653134 +37306638343065313033646431373661313965663562666438373536313630356661356561346130 +34306363333237316138303036633539373562626461343133663331643161396364386166626239 +63313165363634316661666634363532643161373962336139663731326666616131376562386534 +34343339376665633437303936313664663431643962333234323262653236646564666633313738 +61613434363536303061343330636534373037656433306437633663386362616535 diff --git a/spreadspace/host_vars/glt-meet2.yml b/spreadspace/host_vars/glt-meet2.yml new file mode 100644 index 00000000..3b1365eb --- /dev/null +++ b/spreadspace/host_vars/glt-meet2.yml @@ -0,0 +1,18 @@ +$ANSIBLE_VAULT;1.2;AES256;spreadspace +39373164353063616563316237643832396533373839663063383935633063396162353361393366 +3166353463373430616438393366376361376661313131300a333738353236646537656266633431 +36366432646531323738656533613366656264653362653563313432373334313265336265663332 +6631373831396661650a656539353939333435343332336161656430393632333033346633356362 +62383938323462623533383439643730356262393434316366613266383161336465366235653231 +64663366383664316531616264323939343461383134363063373066336462396566336337623232 +63326230313733373662363831326238616462653237303030653366653636373163383134383235 +34303261316362356661303964333539326163316430393836383866663433363834383761333933 +32373838653564393036376565323234333138653663323230353666653239323031383666326435 +39643736363533626262636434623239343231623631613236386265343136303761343839666464 +34623833656136653234393864303835363236663162316132353364653333386538316338346464 +64386533643036323738653965393132376334343435663461636466383239303339643137653263 +62383934326438303131333866623535333061626661633563636635653062663861613961333731 +66623130336362663162303835616162643837376462613135303034363463333535363235613634 +34616366336336323837313736326331633833303632653730323936393135396533346665306134 +66366362366539303332393365376535646666346234643134303435386539373638643733363432 +62363461663737333761313539373935613131373531656632376435613633313830 -- cgit v1.2.3