6.4.1 #65

Merged
Ark74 merged 9 commits from unstable into master 2021-06-28 09:57:54 +00:00
1 changed files with 2 additions and 1 deletions
Showing only changes of commit ba838c7893 - Show all commits

View File

@ -63,6 +63,7 @@ GITHUB_RAW="https://raw.githubusercontent.com"
GIT_REPO="switnet-ltd/quick-jibri-installer" GIT_REPO="switnet-ltd/quick-jibri-installer"
TEST_JIBRI_ENV="$GITHUB_RAW/$GIT_REPO/unstable/tools/test-jibri-env.sh" TEST_JIBRI_ENV="$GITHUB_RAW/$GIT_REPO/unstable/tools/test-jibri-env.sh"
SHORT_ID="$(awk '{print substr($0,0,7)}' /etc/machine-id)" SHORT_ID="$(awk '{print substr($0,0,7)}' /etc/machine-id)"
JIBRI_XORG_CONF="/etc/jitsi/jibri/xorg-video-dummy.conf"
### 1_VAR_DEF ### 1_VAR_DEF
# sed limiters for add-jibri-node.sh variables # sed limiters for add-jibri-node.sh variables
@ -358,7 +359,7 @@ jibri {
] ]
} }
ffmpeg { ffmpeg {
resolution = $JIBRI_RES_CONF resolution = "$JIBRI_RES_CONF"
} }
chrome { chrome {
// The flags which will be passed to chromium when launching // The flags which will be passed to chromium when launching