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 10 additions and 11 deletions
Showing only changes of commit 5cfbacbfd5 - Show all commits

View File

@ -6,7 +6,6 @@ Bash installer for Jibri on **\*buntu LTS** based systems using **nginx** as def
* Valid domain with DNS record, **mandatory** for SSL certs via Let's Encrypt.
* Ports open for ACME (SSL) interaction & validation.
* Minimum recommended for video recording: 8 GB RAM / 2 Cores.
* Dropbox developer App key & redirect url configured (if you choose to enable Dropbox upload).
* Webcam
## Features

View File

@ -309,16 +309,16 @@ elif [ $ENABLE_SSL = yes ]; then
echo "SSL will be enabled."
fi
done
#Dropbox
while [[ $ENABLE_DB != yes && $ENABLE_DB != no ]]
do
read -p "> Do you want to setup the Dropbox feature now: (yes or no)"$'\n' -r ENABLE_DB
if [ $ENABLE_DB = no ]; then
echo "Dropbox won't be enable"
elif [ $ENABLE_DB = yes ]; then
read -p "Please set your Drobbox App key: "$'\n' -r DB_CID
fi
done
#Dropbox -- no longer requirement for localrecording
#while [[ $ENABLE_DB != yes && $ENABLE_DB != no ]]
#do
#read -p "> Do you want to setup the Dropbox feature now: (yes or no)"$'\n' -r ENABLE_DB
#if [ $ENABLE_DB = no ]; then
# echo "Dropbox won't be enable"
#elif [ $ENABLE_DB = yes ]; then
# read -p "Please set your Drobbox App key: "$'\n' -r DB_CID
#fi
#done
#Brandless Mode
while [[ $ENABLE_BLESSM != yes && $ENABLE_BLESSM != no ]]
do