4.0 release merge #16

Merged
Ark74 merged 54 commits from unstable into master 2020-10-11 07:30:47 +00:00
1 changed files with 3 additions and 3 deletions
Showing only changes of commit e96a50e262 - Show all commits

View File

@ -218,7 +218,6 @@ So you can add a Jibri server on a instance with enough resources.\n"
read -p "> Do you want to disable local jibri service?: (yes or no)"$'\n' -r DISABLE_LOCAL_JIBRI read -p "> Do you want to disable local jibri service?: (yes or no)"$'\n' -r DISABLE_LOCAL_JIBRI
if [ "$DISABLE_LOCAL_JIBRI" = "no" ]; then if [ "$DISABLE_LOCAL_JIBRI" = "no" ]; then
echo "Please keep in mind that we might not support underpowered servers." echo "Please keep in mind that we might not support underpowered servers."
exit
elif [ "$DISABLE_LOCAL_JIBRI" = "yes" ]; then elif [ "$DISABLE_LOCAL_JIBRI" = "yes" ]; then
echo "You can add dedicated jibri nodes later, see more at the wiki." echo "You can add dedicated jibri nodes later, see more at the wiki."
fi fi
@ -968,9 +967,10 @@ systemctl enable jibri-xorg
systemctl enable jibri-icewm systemctl enable jibri-icewm
restart_services restart_services
if [ "$DISABLE_LOCAL_JIBRI" = "yes" ]; then if [ "$DISABLE_LOCAL_JIBRI" = "yes" ]; then
systemctl stop jibri* systemctl stop jibri*
systemctl disable jibri* systemctl disable jibri
systemctl disable jibri-xorg
systemctl disable jibri-icewm
fi fi
enable_letsencrypt enable_letsencrypt