Skip to content

Commit 4965cb1

Browse files
committed
Fix format
1 parent 328602b commit 4965cb1

File tree

1 file changed

+47
-49
lines changed

1 file changed

+47
-49
lines changed

bin/v-import-cpanel

Lines changed: 47 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ if [ ! -e /usr/bin/rsync ] || [ ! -e /usr/bin/file ]; then
3131
echo "rsync not installed, try install it"
3232
echo "This script need: rsync, file"
3333
echo "#######################################"
34-
echo "Run: apt-get install rsync file"
34+
echo "Run: apt-get install rsync file"
3535
exit 3
3636
fi
3737

@@ -275,27 +275,25 @@ fi
275275

276276
# Parked domains
277277
if [ -s pds ]; then
278-
cat pds | while read parked
279-
do
280-
echo "Procesing parked domain: $parked"
281-
parkedfor=$(cat userdata/cache.json | jq --arg domain "$parked" '.[$domain][3]' |sed 's/"//g')
282-
$BIN/v-add-web-domain-alias $new_user $parkedfor $parked
283-
done
278+
cat pds | while read parked; do
279+
echo "Procesing parked domain: $parked"
280+
parkedfor=$(cat userdata/cache.json | jq --arg domain "$parked" '.[$domain][3]' | sed 's/"//g')
281+
$BIN/v-add-web-domain-alias $new_user $parkedfor $parked
282+
done
284283
else
285284

286-
echo "No parked domains found"
285+
echo "No parked domains found"
287286

288287
fi
289288

290289
# Try SSL
291290
tput setaf 2
292-
echo "Copy SSL files"
291+
echo "Copy SSL files"
293292
tput sgr0
294-
for ssl_domain in apache_tls/*
295-
do
296-
domain=$(echo $ssl_domain | awk -F '/' '{ print $2 }')
297-
mkdir -p apache_tls/ssl/$domain
298-
awk -v RS="-----BEGIN CERTIFICATE-----" -v ssl_domain="$domain" '
293+
for ssl_domain in apache_tls/*; do
294+
domain=$(echo $ssl_domain | awk -F '/' '{ print $2 }')
295+
mkdir -p apache_tls/ssl/$domain
296+
awk -v RS="-----BEGIN CERTIFICATE-----" -v ssl_domain="$domain" '
299297
NR==1 {
300298
cert_file = "apache_tls/ssl/" ssl_domain "/" ssl_domain ".key";
301299
print $0 > cert_file;
@@ -310,7 +308,7 @@ do
310308
cert_file = "apache_tls/ssl/" ssl_domain "/" ssl_domain ".ca";
311309
print "-----BEGIN CERTIFICATE-----" $0 > cert_file;
312310
} ' $ssl_domain
313-
$BIN/v-add-web-domain-ssl $new_user $domain apache_tls/ssl/${domain}/
311+
$BIN/v-add-web-domain-ssl $new_user $domain apache_tls/ssl/${domain}/
314312
done
315313

316314
##################
@@ -325,13 +323,13 @@ for folder in *; do
325323
if [ -d "$folder" ]; then
326324
if [[ "$folder" != "cur" && "$folder" != "new" && "$folder" != "tmp" ]]; then
327325
echo "Domain: $folder"
328-
# This is needed as parked domains have emails but not added
329-
if ! $BIN/v-list-mail-domains $new_user plain | awk '{ print $1 }' |grep "^${folder}$"; then
330-
tput setaf 3
331-
echo "Found Parked domain $folder not added in hestia mail, adding..."
332-
tput sgr0
333-
$BIN/v-add-mail-domain $new_user $folder
334-
fi
326+
# This is needed as parked domains have emails but not added
327+
if ! $BIN/v-list-mail-domains $new_user plain | awk '{ print $1 }' | grep "^${folder}$"; then
328+
tput setaf 3
329+
echo "Found Parked domain $folder not added in hestia mail, adding..."
330+
tput sgr0
331+
$BIN/v-add-mail-domain $new_user $folder
332+
fi
335333
cd $folder
336334

337335
mail_account_count=$(find . -maxdepth 1 -mindepth 1 -type d \( ! -name cur ! -name new ! -name tmp \) | wc -l)
@@ -433,33 +431,33 @@ if [ -f "$CRON_FILE" ] && [ -s "$CRON_FILE" ]; then
433431
dow=$(echo "$cron_job" | awk '{print $5}')
434432
cmd=$(echo "$cron_job" | awk '{for (i=6; i<=NF; i++) printf $i " "; print ""}')
435433
#This try fix PHP crons converting cpanel paths to hestia paths
436-
if [[ $cmd =~ "ea-php" ]]; then
437-
EAPHP=$(echo $cmd | awk '{ print $1 }')
438-
# /opt/cpanel/ea-php70/root/bin/php
439-
# /usr/local/bin/ea-php70
440-
# default hestia /usr/bin/php
441-
DEFAULT_PHP="/usr/bin/php"
442-
vPHP="ea-php71 ea-php72 ea-php73 ea-php74 ea-php80 ea-php81 ea-php82 ea-php83"
443-
EAOPT="opt/cpanel/ea-php"
444-
EABIN="usr/local/bin/ea"
445-
if [[ $EAPHP =~ $EAOPT ]]; then
446-
EAVERSION=$( echo $EAPHP |awk -F '/' '{ print $4}')
447-
elif [[ $EAPHP =~ $EABIN ]]; then
448-
EAVERSION=$( echo $EAPHP |awk -F '/' '{ print $5}')
449-
else
450-
echo "Diferent EA Path"
451-
fi
452-
vPHP=$(echo $EAVERSION | sed "s/ea-php//")
453-
N1=${vPHP:0:1}
454-
N2=${vPHP:1:1}
455-
vPHP=$(echo /usr/bin/php${N1}.${N2})
456-
457-
if [ -e $vPHP ]; then
458-
cmd=$(echo $cmd | sed "s#$EAPHP#$vPHP#")
459-
else
460-
cmd=$(echo $cmd | sed "s#$EAPHP#$DEFAULT_PHP#")
461-
fi
462-
fi
434+
if [[ $cmd =~ "ea-php" ]]; then
435+
EAPHP=$(echo $cmd | awk '{ print $1 }')
436+
# /opt/cpanel/ea-php70/root/bin/php
437+
# /usr/local/bin/ea-php70
438+
# default hestia /usr/bin/php
439+
DEFAULT_PHP="/usr/bin/php"
440+
vPHP="ea-php71 ea-php72 ea-php73 ea-php74 ea-php80 ea-php81 ea-php82 ea-php83"
441+
EAOPT="opt/cpanel/ea-php"
442+
EABIN="usr/local/bin/ea"
443+
if [[ $EAPHP =~ $EAOPT ]]; then
444+
EAVERSION=$(echo $EAPHP | awk -F '/' '{ print $4}')
445+
elif [[ $EAPHP =~ $EABIN ]]; then
446+
EAVERSION=$(echo $EAPHP | awk -F '/' '{ print $5}')
447+
else
448+
echo "Diferent EA Path"
449+
fi
450+
vPHP=$(echo $EAVERSION | sed "s/ea-php//")
451+
N1=${vPHP:0:1}
452+
N2=${vPHP:1:1}
453+
vPHP=$(echo /usr/bin/php${N1}.${N2})
454+
455+
if [ -e $vPHP ]; then
456+
cmd=$(echo $cmd | sed "s#$EAPHP#$vPHP#")
457+
else
458+
cmd=$(echo $cmd | sed "s#$EAPHP#$DEFAULT_PHP#")
459+
fi
460+
fi
463461
$BIN/v-add-cron-job $new_user "$min" "$hour" "$day" "$month" "$dow" "$cmd"
464462
done < "$CRON_FILE"
465463
echo "Cron jobs restored for user $new_user."

0 commit comments

Comments
 (0)