Skip to content

Commit 9a3c9b6

Browse files
committed
Merge branch 'master' of github.com:serghey-rodin/vesta
2 parents 85a4d02 + 2294a07 commit 9a3c9b6

File tree

79 files changed

+201
-90
lines changed

Some content is hidden

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

79 files changed

+201
-90
lines changed

bin/v_add_cron_job

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
# info: add cron job
3-
# arguments: user min hour day month wday command [job]
3+
# options: user min hour day month wday command [job]
44
#
55
# The function adds a job to cron daemon. When executing commands, any output
66
# is mailed to user's email if parameter REPORTS is set to 'yes'.
@@ -78,6 +78,9 @@ sync_cron_jobs
7878
# Vesta #
7979
#----------------------------------------------------------#
8080

81+
# Increasing cron value
82+
increase_user_value "$user" '$U_CRON_JOBS'
83+
8184
# Adding task to the vesta pipe
8285
restart_schedule 'cron'
8386

bin/v_add_db_base

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
# info: add database
3-
# arguments: user db db_user db_password type [host] [encoding]
3+
# options: user db db_user db_password type [host] [encoding]
44
#
55
# The function creates the database concatenating username and user_db.
66
# Supported yypes of databases you can get using v_list_sys_config script.

bin/v_add_db_host

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
# info: add new database server
3-
# arguments: type host port db_user db_password [max_db] [tpl]
3+
# options: type host port db_user db_password [max_db] [tpl]
44
#
55
# The function add new database server to the server pool. It supports local
66
# and remote database servers, which is useful for clusters. By adding a host

bin/v_add_dns_domain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
# info: add dns domain
3-
# arguments: user domain ip [template] [exp] [soa] [ttl]
3+
# options: user domain ip [template] [exp] [soa] [ttl]
44
#
55
# The function adds DNS zone with records defined in the template. If the exp
66
# argument isn't stated, the expiration date value will be set to next year.

bin/v_add_dns_domain_record

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
# info: add dns domain record
3-
# arguments: user domain record type value [id]
3+
# options: user domain record type value [id]
44
#
55
# The call is used for adding new DNS record. Complex records of TXT, MX and
66
# SRV types can be used by a filling in the 'value' argument. The function also

bin/v_add_sys_ip

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
#!/bin/bash
22
# info: add system ip address
3-
# arguments: ip mask [interface] [user] [ip_status] [ip_name]
3+
# options: ip mask [interface] [user] [ip_status] [ip_name]
44
#
5-
# The function adds ip address into a system including rc scripts.
5+
# The function adds ip address into a system. It also creates rc scripts. You
6+
# can specify ip name which will be used as root domain for temporary aliases.
7+
# For example, if you set a1.myhosting.com as name, each new domain created on
8+
# this ip will automaticaly receive alias $domain.a1.myhosting.com. Of course
9+
# you must have wildcard record *.a1.myhosting.com pointed to ip. This feature
10+
# is very handy when customer wants to test domain before dns migration.
611

712

813
#----------------------------------------------------------#

bin/v_add_user

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ U_WEB_SSL='0'
156156
U_DNS_DOMAINS='0'
157157
U_DATABASES='0'
158158
U_MAIL_DOMAINS='0'
159+
U_CRON_JOBS='0'
159160
DATE='$V_DATE'" > $V_USERS/$user/user.conf
160161

161162
# Hiding password

bin/v_change_cron_job

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
# info: change cron job
3-
# arguments: user job min hour day month wday command
3+
# options: user job min hour day month wday command
44
#
55
# The function is used for changing existing job. It fully replace job
66
# parameters with new one but with same id.

bin/v_change_db_password

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
# info: change database user password
3-
# arguments: user db_name db_password
3+
# options: user db_name db_password
44
#
55
# The function for changing database user password to a database. It uses the
66
# full name of database as argument.

bin/v_change_dns_domain_exp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
# info: change dns domain expiriation date
3-
# arguments: user domain exp
3+
# options: user domain exp
44
#
55
# The function of changing the term of expiration domain's registration. The
66
# serial number will be refreshed automatically during update.

0 commit comments

Comments
 (0)