File tree Expand file tree Collapse file tree 2 files changed +9
-4
lines changed
java/io/antmedia/console/rest Expand file tree Collapse file tree 2 files changed +9
-4
lines changed Original file line number Diff line number Diff line change @@ -387,8 +387,7 @@ public Result authenticateUser(User user)
387
387
boolean result = false ;
388
388
if (tryToAuthenticate )
389
389
{
390
- result = getDataStore ().doesUserExist (user .getEmail (), user .getPassword ()) ||
391
- getDataStore ().doesUserExist (user .getEmail (), getMD5Hash (user .getPassword ()));
390
+ result = getDataStore ().doesUserExist (user .getEmail (), getMD5Hash (user .getPassword ()));
392
391
393
392
if (result )
394
393
{
Original file line number Diff line number Diff line change @@ -26,10 +26,11 @@ domain=""
26
26
password=
27
27
renew_flag=' false'
28
28
freedomain=" "
29
+ restart_service=' true' # if this is true, it restarts the service at the end of the script otherwise it does not
29
30
30
31
helpRequest=' false'
31
32
32
- while getopts i:d:v:p:e:f:rhc : option
33
+ while getopts i:d:v:p:e:f:rshc : option
33
34
do
34
35
case " ${option} " in
35
36
f) FULL_CHAIN_FILE=${OPTARG} ;;
41
42
r) renew_flag=' true' ;;
42
43
e) email=${OPTARG} ;;
43
44
h) helpRequest=' true' ;;
45
+ s) restart_service=${OPTARG} ;;
44
46
esac
45
47
done
46
48
@@ -505,9 +507,13 @@ ipt_restore
505
507
echo " "
506
508
507
509
if is_docker_container; then
510
+ echo " You are running Ant Media Server in a Docker container. Please restart the container to apply the changes."
508
511
kill -HUP 1
509
- else
512
+ elif [ " $restart_service " == " true" ]; then
513
+ echo " Restarting Ant Media Server..."
510
514
$SUDO service antmedia restart
515
+ else
516
+ echo " Ant Media Server is not restarted because script is called just to install the ssl. Please restart it manually to apply the changes."
511
517
fi
512
518
513
519
output
You can’t perform that action at this time.
0 commit comments