Fix speeling and typos, rev1
This commit is contained in:
parent
e4afafc52f
commit
d4cd218a01
|
@ -539,7 +539,7 @@ systemctl daemon-reload
|
||||||
systemctl enable remote_jnsync.service
|
systemctl enable remote_jnsync.service
|
||||||
systemctl start remote_jnsync.service
|
systemctl start remote_jnsync.service
|
||||||
|
|
||||||
echo "Writting last node number..."
|
echo "Writing last node number..."
|
||||||
sed -i "$(var_dlim 0_VAR),$(var_dlim 1_VAR){s|LAST=.*|LAST=$ADDUP|}" add-jibri-node.sh
|
sed -i "$(var_dlim 0_VAR),$(var_dlim 1_VAR){s|LAST=.*|LAST=$ADDUP|}" add-jibri-node.sh
|
||||||
sed -i "$(var_dlim 0_LAST),$(var_dlim 1_LAST){s|LETS: .*|LETS: $(date -R)|}" add-jibri-node.sh
|
sed -i "$(var_dlim 0_LAST),$(var_dlim 1_LAST){s|LETS: .*|LETS: $(date -R)|}" add-jibri-node.sh
|
||||||
echo "Last file edition at: $(awk -F 'LETS:' '/LETS/{print$2}' add-jibri-node.sh|head -n1)"
|
echo "Last file edition at: $(awk -F 'LETS:' '/LETS/{print$2}' add-jibri-node.sh|head -n1)"
|
||||||
|
|
|
@ -309,7 +309,7 @@ ssh-keyscan -t rsa $MAIN_SRV_DOMAIN >> ~/.ssh/known_hosts
|
||||||
ssh $MJS_USER@$MAIN_SRV_DOMAIN sh -c "'cat >> .ssh/authorized_keys'" < /home/$NJN_USER/.ssh/id_rsa.pub
|
ssh $MJS_USER@$MAIN_SRV_DOMAIN sh -c "'cat >> .ssh/authorized_keys'" < /home/$NJN_USER/.ssh/id_rsa.pub
|
||||||
sudo su $NJN_USER -c "ssh-keyscan -t rsa $MAIN_SRV_DOMAIN >> /home/$NJN_USER/.ssh/known_hosts"
|
sudo su $NJN_USER -c "ssh-keyscan -t rsa $MAIN_SRV_DOMAIN >> /home/$NJN_USER/.ssh/known_hosts"
|
||||||
|
|
||||||
echo "Writting last node number..."
|
echo "Writing last node number..."
|
||||||
sed -i "$(var_dlim 0_VAR),$(var_dlim 1_VAR){s|LAST=.*|LAST=$ADDUP|}" add-jvb2-node.sh
|
sed -i "$(var_dlim 0_VAR),$(var_dlim 1_VAR){s|LAST=.*|LAST=$ADDUP|}" add-jvb2-node.sh
|
||||||
sed -i "$(var_dlim 0_LAST),$(var_dlim 1_LAST){s|LETS: .*|LETS: $(date -R)|}" add-jvb2-node.sh
|
sed -i "$(var_dlim 0_LAST),$(var_dlim 1_LAST){s|LETS: .*|LETS: $(date -R)|}" add-jvb2-node.sh
|
||||||
echo "Last file edition at: $(grep "LETS:" add-jvb2-node.sh|head -n1|awk -F'LETS:' '{print$2}')"
|
echo "Last file edition at: $(grep "LETS:" add-jvb2-node.sh|head -n1|awk -F'LETS:' '{print$2}')"
|
||||||
|
|
|
@ -9,7 +9,7 @@ do
|
||||||
case "${option}"
|
case "${option}"
|
||||||
in
|
in
|
||||||
m) MODE=${OPTARG};;
|
m) MODE=${OPTARG};;
|
||||||
\?) echo "Usage: sudo ./etherpad.sh [-m debug]" && exit;;
|
\?) echo "Usage: sudo ./etherpad-docker.sh [-m debug]" && exit;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
2
jm-bm.sh
2
jm-bm.sh
|
@ -43,7 +43,7 @@ fi
|
||||||
if [ ! -f "$REC_ICON_PATH" ];then
|
if [ ! -f "$REC_ICON_PATH" ];then
|
||||||
cp images/gnome_record.png "$REC_ICON_PATH"
|
cp images/gnome_record.png "$REC_ICON_PATH"
|
||||||
else
|
else
|
||||||
echo "recodring icon exists, skipping copying..."
|
echo "recording icon exists, skipping copying..."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#Custom / Remove icons
|
#Custom / Remove icons
|
||||||
|
|
|
@ -64,7 +64,7 @@ PUBLIC_IP="$(dig +short myip.opendns.com @resolver1.opendns.com)"
|
||||||
|
|
||||||
while [[ "$ANS_NCD" != "yes" ]]
|
while [[ "$ANS_NCD" != "yes" ]]
|
||||||
do
|
do
|
||||||
read -p "> Please set your domain (or subdmain) here for Nextcloud: (e.g.: cloud.domain.com)"$'\n' -r NC_DOMAIN
|
read -p "> Please set your domain (or subdomain) here for Nextcloud: (e.g.: cloud.domain.com)"$'\n' -r NC_DOMAIN
|
||||||
if [ -z "$NC_DOMAIN" ];then
|
if [ -z "$NC_DOMAIN" ];then
|
||||||
echo "-- This field is mandatory."
|
echo "-- This field is mandatory."
|
||||||
elif [ "$NC_DOMAIN" = "$DOMAIN" ]; then
|
elif [ "$NC_DOMAIN" = "$DOMAIN" ]; then
|
||||||
|
@ -105,7 +105,7 @@ while [ -z "$NC_PASS" ] || [ ${#NC_PASS} -lt 6 ]
|
||||||
do
|
do
|
||||||
read -p "Nextcloud user password: " -r NC_PASS
|
read -p "Nextcloud user password: " -r NC_PASS
|
||||||
if [ -z "$NC_PASS" ] || [ ${#NC_PASS} -lt 6 ]; then
|
if [ -z "$NC_PASS" ] || [ ${#NC_PASS} -lt 6 ]; then
|
||||||
echo -e "-- This field is mandatory. \nPlease make sure it's at least 6 caracters.\n"
|
echo -e "-- This field is mandatory. \nPlease make sure it's at least 6 characters.\n"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
#Enable HSTS
|
#Enable HSTS
|
||||||
|
|
|
@ -133,7 +133,7 @@ SELENIUM_GRID_DOCKER
|
||||||
docker-compose -f selenium.yml up -d
|
docker-compose -f selenium.yml up -d
|
||||||
|
|
||||||
echo -e "\n#=================== End of Seleniun Grid build ========================#\n"
|
echo -e "\n#=================== End of Seleniun Grid build ========================#\n"
|
||||||
echo -e "\nChange the values acording to you test requirements using something like;\n"
|
echo -e "\nChange the values according to you test requirements using something like;\n"
|
||||||
echo "cd /opt/jitsi-meet-torture
|
echo "cd /opt/jitsi-meet-torture
|
||||||
sudo bash /opt/jitsi-meet-torture/scripts/malleus.sh \\
|
sudo bash /opt/jitsi-meet-torture/scripts/malleus.sh \\
|
||||||
--conferences=1 \\
|
--conferences=1 \\
|
||||||
|
|
|
@ -62,7 +62,7 @@ do
|
||||||
if [ "$SETUP_TYPE" = "1" ]; then
|
if [ "$SETUP_TYPE" = "1" ]; then
|
||||||
echo "We'll setup a GC Projects from scratch"
|
echo "We'll setup a GC Projects from scratch"
|
||||||
elif [ "$SETUP_TYPE" = "2" ]; then
|
elif [ "$SETUP_TYPE" = "2" ]; then
|
||||||
echo "We'll setup only the proect and JSON key."
|
echo "We'll setup only the project and JSON key."
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
|
@ -206,7 +206,7 @@ if [ "$CPU_MIN" = "Y" ] && [ "$MEM_MIN" = "Y" ];then
|
||||||
"
|
"
|
||||||
else
|
else
|
||||||
echo "CPU ($(nproc --all))/RAM ($((mem_available/1024)) MiB) does NOT meet minimum recommended requirements!"
|
echo "CPU ($(nproc --all))/RAM ($((mem_available/1024)) MiB) does NOT meet minimum recommended requirements!"
|
||||||
echo "Even when you can use the videconference sessions, we advice to increase the resources in order to user Jibri."
|
echo "Even when you can use the videoconferencing sessions, we advice to increase the resources in order to user Jibri."
|
||||||
while [[ "$CONTINUE_LOW_RES" != "yes" && "$CONTINUE_LOW_RES" != "no" ]]
|
while [[ "$CONTINUE_LOW_RES" != "yes" && "$CONTINUE_LOW_RES" != "no" ]]
|
||||||
do
|
do
|
||||||
read -p "> Do you want to continue?: (yes or no)"$'\n' -r CONTINUE_LOW_RES
|
read -p "> Do you want to continue?: (yes or no)"$'\n' -r CONTINUE_LOW_RES
|
||||||
|
@ -250,7 +250,7 @@ So you can add a Jibri server on a instance with enough resources.\n"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#Check system oriented porpuse
|
#Check system oriented porpuse
|
||||||
echo "Cheking system oriented purpose...."
|
echo "Checking system oriented purpose...."
|
||||||
apt-get -yq2 update
|
apt-get -yq2 update
|
||||||
SYSTEM_DE="$(apt-cache search "ubuntu-(desktop|mate-desktop)"|awk '{print$1}'|xargs|sed 's|$| trisquel triskel trisquel-mini|')"
|
SYSTEM_DE="$(apt-cache search "ubuntu-(desktop|mate-desktop)"|awk '{print$1}'|xargs|sed 's|$| trisquel triskel trisquel-mini|')"
|
||||||
SYSTEM_DE_ARRAY=( $SYSTEM_DE )
|
SYSTEM_DE_ARRAY=( $SYSTEM_DE )
|
||||||
|
@ -283,7 +283,7 @@ while [[ "$LE_SSL" != "yes" && "$LE_SSL" != "no" ]]
|
||||||
do
|
do
|
||||||
read -p "> Do you plan to use Let's Encrypt SSL certs?: (yes or no)"$'\n' -r LE_SSL
|
read -p "> Do you plan to use Let's Encrypt SSL certs?: (yes or no)"$'\n' -r LE_SSL
|
||||||
if [ $LE_SSL = yes ]; then
|
if [ $LE_SSL = yes ]; then
|
||||||
echo "We'll defaul to Let's Encrypt SSL certs."
|
echo "We'll default to Let's Encrypt SSL certs."
|
||||||
else
|
else
|
||||||
echo "We'll let you choose later on for it.
|
echo "We'll let you choose later on for it.
|
||||||
Please be aware that a valid SSL cert is required for some features to work properly."
|
Please be aware that a valid SSL cert is required for some features to work properly."
|
||||||
|
@ -293,7 +293,7 @@ done
|
||||||
if [ "$LE_SSL" = "yes" ]; then
|
if [ "$LE_SSL" = "yes" ]; then
|
||||||
while [[ "$ANS_JD" != "yes" ]]
|
while [[ "$ANS_JD" != "yes" ]]
|
||||||
do
|
do
|
||||||
read -p "> Please set your domain (or subdmain) here: (e.g.: jitsi.domain.com)"$'\n' -r JITSI_DOMAIN
|
read -p "> Please set your domain (or subdomain) here: (e.g.: jitsi.domain.com)"$'\n' -r JITSI_DOMAIN
|
||||||
read -p "> Did you mean?: $JITSI_DOMAIN (yes or no)"$'\n' -r ANS_JD
|
read -p "> Did you mean?: $JITSI_DOMAIN (yes or no)"$'\n' -r ANS_JD
|
||||||
if [ "$ANS_JD" = "yes" ]; then
|
if [ "$ANS_JD" = "yes" ]; then
|
||||||
echo "Alright, let's use $JITSI_DOMAIN."
|
echo "Alright, let's use $JITSI_DOMAIN."
|
||||||
|
@ -529,7 +529,7 @@ done
|
||||||
#if [ $ENABLE_DB = no ]; then
|
#if [ $ENABLE_DB = no ]; then
|
||||||
# echo "Dropbox won't be enable"
|
# echo "Dropbox won't be enable"
|
||||||
#elif [ $ENABLE_DB = yes ]; then
|
#elif [ $ENABLE_DB = yes ]; then
|
||||||
# read -p "Please set your Drobbox App key: "$'\n' -r DB_CID
|
# read -p "Please set your Dropbox App key: "$'\n' -r DB_CID
|
||||||
#fi
|
#fi
|
||||||
#done
|
#done
|
||||||
#Brandless Mode
|
#Brandless Mode
|
||||||
|
@ -559,7 +559,7 @@ do
|
||||||
if [ "$ENABLE_CLOCP" = "yes" ]; then
|
if [ "$ENABLE_CLOCP" = "yes" ]; then
|
||||||
echo "Close page will be enabled."
|
echo "Close page will be enabled."
|
||||||
elif [ "$ENABLE_CLOCP" = "no" ]; then
|
elif [ "$ENABLE_CLOCP" = "no" ]; then
|
||||||
echo "Close page will be keept disabled."
|
echo "Close page will be kept disabled."
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
#Enable static avatar
|
#Enable static avatar
|
||||||
|
@ -687,7 +687,7 @@ if [ "$LE_SSL" = "yes" ]; then
|
||||||
|
|
||||||
echo "#Set and upgrade certbot PPA if posssible..."
|
echo "#Set and upgrade certbot PPA if posssible..."
|
||||||
if [ "$CERTBOT_REPO" = "certbot" ]; then
|
if [ "$CERTBOT_REPO" = "certbot" ]; then
|
||||||
echo -e "\nCerbot repository already on the system!\nChecking for updates...\n"
|
echo -e "\nCertbot repository already on the system!\nChecking for updates...\n"
|
||||||
apt-get -q2 update
|
apt-get -q2 update
|
||||||
apt-get -yq2 dist-upgrade
|
apt-get -yq2 dist-upgrade
|
||||||
elif [ "$(curl -s -o /dev/null -w "%{http_code}" $CERTBOT_REL_FILE )" == "200" ]; then
|
elif [ "$(curl -s -o /dev/null -w "%{http_code}" $CERTBOT_REL_FILE )" == "200" ]; then
|
||||||
|
|
|
@ -82,7 +82,7 @@ https://github.com/switnet-ltd/quick-jibri-installer/issues\n"
|
||||||
elif [ ! -f $CONF_JSON ] && \
|
elif [ ! -f $CONF_JSON ] && \
|
||||||
[ -f $JIBRI_CONF ] && \
|
[ -f $JIBRI_CONF ] && \
|
||||||
[ -f $JIBRI_CONF-dpkg-file ]; then
|
[ -f $JIBRI_CONF-dpkg-file ]; then
|
||||||
echo -e "\n> This jibri seems to be running the lastest configuration already, we'll exit...\n\nIf you think there maybe an error on checking you current jibri configuration.\nPlease report this to \
|
echo -e "\n> This jibri seems to be running the latest configuration already, we'll exit...\n\nIf you think there maybe an error on checking you current jibri configuration.\nPlease report this to \
|
||||||
https://github.com/switnet-ltd/quick-jibri-installer/issues\n"
|
https://github.com/switnet-ltd/quick-jibri-installer/issues\n"
|
||||||
exit
|
exit
|
||||||
elif [ -f $CONF_JSON ] && \
|
elif [ -f $CONF_JSON ] && \
|
||||||
|
@ -121,7 +121,7 @@ echo "$JB_NICKN"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#Backup and setup new conf file
|
#Backup and setup new conf file
|
||||||
echo -e "Backing up config.json for historical porpuses at:\n ${CONF_JSON}_disabled"
|
echo -e "Backing up config.json for historical purposes at:\n ${CONF_JSON}_disabled"
|
||||||
mv $CONF_JSON ${CONF_JSON}_disabled
|
mv $CONF_JSON ${CONF_JSON}_disabled
|
||||||
|
|
||||||
mv $JIBRI_CONF ${JIBRI_CONF}-dpkg-file
|
mv $JIBRI_CONF ${JIBRI_CONF}-dpkg-file
|
||||||
|
|
|
@ -107,7 +107,7 @@ else
|
||||||
cp /tmp/jibri/opt/jitsi/jibri/jibri.jar $JIBRI_OPT/jibri.jar
|
cp /tmp/jibri/opt/jitsi/jibri/jibri.jar $JIBRI_OPT/jibri.jar
|
||||||
CLEAN="true"
|
CLEAN="true"
|
||||||
else
|
else
|
||||||
echo "Wow, someone took the time to avoid restauration, please manually review your changes."
|
echo "Wow, someone took the time to avoid restoration, please manually review your changes."
|
||||||
echo "Exiting..."
|
echo "Exiting..."
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -52,7 +52,7 @@ echo -e '
|
||||||
|
|
||||||
SYNC_USER="$(ls /home|awk '/jbsync/{print}')"
|
SYNC_USER="$(ls /home|awk '/jbsync/{print}')"
|
||||||
|
|
||||||
echo "We are about to remove and clean all the jitsi-meet plaform bits and pieces...
|
echo "We are about to remove and clean all the jitsi-meet platform bits and pieces...
|
||||||
Please make sure you have backed up anything you don't want to loose."
|
Please make sure you have backed up anything you don't want to loose."
|
||||||
|
|
||||||
echo "
|
echo "
|
||||||
|
|
|
@ -124,7 +124,7 @@ if [ ! -z "$CHD_VER_LOCAL" ] && [ ! -z "$GOOGL_VER_LOCAL" ]; then
|
||||||
chmod 0755 $CHDB
|
chmod 0755 $CHDB
|
||||||
rm -rf /tpm/chromedriver_linux64.zip
|
rm -rf /tpm/chromedriver_linux64.zip
|
||||||
if [ "$($CHDB -v | awk '{print $2}'|cut -d "." -f 1,2)" = "$GOOGL_VER_2D" ]; then
|
if [ "$($CHDB -v | awk '{print $2}'|cut -d "." -f 1,2)" = "$GOOGL_VER_2D" ]; then
|
||||||
echo "Successfull update"
|
echo "Successful update"
|
||||||
T3=1
|
T3=1
|
||||||
else
|
else
|
||||||
echo "Something might gone wrong on the update process, please report."
|
echo "Something might gone wrong on the update process, please report."
|
||||||
|
@ -195,7 +195,7 @@ T6=1
|
||||||
elif [ ! -f $CONF_JSON ] && \
|
elif [ ! -f $CONF_JSON ] && \
|
||||||
[ -f $JIBRI_CONF ] && \
|
[ -f $JIBRI_CONF ] && \
|
||||||
[ -f ${JIBRI_CONF}-dpkg-file ]; then
|
[ -f ${JIBRI_CONF}-dpkg-file ]; then
|
||||||
echo -e "\n> This jibri seems to be running the lastest configuration already. \xE2\x9C\x94 \n\nIf you think there maybe an error on checking you current jibri configuration.\nPlease report this to \
|
echo -e "\n> This jibri seems to be running the latest configuration already. \xE2\x9C\x94 \n\nIf you think there maybe an error on checking you current jibri configuration.\nPlease report this to \
|
||||||
https://github.com/switnet-ltd/quick-jibri-installer/issues\n"
|
https://github.com/switnet-ltd/quick-jibri-installer/issues\n"
|
||||||
T6=1
|
T6=1
|
||||||
elif [ -f ${CONF_JSON} ] && \
|
elif [ -f ${CONF_JSON} ] && \
|
||||||
|
|
Loading…
Reference in New Issue