Skip to content

Commit 2000d8f

Browse files
committed
liberal coding convetion
1 parent 90da0f8 commit 2000d8f

File tree

105 files changed

+316
-317
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+316
-317
lines changed

bin/v_add_db_base

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
#----------------------------------------------------------#
77

88
# Argument defenition
9-
user="$1"
9+
user=$1
1010
database="$user"_"$2"
1111
db_user="$user"_"$3"
12-
db_password="$4"
13-
type="$5"
12+
db_password=$4
13+
type=$5
1414
host=$6
15-
encoding="${7-UTF8}"
15+
encoding=${7-UTF8}
1616

1717
# Importing variables
1818
source $VESTA/conf/vars.conf
@@ -89,4 +89,4 @@ V_EVENT="$dt $V_SCRIPT $user $database $db_user ***** $type $host"
8989
log_history "$V_EVENT" "v_del_db_base $user $database"
9090
log_event 'system' "$V_EVENT"
9191

92-
exit $OK
92+
exit

bin/v_add_db_host

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
#----------------------------------------------------------#
77

88
# Argument defenition
9-
type="$1"
10-
host="$2"
11-
port="$3"
12-
db_user="$4"
13-
db_password="$5"
14-
max_usr="${6-300}"
15-
max_db="${7-300}"
16-
template="${8-template1}"
9+
type=$1
10+
host=$2
11+
port=$3
12+
db_user=$4
13+
db_password=$5
14+
max_usr=${6-300}
15+
max_db=${7-300}
16+
template=${8-template1}
1717

1818

1919
# Importing variables
@@ -81,4 +81,4 @@ V_EVENT=$(echo $V_EVENT | sed -e "s/$db_password/xxxxxx/g")
8181
# Logging
8282
log_event 'system' "$V_EVENT"
8383

84-
exit $OK
84+
exit

bin/v_add_dns_domain

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
#----------------------------------------------------------#
77

88
# Argument defenition
9-
user="$1"
9+
user=$1
1010
domain=$(idn -t --quiet -u "$2" )
1111
domain_idn=$(idn -t --quiet -a "$domain")
12-
ip="$3"
13-
template="${4-default}"
12+
ip=$3
13+
template=${4-default}
1414
next_year=$(date +%m-%d-%y -d "+ 1 year")
15-
exp="${5-$next_year}"
16-
soa="$6"
17-
ttl="${7-14400}"
15+
exp=${5-$next_year}
16+
soa=$6
17+
ttl=${7-14400}
1818

1919
# Importing variables
2020
source $VESTA/conf/vars.conf
@@ -117,4 +117,4 @@ restart_schedule 'dns'
117117
log_history "$V_EVENT" "v_del_dns_domain $user $domain"
118118
log_event 'system' "$V_EVENT"
119119

120-
exit $OK
120+
exit

bin/v_add_dns_domain_record

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
#----------------------------------------------------------#
77

88
# Argument defenition
9-
user="$1"
9+
user=$1
1010
domain=$(idn -t --quiet -u "$2" )
1111
domain_idn=$(idn -t --quiet -a "$domain")
1212
record=$(idn -t --quiet -u "$3" )
1313
rtype=$(echo "$4"| tr '[:lower:]' '[:upper:]')
1414
dvalue=$(idn -t --quiet -u "$5" )
15-
id="$6"
15+
id=$6
1616

1717
# Importing variables
1818
source $VESTA/conf/vars.conf
@@ -87,4 +87,4 @@ restart_schedule 'dns'
8787
log_history "$V_EVENT" "v_del_dns_domain_record $user $domain $id"
8888
log_event 'system' "$V_EVENT"
8989

90-
exit $OK
90+
exit

bin/v_add_ssl_certificate

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#----------------------------------------------------------#
77

88
# Argument defenition
9-
user="$1"
10-
cert="$2"
9+
user=$1
10+
cert=$2
1111

1212
# Importing variables
1313
source $VESTA/conf/vars.conf
@@ -54,4 +54,4 @@ mv $V_TMP/$cert.key $V_USERS/$user/cert/
5454
log_history "$V_EVENT" "v_del_ssl_certificate $user $cert"
5555
log_event 'system' "$V_EVENT"
5656

57-
exit $OK
57+
exit

bin/v_add_sys_cron

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
#----------------------------------------------------------#
77

88
# Argument defenition
9-
user="$1"
10-
min="$2"
11-
hour="$3"
12-
day="$4"
13-
month="$5"
14-
wday="$6"
15-
command="$7"
16-
job="$8"
9+
user=$1
10+
min=$2
11+
hour=$3
12+
day=$4
13+
month=$5
14+
wday=$6
15+
command=$7
16+
job=$8
1717

1818
# Importing variables
1919
source $VESTA/conf/vars.conf
@@ -79,4 +79,4 @@ restart_schedule 'cron'
7979
log_history "$V_EVENT" "v_del_sys_cron $user $job"
8080
log_event 'system' "$V_EVENT"
8181

82-
exit $OK
82+
exit

bin/v_add_sys_ip

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
#----------------------------------------------------------#
77

88
# Argument defenition
9-
ip="$1"
10-
mask="$2"
9+
ip=$1
10+
mask=$2
1111
interface="${3-eth0}"
1212
user="${4-vesta}"
1313
ip_status="${5-shared}"
14-
ip_name="$6"
14+
ip_name=$6
1515

1616
# Importing variables
1717
source $VESTA/conf/vars.conf
@@ -91,4 +91,4 @@ fi
9191
# Logging
9292
log_event 'system' "$V_EVENT"
9393

94-
exit $OK
94+
exit

bin/v_add_sys_user

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
#----------------------------------------------------------#
77

88
# Argument defenition
9-
user="$1"
10-
password="$2"
11-
email="$3"
12-
package="${4-default}"
9+
user=$1
10+
password=$2
11+
email=$3
12+
package=${4-default}
1313
fname=$5
1414
lname=$6
1515

@@ -154,4 +154,4 @@ V_EVENT="$dt $V_SCRIPT $user ***** $email $package $fname $lname"
154154
# Logging
155155
log_event 'system' "$V_EVENT"
156156

157-
exit $OK
157+
exit

bin/v_add_sys_user_reports

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#----------------------------------------------------------#
77

88
# Argument defenition
9-
user="$1"
9+
user=$1
1010

1111
# Importing variables
1212
source $VESTA/conf/vars.conf
@@ -56,4 +56,4 @@ restart_schedule 'cron'
5656
log_history "$V_EVENT" "v_del_sys_user_reports $user"
5757
log_event 'system' "$V_EVENT"
5858

59-
exit $OK
59+
exit

bin/v_add_web_domain

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
#----------------------------------------------------------#
77

88
# Argument defenition
9-
user="$1"
9+
user=$1
1010
domain=$(idn -t --quiet -u "$2" )
1111
domain_idn=$(idn -t --quiet -a "$domain")
12-
ip="$3"
12+
ip=$3
1313
template=${4-default}
1414

1515
# Importing variables
@@ -204,4 +204,4 @@ restart_schedule 'web'
204204
log_history "$V_EVENT" "v_del_web_domain $user $domain"
205205
log_event 'system' "$V_EVENT"
206206

207-
exit $OK
207+
exit

0 commit comments

Comments
 (0)