Merge and track latest features on stable #6

Merged
Ark74 merged 71 commits from unstable into master 2020-08-08 06:41:50 +00:00
2 changed files with 3 additions and 1 deletions
Showing only changes of commit 7517f2f4a0 - Show all commits

1
.gitignore vendored
View File

@ -0,0 +1 @@
qj-installer.log

View File

@ -761,12 +761,13 @@ if [ $ENABLE_NC_ACCESS = yes ]; then
echo "Jigasi Transcription will be enabled."
bash $PWD/jra_nextcloud.sh
fi
} > >(tee -a qj-installer.log) 2> >(tee -a qj-installer.log >&2)
#Jigasi Transcript
if [ $ENABLE_TRANSCRIPT = yes ]; then
echo "Jigasi Transcription will be enabled."
bash $PWD/jigasi.sh
fi
{
#Prevent Jibri conecction issue
sed -i "/127.0.0.1/a \\
127.0.0.1 $DOMAIN" /etc/hosts