From d3bf8512ec09050362a4ce02c411fab47e4156f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= Date: Mon, 11 Jan 2021 12:01:04 +0100 Subject: [PATCH] 'unbrand' evilham's jitsi types --- .../prometheus-jitsi-meet-explorer-version | 0 .../files/debconf_settings.sh | 0 .../files/ufw | 0 .../gencode-remote | 0 .../man.rst | 14 +++++++------- .../manifest | 0 .../parameter/boolean | 0 .../parameter/default/turn-server | 0 .../parameter/optional | 0 .../singleton | 0 .../files/config.js.sh | 0 .../files/config.js.sh.orig | 0 .../files/nginx.sh | 0 .../files/nginx.sh.orig | 0 .../gencode-remote | 0 .../man.rst | 17 ++++++++--------- .../manifest | 0 .../parameter/boolean | 0 .../parameter/default/branding-index | 0 .../parameter/default/branding-json | 0 .../parameter/default/branding-watermark | 0 .../parameter/default/channel-last-n | 0 .../parameter/default/default-language | 0 .../parameter/default/notice-message | 0 .../parameter/default/start-video-muted | 0 .../parameter/default/turn-server | 0 .../parameter/default/video-constraints | 0 .../parameter/optional | 0 .../parameter/required | 0 29 files changed, 15 insertions(+), 16 deletions(-) rename type/{__evilham_jitsi_meet => __jitsi_meet}/explorer/prometheus-jitsi-meet-explorer-version (100%) rename type/{__evilham_jitsi_meet => __jitsi_meet}/files/debconf_settings.sh (100%) rename type/{__evilham_jitsi_meet => __jitsi_meet}/files/ufw (100%) rename type/{__evilham_jitsi_meet => __jitsi_meet}/gencode-remote (100%) rename type/{__evilham_jitsi_meet => __jitsi_meet}/man.rst (82%) rename type/{__evilham_jitsi_meet => __jitsi_meet}/manifest (100%) rename type/{__evilham_jitsi_meet => __jitsi_meet}/parameter/boolean (100%) rename type/{__evilham_jitsi_meet => __jitsi_meet}/parameter/default/turn-server (100%) rename type/{__evilham_jitsi_meet => __jitsi_meet}/parameter/optional (100%) rename type/{__evilham_jitsi_meet => __jitsi_meet}/singleton (100%) rename type/{__evilham_jitsi_meet_domain => __jitsi_meet_domain}/files/config.js.sh (100%) rename type/{__evilham_jitsi_meet_domain => __jitsi_meet_domain}/files/config.js.sh.orig (100%) rename type/{__evilham_jitsi_meet_domain => __jitsi_meet_domain}/files/nginx.sh (100%) rename type/{__evilham_jitsi_meet_domain => __jitsi_meet_domain}/files/nginx.sh.orig (100%) rename type/{__evilham_jitsi_meet_domain => __jitsi_meet_domain}/gencode-remote (100%) rename type/{__evilham_jitsi_meet_domain => __jitsi_meet_domain}/man.rst (87%) rename type/{__evilham_jitsi_meet_domain => __jitsi_meet_domain}/manifest (100%) rename type/{__evilham_jitsi_meet_domain => __jitsi_meet_domain}/parameter/boolean (100%) rename type/{__evilham_jitsi_meet_domain => __jitsi_meet_domain}/parameter/default/branding-index (100%) rename type/{__evilham_jitsi_meet_domain => __jitsi_meet_domain}/parameter/default/branding-json (100%) rename type/{__evilham_jitsi_meet_domain => __jitsi_meet_domain}/parameter/default/branding-watermark (100%) rename type/{__evilham_jitsi_meet_domain => __jitsi_meet_domain}/parameter/default/channel-last-n (100%) rename type/{__evilham_jitsi_meet_domain => __jitsi_meet_domain}/parameter/default/default-language (100%) rename type/{__evilham_jitsi_meet_domain => __jitsi_meet_domain}/parameter/default/notice-message (100%) rename type/{__evilham_jitsi_meet_domain => __jitsi_meet_domain}/parameter/default/start-video-muted (100%) rename type/{__evilham_jitsi_meet_domain => __jitsi_meet_domain}/parameter/default/turn-server (100%) rename type/{__evilham_jitsi_meet_domain => __jitsi_meet_domain}/parameter/default/video-constraints (100%) rename type/{__evilham_jitsi_meet_domain => __jitsi_meet_domain}/parameter/optional (100%) rename type/{__evilham_jitsi_meet_domain => __jitsi_meet_domain}/parameter/required (100%) diff --git a/type/__evilham_jitsi_meet/explorer/prometheus-jitsi-meet-explorer-version b/type/__jitsi_meet/explorer/prometheus-jitsi-meet-explorer-version similarity index 100% rename from type/__evilham_jitsi_meet/explorer/prometheus-jitsi-meet-explorer-version rename to type/__jitsi_meet/explorer/prometheus-jitsi-meet-explorer-version diff --git a/type/__evilham_jitsi_meet/files/debconf_settings.sh b/type/__jitsi_meet/files/debconf_settings.sh similarity index 100% rename from type/__evilham_jitsi_meet/files/debconf_settings.sh rename to type/__jitsi_meet/files/debconf_settings.sh diff --git a/type/__evilham_jitsi_meet/files/ufw b/type/__jitsi_meet/files/ufw similarity index 100% rename from type/__evilham_jitsi_meet/files/ufw rename to type/__jitsi_meet/files/ufw diff --git a/type/__evilham_jitsi_meet/gencode-remote b/type/__jitsi_meet/gencode-remote similarity index 100% rename from type/__evilham_jitsi_meet/gencode-remote rename to type/__jitsi_meet/gencode-remote diff --git a/type/__evilham_jitsi_meet/man.rst b/type/__jitsi_meet/man.rst similarity index 82% rename from type/__evilham_jitsi_meet/man.rst rename to type/__jitsi_meet/man.rst index b97130b..3d02346 100644 --- a/type/__evilham_jitsi_meet/man.rst +++ b/type/__jitsi_meet/man.rst @@ -1,10 +1,10 @@ -cdist-type__evilham_jitsi_meet(7) +cdist-type__jitsi_meet(7) ================================= NAME ---- -cdist-type__evilham_jitsi_meet - Setup the server-side of Jitsi-Meet. +cdist-type__jitsi_meet - Setup the server-side of Jitsi-Meet. DESCRIPTION @@ -17,8 +17,8 @@ eXO's notes for installing and managing Jitsi Meet instances. This type also sets up nginx in a way that is compatible with `__letsencrypt_cert` and assumes that it will only serve Jitsi instances. -You will also need the `__evilham_jitsi_meet_domain` type in order to finish -setting up the web frontend (including TLS certificates) and its settings. +You will also need the `__jitsi_meet_domain` type in order to finish setting up +the web frontend (including TLS certificates) and its settings. You may want to use the `files/ufw` example manifest for a `__ufw`-based firewall compatible with this type. @@ -60,17 +60,17 @@ EXAMPLES .. code-block:: sh # Setup the firewall - . "${__global}/type/__evilham_jitsi_meet/files/ufw" + . "${__global}/type/__jitsi_meet/files/ufw" export require="__ufw" # Setup Jitsi on this host - __evilham_jitsi_meet \ + __jitsi_meet \ --turn-server "turn.exo.cat" \ --turn-secret "WeNeedGoodSecurity" SEE ALSO -------- -- `__evilham_jitsi_meet_domain` +- `__jitsi_meet_domain` diff --git a/type/__evilham_jitsi_meet/manifest b/type/__jitsi_meet/manifest similarity index 100% rename from type/__evilham_jitsi_meet/manifest rename to type/__jitsi_meet/manifest diff --git a/type/__evilham_jitsi_meet/parameter/boolean b/type/__jitsi_meet/parameter/boolean similarity index 100% rename from type/__evilham_jitsi_meet/parameter/boolean rename to type/__jitsi_meet/parameter/boolean diff --git a/type/__evilham_jitsi_meet/parameter/default/turn-server b/type/__jitsi_meet/parameter/default/turn-server similarity index 100% rename from type/__evilham_jitsi_meet/parameter/default/turn-server rename to type/__jitsi_meet/parameter/default/turn-server diff --git a/type/__evilham_jitsi_meet/parameter/optional b/type/__jitsi_meet/parameter/optional similarity index 100% rename from type/__evilham_jitsi_meet/parameter/optional rename to type/__jitsi_meet/parameter/optional diff --git a/type/__evilham_jitsi_meet/singleton b/type/__jitsi_meet/singleton similarity index 100% rename from type/__evilham_jitsi_meet/singleton rename to type/__jitsi_meet/singleton diff --git a/type/__evilham_jitsi_meet_domain/files/config.js.sh b/type/__jitsi_meet_domain/files/config.js.sh similarity index 100% rename from type/__evilham_jitsi_meet_domain/files/config.js.sh rename to type/__jitsi_meet_domain/files/config.js.sh diff --git a/type/__evilham_jitsi_meet_domain/files/config.js.sh.orig b/type/__jitsi_meet_domain/files/config.js.sh.orig similarity index 100% rename from type/__evilham_jitsi_meet_domain/files/config.js.sh.orig rename to type/__jitsi_meet_domain/files/config.js.sh.orig diff --git a/type/__evilham_jitsi_meet_domain/files/nginx.sh b/type/__jitsi_meet_domain/files/nginx.sh similarity index 100% rename from type/__evilham_jitsi_meet_domain/files/nginx.sh rename to type/__jitsi_meet_domain/files/nginx.sh diff --git a/type/__evilham_jitsi_meet_domain/files/nginx.sh.orig b/type/__jitsi_meet_domain/files/nginx.sh.orig similarity index 100% rename from type/__evilham_jitsi_meet_domain/files/nginx.sh.orig rename to type/__jitsi_meet_domain/files/nginx.sh.orig diff --git a/type/__evilham_jitsi_meet_domain/gencode-remote b/type/__jitsi_meet_domain/gencode-remote similarity index 100% rename from type/__evilham_jitsi_meet_domain/gencode-remote rename to type/__jitsi_meet_domain/gencode-remote diff --git a/type/__evilham_jitsi_meet_domain/man.rst b/type/__jitsi_meet_domain/man.rst similarity index 87% rename from type/__evilham_jitsi_meet_domain/man.rst rename to type/__jitsi_meet_domain/man.rst index ea997f4..862701a 100644 --- a/type/__evilham_jitsi_meet_domain/man.rst +++ b/type/__jitsi_meet_domain/man.rst @@ -1,10 +1,10 @@ -cdist-type__evilham_jitsi_meet_domain(7) +cdist-type__jitsi_meet_domain(7) ======================================== NAME ---- -cdist-type__evilham_jitsi_meet_domain - Setup a frontend for Jitsi-Meet. +cdist-type__jitsi_meet_domain - Setup a frontend for Jitsi-Meet. DESCRIPTION @@ -20,9 +20,8 @@ This is due to the underlying XMPP and signaling rooms being common. There might be a way to perform tricks on the Nginx-side to avoid this, but time is lacking :-). -This assumes `__evilham_jitsi_meet` has already been ran on the target host, -and, amongst others, that Jitsi was set up with `__target_host` as the Jitsi -domain. +This assumes `__jitsi_meet` has already been ran on the target host, and, +amongst others, that Jitsi was set up with `__target_host` as the Jitsi domain. This type will take care of TLS settings, branding and client-side configuration for Jitsi. @@ -73,13 +72,13 @@ video-constraints this config's resolution value. Defaults to requesting an ideal resolution of 720p. It must not have a trailing comma, see `constraints` in - `__evilham_jitsi_meet_domain/files/config.js.sh`. + `__jitsi_meet_domain/files/config.js.sh`. branding-json Path to a JSON file that will be served as the `brandingDataUrl`. For information on the format see `brandingDataUrl` in - `__evilham_jitsi_meet_domain/files/config.js.sh`. + `__jitsi_meet_domain/files/config.js.sh`. If not set, no branding will be set up. @@ -114,7 +113,7 @@ EXAMPLES .. code-block:: sh # Setup a Jitsi frontend for jitsi.exo.cat - __evilham_jitsi_meet_domain "jitsi.exo.cat" \ + __jitsi_meet_domain "jitsi.exo.cat" \ --admin-email "info@exo.cat" \ --turn-server "turn.exo.cat" \ --notice-message "Hola!" \ @@ -137,7 +136,7 @@ EXAMPLES SEE ALSO -------- -- `__evilham_jitsi_meet` +- `__jitsi_meet` diff --git a/type/__evilham_jitsi_meet_domain/manifest b/type/__jitsi_meet_domain/manifest similarity index 100% rename from type/__evilham_jitsi_meet_domain/manifest rename to type/__jitsi_meet_domain/manifest diff --git a/type/__evilham_jitsi_meet_domain/parameter/boolean b/type/__jitsi_meet_domain/parameter/boolean similarity index 100% rename from type/__evilham_jitsi_meet_domain/parameter/boolean rename to type/__jitsi_meet_domain/parameter/boolean diff --git a/type/__evilham_jitsi_meet_domain/parameter/default/branding-index b/type/__jitsi_meet_domain/parameter/default/branding-index similarity index 100% rename from type/__evilham_jitsi_meet_domain/parameter/default/branding-index rename to type/__jitsi_meet_domain/parameter/default/branding-index diff --git a/type/__evilham_jitsi_meet_domain/parameter/default/branding-json b/type/__jitsi_meet_domain/parameter/default/branding-json similarity index 100% rename from type/__evilham_jitsi_meet_domain/parameter/default/branding-json rename to type/__jitsi_meet_domain/parameter/default/branding-json diff --git a/type/__evilham_jitsi_meet_domain/parameter/default/branding-watermark b/type/__jitsi_meet_domain/parameter/default/branding-watermark similarity index 100% rename from type/__evilham_jitsi_meet_domain/parameter/default/branding-watermark rename to type/__jitsi_meet_domain/parameter/default/branding-watermark diff --git a/type/__evilham_jitsi_meet_domain/parameter/default/channel-last-n b/type/__jitsi_meet_domain/parameter/default/channel-last-n similarity index 100% rename from type/__evilham_jitsi_meet_domain/parameter/default/channel-last-n rename to type/__jitsi_meet_domain/parameter/default/channel-last-n diff --git a/type/__evilham_jitsi_meet_domain/parameter/default/default-language b/type/__jitsi_meet_domain/parameter/default/default-language similarity index 100% rename from type/__evilham_jitsi_meet_domain/parameter/default/default-language rename to type/__jitsi_meet_domain/parameter/default/default-language diff --git a/type/__evilham_jitsi_meet_domain/parameter/default/notice-message b/type/__jitsi_meet_domain/parameter/default/notice-message similarity index 100% rename from type/__evilham_jitsi_meet_domain/parameter/default/notice-message rename to type/__jitsi_meet_domain/parameter/default/notice-message diff --git a/type/__evilham_jitsi_meet_domain/parameter/default/start-video-muted b/type/__jitsi_meet_domain/parameter/default/start-video-muted similarity index 100% rename from type/__evilham_jitsi_meet_domain/parameter/default/start-video-muted rename to type/__jitsi_meet_domain/parameter/default/start-video-muted diff --git a/type/__evilham_jitsi_meet_domain/parameter/default/turn-server b/type/__jitsi_meet_domain/parameter/default/turn-server similarity index 100% rename from type/__evilham_jitsi_meet_domain/parameter/default/turn-server rename to type/__jitsi_meet_domain/parameter/default/turn-server diff --git a/type/__evilham_jitsi_meet_domain/parameter/default/video-constraints b/type/__jitsi_meet_domain/parameter/default/video-constraints similarity index 100% rename from type/__evilham_jitsi_meet_domain/parameter/default/video-constraints rename to type/__jitsi_meet_domain/parameter/default/video-constraints diff --git a/type/__evilham_jitsi_meet_domain/parameter/optional b/type/__jitsi_meet_domain/parameter/optional similarity index 100% rename from type/__evilham_jitsi_meet_domain/parameter/optional rename to type/__jitsi_meet_domain/parameter/optional diff --git a/type/__evilham_jitsi_meet_domain/parameter/required b/type/__jitsi_meet_domain/parameter/required similarity index 100% rename from type/__evilham_jitsi_meet_domain/parameter/required rename to type/__jitsi_meet_domain/parameter/required