diff --git a/bin/v-add-cron-job b/bin/v-add-cron-job index fd94c5b8e..08784e1f5 100755 --- a/bin/v-add-cron-job +++ b/bin/v-add-cron-job @@ -1,6 +1,6 @@ #!/bin/bash # info: add cron job -# options: user min hour day month wday command [job] +# options: USER MIN HOUR DAY MONTH WDAY COMMAND [JOB] # # The function adds a job to cron daemon. When executing commands, any output # is mailed to user's email if parameter REPORTS is set to 'yes'. @@ -32,7 +32,7 @@ A7="$command" # Verifications # #----------------------------------------------------------# -check_args '7' "$#" 'user min hour day month wday command [job]' +check_args '7' "$#" 'USER MIN HOUR DAY MONTH WDAY COMMAND [JOB]' validate_format 'user' 'min' 'hour' 'day' 'month' 'wday' 'command' is_system_enabled $CRON_SYSTEM is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-add-cron-report b/bin/v-add-cron-report index fa1c0edc0..fd969bd6a 100755 --- a/bin/v-add-cron-report +++ b/bin/v-add-cron-report @@ -22,7 +22,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user' +check_args '1' "$#" 'USER' validate_format 'user' is_system_enabled "$CRON_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-add-database b/bin/v-add-database index df474d4a0..923a48a5c 100755 --- a/bin/v-add-database +++ b/bin/v-add-database @@ -1,6 +1,6 @@ #!/bin/bash # info: add database -# options: user database dbuser dbpass type [host] [charset] +# options: USER DATABASE DBUSER DBPASS TYPE [HOST] [CHARSET] # # The function creates the database concatenating username and user_db. # Supported yypes of databases you can get using v-list-sys-config script. @@ -40,7 +40,7 @@ EVENT="$EVENT A4='$A4' A5='$A5' A6='$A6' A7='$A7' A8='$A8' A9='$A9'" # Verifications # #----------------------------------------------------------# -check_args '5' "$#" 'user database dbuser dbpass type [host] [charset]' +check_args '5' "$#" 'USER DATABASE DBUSER DBPASS TYPE [HOST] [CHARSET]' validate_format 'user' 'database' 'dbuser' 'dbpass' 'charset' is_system_enabled "$DB_SYSTEM" is_type_valid "$DB_SYSTEM" "$type" diff --git a/bin/v-add-database-server b/bin/v-add-database-server index 91d263ba5..480070971 100755 --- a/bin/v-add-database-server +++ b/bin/v-add-database-server @@ -1,6 +1,6 @@ #!/bin/bash # info: add new database server -# options: type host port dbuser dbpass [max_db] [charsets] [template] +# options: TYPE HOST PORT DBUSER DBPASS [MAX_DB] [CHARSETS] [TEMPLATE] # # The function add new database server to the server pool. It supports local # and remote database servers, which is useful for clusters. By adding a host @@ -36,7 +36,7 @@ max_db=${6-500} # Verifications # #----------------------------------------------------------# -args_usage='type host port dbuser dbpass [max_db] [charsets] [tpl]' +args_usage='TYPE HOST PORT DBUSER DBPASS [MAX_DB] [CHARSETS] [TPL]' check_args '5' "$#" "$args_usage" validate_format 'host' 'port' 'dbuser' 'dbpass' 'max_db' 'charsets' 'template' is_system_enabled "$DB_SYSTEM" diff --git a/bin/v-add-dns-domain b/bin/v-add-dns-domain index 92b651535..060a7103a 100755 --- a/bin/v-add-dns-domain +++ b/bin/v-add-dns-domain @@ -1,6 +1,6 @@ #!/bin/bash # info: add dns domain -# options: user domain ip [template] [ns1] [ns2] [ns3] [ns4] [restart] +# options: USER DOMAIN IP [TEMPLATE] [NS1] [NS2] [NS3] [NS4] [RESTART] # # The function adds DNS zone with records defined in the template. If the exp # argument isn't stated, the expiration date value will be set to next year. @@ -37,7 +37,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain ip [template] [ns1] [ns2] [ns3] [ns4]' +check_args '3' "$#" 'USER DOMAIN IP [TEMPLATE] [NS1] [NS2] [NS3] [NS4]' validate_format 'user' 'domain' 'ip' is_system_enabled "$DNS_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-add-dns-domain-record b/bin/v-add-dns-domain-record index ca9c6247f..12a64c3ad 100755 --- a/bin/v-add-dns-domain-record +++ b/bin/v-add-dns-domain-record @@ -1,6 +1,6 @@ #!/bin/bash # info: add dns domain record -# options: user domain record type value [priority] [id] [restart] +# options: USER DOMAIN RECORD TYPE VALUE [PRIORITY] [ID] [RESTART] # # The call is used for adding new DNS record. Complex records of TXT, MX and # SRV types can be used by a filling in the 'value' argument. The function also @@ -36,7 +36,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '5' "$#" 'user domain record type value [priority] [id] [restart]' +check_args '5' "$#" 'USER DOMAIN RECORD TYPE VALUE [PRIORITY] [ID] [RESTART]' validate_format 'user' 'domain' 'record' 'rtype' 'dvalue' is_system_enabled "$DNS_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-add-dns-on-web-alias b/bin/v-add-dns-on-web-alias index dc00e3a82..7b9e2f7d5 100755 --- a/bin/v-add-dns-on-web-alias +++ b/bin/v-add-dns-on-web-alias @@ -1,6 +1,6 @@ #!/bin/bash # info: add dns domain or dns record based on web domain alias restart -# options: user domain +# options: USER DOMAIN # # The function adds dns domain or dns record based on web domain alias. @@ -29,7 +29,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain alias' +check_args '3' "$#" 'USER DOMAIN ALIAS' validate_format 'user' 'domain' is_system_enabled "$WEB_SYSTEM" is_system_enabled "$DNS_SYSTEM" diff --git a/bin/v-add-mail-account b/bin/v-add-mail-account index 8a16cbfe8..67020b5ed 100755 --- a/bin/v-add-mail-account +++ b/bin/v-add-mail-account @@ -1,6 +1,6 @@ #!/bin/bash # info: add mail domain account -# options: user domain account password [quota] +# options: USER DOMAIN ACCOUNT PASSWORD [QUOTA] # # The function add new email account. @@ -33,7 +33,7 @@ EVENT="$EVENT A4='$A4' A5='$A5' A6='$A6' A7='$A7' A8='$A8' A9='$A9'" # Verifications # #----------------------------------------------------------# -check_args '4' "$#" 'user domain account password [quota]' +check_args '4' "$#" 'USER DOMAIN ACCOUNT PASSWORD [QUOTA]' validate_format 'user' 'domain' 'account' 'password' 'quota' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-add-mail-account-alias b/bin/v-add-mail-account-alias index 86552441c..cff53695e 100755 --- a/bin/v-add-mail-account-alias +++ b/bin/v-add-mail-account-alias @@ -1,6 +1,6 @@ #!/bin/bash # info: add mail account alias aka nickname -# options: user domain account alias +# options: USER DOMAIN ACCOUNT ALIAS # # The function add new email alias. @@ -27,7 +27,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '4' "$#" 'user domain account alias' +check_args '4' "$#" 'USER DOMAIN ACCOUNT ALIAS' validate_format 'user' 'domain' 'account' 'malias' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-add-mail-account-autoreply b/bin/v-add-mail-account-autoreply index bd1f86f1c..13f1e9f59 100755 --- a/bin/v-add-mail-account-autoreply +++ b/bin/v-add-mail-account-autoreply @@ -1,6 +1,6 @@ #!/bin/bash # info: add mail account autoreply message -# options: user domain account message +# options: USER DOMAIN ACCOUNT MESSAGE # # The function add new email account. @@ -27,7 +27,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '4' "$#" 'user domain account message' +check_args '4' "$#" 'USER DOMAIN ACCOUNT MESSAGE' validate_format 'user' 'domain' 'account' 'autoreply' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-add-mail-account-forward b/bin/v-add-mail-account-forward index 6288098c8..8e6e81366 100755 --- a/bin/v-add-mail-account-forward +++ b/bin/v-add-mail-account-forward @@ -1,6 +1,6 @@ #!/bin/bash # info: add mail account forward address -# options: user domain account forward +# options: USER DOMAIN ACCOUNT FORWARD # # The function add new email account. @@ -27,7 +27,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '4' "$#" 'user domain account forward' +check_args '4' "$#" 'USER DOMAIN ACCOUNT FORWARD' validate_format 'user' 'domain' 'account' 'forward' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-add-mail-domain b/bin/v-add-mail-domain index b8f5666d6..9e8b799e8 100755 --- a/bin/v-add-mail-domain +++ b/bin/v-add-mail-domain @@ -1,6 +1,6 @@ #!/bin/bash # info: add mail domain -# options: user domain [antispam] [antivirus] [dkim] [dkim_size] +# options: USER DOMAIN [ANTISPAM] [ANTIVIRUS] [DKIM] [DKIM_SIZE] # # The function adds MAIL domain. @@ -30,7 +30,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain [antispam] [antivirus] [dkim] [dkim_size]' +check_args '2' "$#" 'USER DOMAIN [ANTISPAM] [ANTIVIRUS] [DKIM] [DKIM_SIZE]' validate_format 'user' 'domain' 'antispam' 'antivirus' 'dkim' 'dkim_size' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-add-mail-domain-antispam b/bin/v-add-mail-domain-antispam index 58585fc66..c6035c411 100755 --- a/bin/v-add-mail-domain-antispam +++ b/bin/v-add-mail-domain-antispam @@ -1,6 +1,6 @@ #!/bin/bash # info: add mail domain antispam support -# options: user domain +# options: USER DOMAIN # # The function enables spamassasin for incomming emails. @@ -25,7 +25,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain' +check_args '2' "$#" 'USER DOMAIN' validate_format 'user' 'domain' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-add-mail-domain-antivirus b/bin/v-add-mail-domain-antivirus index d2f689b9a..7da3ea0f6 100755 --- a/bin/v-add-mail-domain-antivirus +++ b/bin/v-add-mail-domain-antivirus @@ -1,6 +1,6 @@ #!/bin/bash # info: add mail domain antivirus support -# options: user domain +# options: USER DOMAIN # # The function enables clamav scan for incomming emails. @@ -25,7 +25,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain' +check_args '2' "$#" 'USER DOMAIN' validate_format 'user' 'domain' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-add-mail-domain-catchall b/bin/v-add-mail-domain-catchall index ddea0d88c..fde47507e 100755 --- a/bin/v-add-mail-domain-catchall +++ b/bin/v-add-mail-domain-catchall @@ -1,6 +1,6 @@ #!/bin/bash # info: add mail domain catchall account -# options: user domain email +# options: USER DOMAIN EMAIL # # The function enables catchall account for incomming emails. @@ -26,7 +26,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain email' +check_args '3' "$#" 'USER DOMAIN EMAIL' validate_format 'user' 'domain' 'email' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-add-mail-domain-dkim b/bin/v-add-mail-domain-dkim index e5be80f01..b94f4f689 100755 --- a/bin/v-add-mail-domain-dkim +++ b/bin/v-add-mail-domain-dkim @@ -1,6 +1,6 @@ #!/bin/bash # info: add mail domain dkim support -# options: user domain [dkim_size] +# options: USER DOMAIN [DKIM_SIZE] # # The function adds DKIM signature to outgoing domain emails. @@ -26,7 +26,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain [dkim_size]' +check_args '2' "$#" 'USER DOMAIN [DKIM_SIZE]' validate_format 'user' 'domain' 'dkim_size' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-add-sys-ip b/bin/v-add-sys-ip index 2e8b3c3c3..903153822 100755 --- a/bin/v-add-sys-ip +++ b/bin/v-add-sys-ip @@ -1,6 +1,6 @@ #!/bin/bash # info: add system ip address -# options: ip mask [interface] [user] [ip_status] [ip_name] +# options: IP MASK [INTERFACE] [USER] [IP_STATUS] [IP_NAME] # # The function adds ip address into a system. It also creates rc scripts. You # can specify ip name which will be used as root domain for temporary aliases. @@ -33,7 +33,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'ip mask [interface] [user] [ip_status] [ip_name]' +check_args '2' "$#" 'IP MASK [INTERFACE] [USER] [IP_STATUS] [IP_NAME]' validate_format 'ip' 'mask' 'interface' 'user' 'ip_status' is_ip_free is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-add-user b/bin/v-add-user index 31f792840..bc3cde653 100755 --- a/bin/v-add-user +++ b/bin/v-add-user @@ -1,6 +1,6 @@ #!/bin/bash # info: add system user -# options: user password email [package] [fname] [lname] +# options: USER PASSWORD EMAIL [PACKAGE] [FNAME] [LNAME] # # The function creates new user account. @@ -40,7 +40,7 @@ is_user_free() { # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user password email [package] [fname] [lname]' +check_args '3' "$#" 'USER PASSWORD EMAIL [PACKAGE] [FNAME] [LNAME]' validate_format 'user' 'password' 'email' 'package' if [ ! -z "$fname" ]; then validate_format 'fname' 'lname' diff --git a/bin/v-add-user-backup b/bin/v-add-user-backup index 9a3889264..2e8ead080 100755 --- a/bin/v-add-user-backup +++ b/bin/v-add-user-backup @@ -1,6 +1,6 @@ #!/bin/bash # info: schedule user backup creation -# options: user +# options: USER # # The function for scheduling user backup creation. @@ -21,7 +21,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user' +check_args '1' "$#" 'USER' validate_format 'user' is_system_enabled "$BACKUP_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-add-user-package b/bin/v-add-user-package index 8d3d8626e..a2bd24673 100755 --- a/bin/v-add-user-package +++ b/bin/v-add-user-package @@ -1,6 +1,6 @@ #!/bin/bash # info: adding user package -# options: pkg_dir package [rewrite] +# options: PKG_DIR PACKAGE [REWRITE] # # The function adds new user package to the system. @@ -47,7 +47,7 @@ is_package_consistent() { # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'pkg_dir package' 'rewrite' +check_args '2' "$#" 'PKG_DIR PACKAGE' 'rewrite' validate_format 'pkg_dir' 'package' if [ "$rewrite" != 'yes' ]; then is_package_new diff --git a/bin/v-add-web-domain b/bin/v-add-web-domain index 908d1ebd0..473978992 100755 --- a/bin/v-add-web-domain +++ b/bin/v-add-web-domain @@ -1,6 +1,6 @@ #!/bin/bash # info: add web domain -# options: user domain ip [template] [restart] +# options: USER DOMAIN IP [TEMPLATE] [RESTART] # # The function adds virtual host to a server. In cases when a template is # undefined in the script, the template "default" will be used. The alias of @@ -35,7 +35,7 @@ source $VESTA/func/ip.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain ip [template] [restart]' +check_args '3' "$#" 'USER DOMAIN IP [TEMPLATE] [RESTART]' validate_format 'user' 'domain' 'ip' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-add-web-domain-alias b/bin/v-add-web-domain-alias index 76f615eb3..a14ac8aed 100755 --- a/bin/v-add-web-domain-alias +++ b/bin/v-add-web-domain-alias @@ -1,6 +1,6 @@ #!/bin/bash # info: add web domain alias -# options: user domain alias [restart] +# options: USER DOMAIN ALIAS [RESTART] # # The call is intended for adding aliases to a domain (it is also called # "domain parking"). The function supports wildcards *.domain.tpl. @@ -31,7 +31,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain dom_alias [restart]' +check_args '3' "$#" 'USER DOMAIN DOM_ALIAS [RESTART]' validate_format 'user' 'domain' 'dom_alias' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-add-web-domain-cgi b/bin/v-add-web-domain-cgi index 02c851333..fc2a9993d 100755 --- a/bin/v-add-web-domain-cgi +++ b/bin/v-add-web-domain-cgi @@ -1,6 +1,6 @@ #!/bin/bash # info: add cgi support for domain -# options: user domain +# options: USER DOMAIN # # The function switches on cgi support by adding +ExecCGI directive into # webserver configuration file. The use of this function is provided for @@ -27,7 +27,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain' +check_args '2' "$#" 'USER DOMAIN' validate_format 'user' 'domain' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-add-web-domain-elog b/bin/v-add-web-domain-elog index e92dbdb86..31859b5b6 100755 --- a/bin/v-add-web-domain-elog +++ b/bin/v-add-web-domain-elog @@ -1,6 +1,6 @@ #!/bin/bash # info: add error logging for domain -# options: user domain [restart] +# options: USER DOMAIN [RESTART] # # The function enables a separate ErrorLog file for a domain, accessible for # reading by users. @@ -26,7 +26,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain [restart]' +check_args '2' "$#" 'USER DOMAIN [RESTART]' validate_format 'user' 'domain' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-add-web-domain-ftp b/bin/v-add-web-domain-ftp index dae270be5..52e15038d 100755 --- a/bin/v-add-web-domain-ftp +++ b/bin/v-add-web-domain-ftp @@ -1,6 +1,6 @@ #!/bin/bash # info: add ftp account for web domain. -# options: user domain ftp_user ftp_password +# options: USER DOMAIN FTP_USER FTP_PASSWORD # # The function creates addutional ftp account for web domain. @@ -30,7 +30,7 @@ EVENT="$EVENT A4='$A4' A5='$A5' A6='$A6' A7='$A7' A8='$A8' A9='$A9'" # Verifications # #----------------------------------------------------------# -check_args '4' "$#" 'user domain ftp_user ftp_password' +check_args '4' "$#" 'USER DOMAIN FTP_USER FTP_PASSWORD' validate_format 'user' 'domain' 'ftp_user' 'ftp_password' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-add-web-domain-nginx b/bin/v-add-web-domain-nginx index 701f19ef4..f1509862c 100755 --- a/bin/v-add-web-domain-nginx +++ b/bin/v-add-web-domain-nginx @@ -1,6 +1,6 @@ #!/bin/bash # info: add webdomain nginx support -# options: user domain [template] [extentions] [restart] +# options: USER DOMAIN [TEMPLATE] [EXTENTIONS] [RESTART] # # The function enables nginx support for a domain. It can significantly improve # website speed. @@ -30,7 +30,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain [template] [extentions] [restart]' +check_args '2' "$#" 'USER DOMAIN [TEMPLATE] [EXTENTIONS] [RESTART]' validate_format 'user' 'domain' 'extentions' is_system_enabled "$PROXY_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-add-web-domain-ssl b/bin/v-add-web-domain-ssl index db7705bdb..462457346 100755 --- a/bin/v-add-web-domain-ssl +++ b/bin/v-add-web-domain-ssl @@ -1,6 +1,6 @@ #!/bin/bash # info: adding ssl for domain -# options: user domain ssl_dir [ssl_home] [restart] +# options: USER DOMAIN SSL_DIR [SSL_HOME] [RESTART] # # The function turns on SSL support for a domain. Parameter ssl_dir is a path # to directory where 2 or 3 ssl files can be found. Certificate file @@ -33,7 +33,7 @@ source $VESTA/func/ip.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain ssl_dir [ssl_home] [restart]' +check_args '3' "$#" 'USER DOMAIN SSL_DIR [SSL_HOME] [RESTART]' validate_format 'user' 'domain' 'ssl_dir' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-add-web-domain-stats b/bin/v-add-web-domain-stats index 90592b325..a669f8560 100755 --- a/bin/v-add-web-domain-stats +++ b/bin/v-add-web-domain-stats @@ -1,6 +1,6 @@ #!/bin/bash # info: add log analyzer to generate domain statitics -# options: user domain type +# options: USER DOMAIN TYPE # # The call is used for enabling log analyzer system to a domain. At this time # two types of these system is supported - awstats and webalizer. For viewing @@ -29,7 +29,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain type' +check_args '3' "$#" 'USER DOMAIN TYPE' validate_format 'user' 'domain' is_system_enabled "$WEB_SYSTEM" is_type_valid "$STATS_SYSTEM" "$type" diff --git a/bin/v-add-web-domain-stats-user b/bin/v-add-web-domain-stats-user index d4d2d0b4e..fb6706456 100755 --- a/bin/v-add-web-domain-stats-user +++ b/bin/v-add-web-domain-stats-user @@ -1,6 +1,6 @@ #!/bin/bash # info: add password protection to web domain statistics -# options: user domain stats_user stats_password +# options: USER DOMAIN STATS_USER STATS_PASSWORD # # The call is used for securing the web statistics page. @@ -30,7 +30,7 @@ EVENT="$EVENT A4='$A4' A5='$A5' A6='$A6' A7='$A7' A8='$A8' A9='$A9'" # Verifications # #----------------------------------------------------------# -check_args '4' "$#" 'user domain stats_user stats_pass' +check_args '4' "$#" 'USER DOMAIN STATS_USER STATS_PASS' validate_format 'user' 'domain' 'stats_user' 'stats_pass' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-backup-user b/bin/v-backup-user index 2e6518e4f..38908dd1e 100755 --- a/bin/v-backup-user +++ b/bin/v-backup-user @@ -1,6 +1,6 @@ #!/bin/bash # info: backup system user with all its objects -# options: user +# options: USER # # The call is used for backing up user with all its domains and databases. @@ -23,7 +23,7 @@ source $VESTA/func/db.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user' +check_args '1' "$#" 'USER' validate_format 'user' is_system_enabled "$BACKUP_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-backup-users b/bin/v-backup-users index fd33721bf..24b9819e2 100755 --- a/bin/v-backup-users +++ b/bin/v-backup-users @@ -1,6 +1,6 @@ #!/bin/bash # info: backup all users -# options: none +# options: NONE # # The function backups all system users. diff --git a/bin/v-change-cron-job b/bin/v-change-cron-job index 00d300dee..1a930e508 100755 --- a/bin/v-change-cron-job +++ b/bin/v-change-cron-job @@ -1,6 +1,6 @@ #!/bin/bash # info: change cron job -# options: user job min hour day month wday command +# options: USER JOB MIN HOUR DAY MONTH WDAY COMMAND # # The function is used for changing existing job. It fully replace job # parameters with new one but with same id. @@ -29,7 +29,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '7' "$#" 'user job min hour day month wday command' +check_args '7' "$#" 'USER JOB MIN HOUR DAY MONTH WDAY COMMAND' validate_format 'user' 'job' 'min' 'hour' 'day' 'month' 'wday' 'command' is_system_enabled $CRON_SYSTEM is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-change-database-password b/bin/v-change-database-password index a4ffdbc1c..ee283675d 100755 --- a/bin/v-change-database-password +++ b/bin/v-change-database-password @@ -1,6 +1,6 @@ #!/bin/bash # info: change database password -# options: user database dbpass +# options: USER DATABASE DBPASS # # The function for changing database user password to a database. It uses the # full name of database as argument. @@ -30,7 +30,7 @@ EVENT="$EVENT A4='$A4' A5='$A5' A6='$A6' A7='$A7' A8='$A8' A9='$A9'" # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user database dbpass' +check_args '3' "$#" 'USER DATABASE DBPASS' validate_format 'user' 'database' 'dbpass' is_system_enabled "$DB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-change-dns-domain-exp b/bin/v-change-dns-domain-exp index 8ee2c0ae3..e491893b0 100755 --- a/bin/v-change-dns-domain-exp +++ b/bin/v-change-dns-domain-exp @@ -1,6 +1,6 @@ #!/bin/bash # info: change dns domain expiriation date -# options: user domain exp +# options: USER DOMAIN EXP # # The function of changing the term of expiration domain's registration. The # serial number will be refreshed automatically during update. @@ -25,7 +25,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain exp' +check_args '3' "$#" 'USER DOMAIN EXP' validate_format 'user' 'domain' 'exp' is_system_enabled "$DNS_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-change-dns-domain-ip b/bin/v-change-dns-domain-ip index ce671b045..9a3fb050c 100755 --- a/bin/v-change-dns-domain-ip +++ b/bin/v-change-dns-domain-ip @@ -1,6 +1,6 @@ #!/bin/bash # info: change dns domain ip address -# options: user domain ip +# options: USER DOMAIN IP # # The function for changing the main ip of DNS zone. @@ -26,7 +26,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain ip' +check_args '3' "$#" 'USER DOMAIN IP' validate_format 'user' 'domain' 'ip' is_system_enabled "$DNS_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-change-dns-domain-record b/bin/v-change-dns-domain-record index a694b9cb6..d9a4310f6 100755 --- a/bin/v-change-dns-domain-record +++ b/bin/v-change-dns-domain-record @@ -1,6 +1,6 @@ #!/bin/bash # info: change dns domain record -# options: user domain id value [priority] +# options: USER DOMAIN ID VALUE [PRIORITY] # # The function for changing DNS record. @@ -29,7 +29,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '4' "$#" 'user domain id value [priority]' +check_args '4' "$#" 'USER DOMAIN ID VALUE [PRIORITY]' validate_format 'user' 'domain' 'id' 'dvalue' is_system_enabled "$DNS_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-change-dns-domain-soa b/bin/v-change-dns-domain-soa index 867fd32ea..f12af4e7b 100755 --- a/bin/v-change-dns-domain-soa +++ b/bin/v-change-dns-domain-soa @@ -1,6 +1,6 @@ #!/bin/bash # info: change dns domain soa record -# options: user domain soa +# options: USER DOMAIN SOA # # The function for changing SOA record. This type of records can not be # modified by v-change-dns-domain-record call. @@ -27,7 +27,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain soa' +check_args '3' "$#" 'USER DOMAIN SOA' validate_format 'user' 'domain' 'soa' is_system_enabled "$DNS_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-change-dns-domain-tpl b/bin/v-change-dns-domain-tpl index 00d3752b2..0d88be40c 100755 --- a/bin/v-change-dns-domain-tpl +++ b/bin/v-change-dns-domain-tpl @@ -1,6 +1,6 @@ #!/bin/bash # info: change dns domain template -# options: user domain +# options: USER DOMAIN # # The function for changing the template of records. By updating old records # will be removed and new records will be generated in accordance with @@ -27,7 +27,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain template' +check_args '3' "$#" 'USER DOMAIN TEMPLATE' validate_format 'user' 'domain' 'template' is_system_enabled "$DNS_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-change-dns-domain-ttl b/bin/v-change-dns-domain-ttl index f99e94927..1112aa9bd 100755 --- a/bin/v-change-dns-domain-ttl +++ b/bin/v-change-dns-domain-ttl @@ -1,6 +1,6 @@ #!/bin/bash # info: change dns domain ttl -# options: user domain ttl +# options: USER DOMAIN TTL # # The function for chaning the time to live TTL parameter for all records. @@ -26,7 +26,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain ttl' +check_args '3' "$#" 'USER DOMAIN TTL' validate_format 'user' 'domain' 'ttl' is_system_enabled "$DNS_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-change-mail-account-password b/bin/v-change-mail-account-password index ec071057e..0c476374f 100755 --- a/bin/v-change-mail-account-password +++ b/bin/v-change-mail-account-password @@ -1,6 +1,6 @@ #!/bin/bash # info: change mail account password -# options: user domain account password +# options: USER DOMAIN ACCOUNT PASSWORD # # The function changes email account password. @@ -32,7 +32,7 @@ EVENT="$EVENT A4='$A4' A5='$A5' A6='$A6' A7='$A7' A8='$A8' A9='$A9'" # Verifications # #----------------------------------------------------------# -check_args '4' "$#" 'user domain account password' +check_args '4' "$#" 'USER DOMAIN ACCOUNT PASSWORD' validate_format 'user' 'domain' 'account' 'password' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-change-mail-account-quota b/bin/v-change-mail-account-quota index 005c7e28e..73135a36f 100755 --- a/bin/v-change-mail-account-quota +++ b/bin/v-change-mail-account-quota @@ -1,6 +1,6 @@ #!/bin/bash # info: change mail account quota -# options: user domain account quota +# options: USER DOMAIN ACCOUNT QUOTA # # The function changes email account disk quota. @@ -27,7 +27,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '4' "$#" 'user domain account quota' +check_args '4' "$#" 'USER DOMAIN ACCOUNT QUOTA' validate_format 'user' 'domain' 'account' 'quota' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-change-mail-domain-catchall b/bin/v-change-mail-domain-catchall index 2f50baa9b..359f40b7a 100755 --- a/bin/v-change-mail-domain-catchall +++ b/bin/v-change-mail-domain-catchall @@ -1,6 +1,6 @@ #!/bin/bash # info: change mail domain catchall email -# options: user domain email +# options: USER DOMAIN EMAIL # # The function changes mail domain cathcall. @@ -26,7 +26,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain email' +check_args '3' "$#" 'USER DOMAIN EMAIL' validate_format 'user' 'domain' 'email' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-change-sys-config-value b/bin/v-change-sys-config-value index e2fca61e6..d81d77356 100755 --- a/bin/v-change-sys-config-value +++ b/bin/v-change-sys-config-value @@ -1,6 +1,6 @@ #!/bin/bash # info: change sysconfig value -# options: key value +# options: KEY VALUE # # The function is for changing main config settings such as COMPANY_NAME or # COMPANY_EMAIL and so on. @@ -23,7 +23,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'key value' +check_args '2' "$#" 'KEY VALUE' validate_format 'key' check_ckey=$(grep "^$key='" $VESTA/conf/vesta.conf) if [ -z "$check_ckey" ]; then diff --git a/bin/v-change-sys-ip-name b/bin/v-change-sys-ip-name index dfb6b9546..eae3c7eef 100755 --- a/bin/v-change-sys-ip-name +++ b/bin/v-change-sys-ip-name @@ -1,6 +1,6 @@ #!/bin/bash # info: change ip name -# options: ip name +# options: IP NAME # # The function for changing dns domain associated with ip. @@ -23,7 +23,7 @@ source $VESTA/func/ip.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'ip ip_name' +check_args '2' "$#" 'IP IP_NAME' validate_format 'ip' 'ip_name' is_ip_valid diff --git a/bin/v-change-sys-ip-owner b/bin/v-change-sys-ip-owner index 105c4ad24..ed8e447e3 100755 --- a/bin/v-change-sys-ip-owner +++ b/bin/v-change-sys-ip-owner @@ -1,6 +1,6 @@ #!/bin/bash # info: change ip owner -# options: ip user +# options: IP USER # # The function of changing ip address ownership. @@ -22,7 +22,7 @@ source $VESTA/func/ip.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'ip user' +check_args '2' "$#" 'IP USER' validate_format 'ip' 'user' is_object_valid 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user" diff --git a/bin/v-change-sys-ip-status b/bin/v-change-sys-ip-status index e498895f7..761d61331 100755 --- a/bin/v-change-sys-ip-status +++ b/bin/v-change-sys-ip-status @@ -1,6 +1,6 @@ #!/bin/bash # info: change ip status -# options: ip ip_status +# options: IP IP_STATUS # # The function of changing an ip address's status. @@ -22,7 +22,7 @@ source $VESTA/func/ip.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'ip ip_status' +check_args '2' "$#" 'IP IP_STATUS' validate_format 'ip' 'ip_status' is_ip_valid if [ "$ip_status" = "$(get_ip_value '$STATUS')" ]; then diff --git a/bin/v-change-user-contact b/bin/v-change-user-contact index a0883e64e..7f21aece9 100755 --- a/bin/v-change-user-contact +++ b/bin/v-change-user-contact @@ -1,6 +1,6 @@ #!/bin/bash # info: change user contact email -# options: user email +# options: USER EMAIL # # The function for changing of e-mail associated with a certain user. @@ -22,7 +22,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user email' +check_args '2' "$#" 'USER EMAIL' validate_format 'user' 'email' is_object_valid 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user" diff --git a/bin/v-change-user-name b/bin/v-change-user-name index 833a59fdc..26e908720 100755 --- a/bin/v-change-user-name +++ b/bin/v-change-user-name @@ -1,6 +1,6 @@ #!/bin/bash # info: change user full name -# options: user fname lname +# options: USER FNAME LNAME # # The function allow to change user's full name. @@ -23,7 +23,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user fname lname' +check_args '3' "$#" 'USER FNAME LNAME' validate_format 'user' 'fname' 'lname' is_object_valid 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user" diff --git a/bin/v-change-user-ns b/bin/v-change-user-ns index 9decfa804..561eba7f9 100755 --- a/bin/v-change-user-ns +++ b/bin/v-change-user-ns @@ -1,6 +1,6 @@ #!/bin/bash # info: change user nameservers -# options: user ns1 ns2 [ns3] [ns4] +# options: USER NS1 NS2 [NS3] [NS4] # # The function for changing default nameservers for speciefic user. @@ -26,7 +26,7 @@ source $VESTA/func/main.sh #----------------------------------------------------------# # Checking args -check_args '3' "$#" 'user ns1 ns2 [ns3] [ns4]' +check_args '3' "$#" 'USER NS1 NS2 [NS3] [NS4]' # Checking argument format validate_format 'user' 'ns1' 'ns2' diff --git a/bin/v-change-user-package b/bin/v-change-user-package index 1ad24352d..40761ba80 100755 --- a/bin/v-change-user-package +++ b/bin/v-change-user-package @@ -1,6 +1,6 @@ #!/bin/bash # info: change user package -# options: user package [force] +# options: USER PACKAGE [FORCE] # # The function changes user's hosting package. @@ -116,7 +116,7 @@ DATE='$DATE'" > $USER_DATA/user.conf # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user package [force]' +check_args '2' "$#" 'USER PACKAGE [FORCE]' validate_format 'user' 'package' is_object_valid 'user' 'USER' "$user" is_package_valid diff --git a/bin/v-change-user-password b/bin/v-change-user-password index ecc5c2883..10bbe570c 100755 --- a/bin/v-change-user-password +++ b/bin/v-change-user-password @@ -1,6 +1,6 @@ #!/bin/bash # info: change user password -# options: user password +# options: USER PASSWORD # # The function changes user's password and updates RKEY value. @@ -27,7 +27,7 @@ EVENT="$EVENT A4='$A4' A5='$A5' A6='$A6' A7='$A7' A8='$A8' A9='$A9'" # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user password' +check_args '2' "$#" 'USER PASSWORD' validate_format 'user' 'password' is_object_valid 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user" diff --git a/bin/v-change-user-shell b/bin/v-change-user-shell index f28c8b796..71c0496f4 100755 --- a/bin/v-change-user-shell +++ b/bin/v-change-user-shell @@ -1,6 +1,6 @@ #!/bin/bash # info: change user shell -# options: user shell +# options: USER SHELL # # The function changes system shell of a user. Shell gives abilty to use ssh. @@ -22,7 +22,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user shell' +check_args '2' "$#" 'USER SHELL' validate_format 'user' 'shell' is_object_valid 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user" diff --git a/bin/v-change-user-template b/bin/v-change-user-template index 4e8456a3b..54382f12f 100755 --- a/bin/v-change-user-template +++ b/bin/v-change-user-template @@ -1,6 +1,6 @@ #!/bin/bash # info: change user default template -# options: user template +# options: USER TEMPLATE # # The function changes default user web template. @@ -23,7 +23,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user template' +check_args '2' "$#" 'USER TEMPLATE' validate_format 'user' 'template' is_object_valid 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user" diff --git a/bin/v-change-web-domain-ftp b/bin/v-change-web-domain-ftp index e870a67b4..1b94e85f6 100755 --- a/bin/v-change-web-domain-ftp +++ b/bin/v-change-web-domain-ftp @@ -1,6 +1,6 @@ #!/bin/bash # info: add ftp account for web domain. -# options: user domain ftp_user ftp_password +# options: USER DOMAIN FTP_USER FTP_PASSWORD # # The function creates addutional ftp account for web domain. @@ -26,7 +26,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '4' "$#" 'user domain ftp_user ftp_password' +check_args '4' "$#" 'USER DOMAIN FTP_USER FTP_PASSWORD' validate_format 'user' 'domain' 'ftp_user' 'ftp_password' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-change-web-domain-ip b/bin/v-change-web-domain-ip index 936689d66..5032f3b26 100755 --- a/bin/v-change-web-domain-ip +++ b/bin/v-change-web-domain-ip @@ -1,6 +1,6 @@ #!/bin/bash # info: change web domain ip address -# options: user domain ip [restart] +# options: USER DOMAIN IP [RESTART] # # The call is used for changing the site ip address. The ip change will be # performed for a virtual apache host and for a configuration nginx file both. @@ -28,7 +28,7 @@ source $VESTA/func/ip.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain ip [restart]' +check_args '3' "$#" 'USER DOMAIN IP [RESTART]' validate_format 'user' 'domain' 'ip' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-change-web-domain-nginx-tpl b/bin/v-change-web-domain-nginx-tpl index 23b6ed076..61bd2bca6 100755 --- a/bin/v-change-web-domain-nginx-tpl +++ b/bin/v-change-web-domain-nginx-tpl @@ -1,6 +1,6 @@ #!/bin/bash # info: change web domain nginx template -# options: user domain template [extentions] [restart] +# options: USER DOMAIN TEMPLATE [EXTENTIONS] [RESTART] # # The function changes template of nginx.conf configuration file. The content # of webdomain directories remains untouched. @@ -31,7 +31,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain template [extentions] [restart]' +check_args '3' "$#" 'USER DOMAIN TEMPLATE [EXTENTIONS] [RESTART]' validate_format 'user' 'domain' 'template' is_system_enabled "$PROXY_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-change-web-domain-sslcert b/bin/v-change-web-domain-sslcert index fbc8f03f6..dc7edaf84 100755 --- a/bin/v-change-web-domain-sslcert +++ b/bin/v-change-web-domain-sslcert @@ -1,6 +1,6 @@ #!/bin/bash # info: change domain ssl certificate -# options: user domain ssl_dir +# options: USER DOMAIN SSL_DIR # # The function changes SSL domain certificate and the key. If ca file present # it will be replaced as well. @@ -26,7 +26,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain ssl_dir' +check_args '3' "$#" 'USER DOMAIN SSL_DIR' validate_format 'user' 'domain' 'ssl_dir' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-change-web-domain-sslhome b/bin/v-change-web-domain-sslhome index 633a602ce..03a0ea386 100755 --- a/bin/v-change-web-domain-sslhome +++ b/bin/v-change-web-domain-sslhome @@ -21,7 +21,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain ssl_home' +check_args '3' "$#" 'USER DOMAIN SSL_HOME' validate_format 'user' 'domain' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" @@ -48,7 +48,7 @@ case $SSL_HOME in old="$HOMEDIR/$user/web/$domain/public_html" ;; same) new="$HOMEDIR/$user/web/$domain/public_html" ; old="$HOMEDIR/$user/web/$domain/public_shtml" ;; - *) check_args '3' "2" 'user domain sslhome' + *) check_args '3' "2" 'USER DOMAIN SSLHOME' esac # Changing sslhome directory diff --git a/bin/v-change-web-domain-stats b/bin/v-change-web-domain-stats index 4abcd2001..f4497440f 100755 --- a/bin/v-change-web-domain-stats +++ b/bin/v-change-web-domain-stats @@ -1,6 +1,6 @@ #!/bin/bash # info: change web domain statistics -# options: user domain type +# options: USER DOMAIN TYPE # # The function of deleting site's system of statistics. Its type is # automatically chooses from client's configuration file. @@ -26,7 +26,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain type' +check_args '3' "$#" 'USER DOMAIN TYPE' validate_format 'user' 'domain' is_system_enabled "$WEB_SYSTEM" is_type_valid "$STATS_SYSTEM" "$type" diff --git a/bin/v-change-web-domain-tpl b/bin/v-change-web-domain-tpl index 35964da7c..b812910ab 100755 --- a/bin/v-change-web-domain-tpl +++ b/bin/v-change-web-domain-tpl @@ -1,6 +1,6 @@ #!/bin/bash # info: change web domain template -# options: user domain template [restart] +# options: USER DOMAIN TEMPLATE [RESTART] # # The function changes template of httpd.conf configuration file. The content # of webdomain directories remains untouched. @@ -27,7 +27,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain template [restart]' +check_args '3' "$#" 'USER DOMAIN TEMPLATE [RESTART]' validate_format 'user' 'domain' 'template' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-delete-cron-job b/bin/v-delete-cron-job index fd71812fe..13527d0a0 100755 --- a/bin/v-delete-cron-job +++ b/bin/v-delete-cron-job @@ -1,6 +1,6 @@ #!/bin/bash # info: delete cron job -# options: user job +# options: USER JOB # # The function deletes cron job. @@ -22,7 +22,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user job' +check_args '2' "$#" 'USER JOB' validate_format 'user' 'job' is_system_enabled "$CRON_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-delete-cron-reports b/bin/v-delete-cron-reports index 22fbc0b1b..10fd121fb 100755 --- a/bin/v-delete-cron-reports +++ b/bin/v-delete-cron-reports @@ -1,6 +1,6 @@ #!/bin/bash # info: delete cron reports -# options: user +# options: USER # # The script for disabling reports on cron tasks and administrative # notifications. @@ -22,7 +22,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user' +check_args '1' "$#" 'USER' validate_format 'user' is_system_enabled "$CRON_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-delete-database b/bin/v-delete-database index 3a657865f..47860c9f9 100755 --- a/bin/v-delete-database +++ b/bin/v-delete-database @@ -1,6 +1,6 @@ #!/bin/bash # info: delete database -# options: user database +# options: USER DATABASE # # The function for deleting the database. If database user have access to # another database, he will not be deleted. @@ -24,7 +24,7 @@ source $VESTA/func/db.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user database' +check_args '2' "$#" 'USER DATABASE' validate_format 'user' 'database' is_system_enabled "$DB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-delete-database-server b/bin/v-delete-database-server index 843d50456..3fd5f43d4 100755 --- a/bin/v-delete-database-server +++ b/bin/v-delete-database-server @@ -1,6 +1,6 @@ #!/bin/bash # info: delete database server -# options: type host +# options: TYPE HOST # # The function for deleting the database host from vesta configuration. It will # be deleted if there are no databases created on it only. @@ -24,7 +24,7 @@ source $VESTA/func/db.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" "type host" +check_args '2' "$#" 'TYPE HOST' validate_format 'type' 'host' is_system_enabled "$DB_SYSTEM" is_type_valid "$DB_SYSTEM" "$type" diff --git a/bin/v-delete-databases b/bin/v-delete-databases index 2069be0bf..fa3772a71 100755 --- a/bin/v-delete-databases +++ b/bin/v-delete-databases @@ -1,6 +1,6 @@ #!/bin/bash # info: delete user databases -# options: user +# options: USER # # The function deletes all user databases. @@ -21,7 +21,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user' +check_args '1' "$#" 'USER' validate_format 'user' is_system_enabled "$DB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-delete-dns-domain b/bin/v-delete-dns-domain index 529764c70..fa674d3d4 100755 --- a/bin/v-delete-dns-domain +++ b/bin/v-delete-dns-domain @@ -1,6 +1,6 @@ #!/bin/bash # info: delete dns domain -# options: user domain +# options: USER DOMAIN # # The function for deleting DNS domain. By deleting it all records will also be # deleted. @@ -25,7 +25,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain' +check_args '2' "$#" 'USER DOMAIN' validate_format 'user' 'domain' is_system_enabled "$DNS_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-delete-dns-domain-record b/bin/v-delete-dns-domain-record index 5b6aa1a06..c2b1491b6 100755 --- a/bin/v-delete-dns-domain-record +++ b/bin/v-delete-dns-domain-record @@ -1,6 +1,6 @@ #!/bin/bash # info: delete dns record -# options: user domain id +# options: USER DOMAIN ID # # The function for deleting a certain record of DNS zone. @@ -25,7 +25,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain id' +check_args '3' "$#" 'USER DOMAIN ID' validate_format 'user' 'domain' 'id' is_object_valid 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user" diff --git a/bin/v-delete-dns-domains b/bin/v-delete-dns-domains index 378beb20f..1d65dccde 100755 --- a/bin/v-delete-dns-domains +++ b/bin/v-delete-dns-domains @@ -1,6 +1,6 @@ #!/bin/bash # info: delete dns domains -# options: user +# options: USER # # The function for deleting all users DNS domains. @@ -21,7 +21,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user' +check_args '1' "$#" 'USER' validate_format 'user' is_system_enabled "$DNS_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-delete-dns-on-web-alias b/bin/v-delete-dns-on-web-alias index aac8ea1d5..50c1e1d71 100755 --- a/bin/v-delete-dns-on-web-alias +++ b/bin/v-delete-dns-on-web-alias @@ -1,6 +1,6 @@ #!/bin/bash # info: delete dns domain or dns record based on web domain alias -# options: user domain +# options: USER DOMAIN # # The function deletes dns domain or dns record based on web domain alias. @@ -29,7 +29,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain alias' +check_args '3' "$#" 'USER DOMAIN ALIAS' validate_format 'user' 'domain' is_system_enabled "$WEB_SYSTEM" is_system_enabled "$DNS_SYSTEM" diff --git a/bin/v-delete-mail-account b/bin/v-delete-mail-account index ad8a127fb..8fb456849 100755 --- a/bin/v-delete-mail-account +++ b/bin/v-delete-mail-account @@ -1,6 +1,6 @@ #!/bin/bash # info: delete mail account -# options: user domain account +# options: USER DOMAIN ACCOUNT # # The function deletes email account. @@ -26,7 +26,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain account' +check_args '3' "$#" 'USER DOMAIN ACCOUNT' validate_format 'user' 'domain' 'account' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-delete-mail-account-alias b/bin/v-delete-mail-account-alias index 6a3744a85..e6904654b 100755 --- a/bin/v-delete-mail-account-alias +++ b/bin/v-delete-mail-account-alias @@ -1,6 +1,6 @@ #!/bin/bash # info: delete mail account alias aka nickname -# options: user domain account alias +# options: USER DOMAIN ACCOUNT ALIAS # # The function deletes email account alias. @@ -27,7 +27,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '4' "$#" 'user domain account alias' +check_args '4' "$#" 'USER DOMAIN ACCOUNT ALIAS' validate_format 'user' 'domain' 'account' 'malias' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-delete-mail-account-autoreply b/bin/v-delete-mail-account-autoreply index 6e72dba3b..37996e2c8 100755 --- a/bin/v-delete-mail-account-autoreply +++ b/bin/v-delete-mail-account-autoreply @@ -1,6 +1,6 @@ #!/bin/bash # info: delete mail account autoreply message -# options: user domain account alias +# options: USER DOMAIN ACCOUNT ALIAS # # The function delete email account autoreply. @@ -27,7 +27,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain account' +check_args '3' "$#" 'USER DOMAIN ACCOUNT' validate_format 'user' 'domain' 'account' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-delete-mail-account-forward b/bin/v-delete-mail-account-forward index 7066e0a72..007adb130 100755 --- a/bin/v-delete-mail-account-forward +++ b/bin/v-delete-mail-account-forward @@ -1,6 +1,6 @@ #!/bin/bash # info: delte mail account forward -# options: user domain account email +# options: USER DOMAIN ACCOUNT EMAIL # # The function add delete email account forward address. @@ -27,7 +27,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '4' "$#" 'user domain account forward' +check_args '4' "$#" 'USER DOMAIN ACCOUNT FORWARD' validate_format 'user' 'domain' 'account' 'forward' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-delete-mail-domain b/bin/v-delete-mail-domain index 1d50f83bf..f610cdf5f 100755 --- a/bin/v-delete-mail-domain +++ b/bin/v-delete-mail-domain @@ -1,6 +1,6 @@ #!/bin/bash # info: delete mail domain -# options: user domain +# options: USER DOMAIN # # The function for deleting MAIL domain. By deleting it all accounts will # also be deleted. @@ -24,7 +24,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain' +check_args '2' "$#" 'USER DOMAIN' validate_format 'user' 'domain' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-delete-mail-domain-antispam b/bin/v-delete-mail-domain-antispam index 01ecb9190..7eb317014 100755 --- a/bin/v-delete-mail-domain-antispam +++ b/bin/v-delete-mail-domain-antispam @@ -1,6 +1,6 @@ #!/bin/bash # info: delete mail domain antispam support -# options: user domain +# options: USER DOMAIN # # The function disable spamassasin for incomming emails. @@ -25,7 +25,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain' +check_args '2' "$#" 'USER DOMAIN' validate_format 'user' 'domain' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-delete-mail-domain-antivirus b/bin/v-delete-mail-domain-antivirus index 3fcc6ec75..6ddeae4d6 100755 --- a/bin/v-delete-mail-domain-antivirus +++ b/bin/v-delete-mail-domain-antivirus @@ -1,6 +1,6 @@ #!/bin/bash # info: delete mail domain antivirus support -# options: user domain +# options: USER DOMAIN # # The function disables clamav scan for incomming emails. @@ -25,7 +25,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain' +check_args '2' "$#" 'USER DOMAIN' validate_format 'user' 'domain' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-delete-mail-domain-catchall b/bin/v-delete-mail-domain-catchall index 6f90b3548..a984b4000 100755 --- a/bin/v-delete-mail-domain-catchall +++ b/bin/v-delete-mail-domain-catchall @@ -1,6 +1,6 @@ #!/bin/bash # info: delete mail domain catchall email -# options: user domain +# options: USER DOMAIN # # The function disables mail domain cathcall. @@ -25,7 +25,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain' +check_args '2' "$#" 'USER DOMAIN' validate_format 'user' 'domain' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-delete-mail-domain-dkim b/bin/v-delete-mail-domain-dkim index 6e639703b..880283317 100755 --- a/bin/v-delete-mail-domain-dkim +++ b/bin/v-delete-mail-domain-dkim @@ -1,6 +1,6 @@ #!/bin/bash # info: delete mail domain dkim support -# options: user domain [dkim_size] +# options: USER DOMAIN [DKIM_SIZE] # # The function delete DKIM domain pem. @@ -24,7 +24,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain' +check_args '2' "$#" 'USER DOMAIN' validate_format 'user' 'domain' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-delete-mail-domains b/bin/v-delete-mail-domains index 27a9e1299..d3f5cc2a0 100755 --- a/bin/v-delete-mail-domains +++ b/bin/v-delete-mail-domains @@ -1,6 +1,6 @@ #!/bin/bash # info: delete mail domains -# options: user +# options: USER # # The function for deleting all users mail domains. @@ -21,7 +21,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user' +check_args '1' "$#" 'USER' validate_format 'user' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-delete-sys-ip b/bin/v-delete-sys-ip index 92c0a39b7..f6951e597 100755 --- a/bin/v-delete-sys-ip +++ b/bin/v-delete-sys-ip @@ -1,6 +1,6 @@ #!/bin/bash # info: delete system ip -# options: ip +# options: IP # # The function for deleting a system ip. It does not allow to delete first ip # on interface and do not allow to delete ip which is used by a web domain. @@ -24,7 +24,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'ip' +check_args '1' "$#" 'IP' validate_format 'ip' is_ip_valid "$ip" is_ip_key_empty '$U_WEB_DOMAINS' diff --git a/bin/v-delete-user b/bin/v-delete-user index 927f49c10..ad84fe94b 100755 --- a/bin/v-delete-user +++ b/bin/v-delete-user @@ -1,6 +1,6 @@ #!/bin/bash # info: delete user -# options: user +# options: USER # # This function deletes a certain user and all his resourses such as domains, # databases, cron jobs, etc. @@ -26,7 +26,7 @@ source $VESTA/func/ip.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user' +check_args '1' "$#" 'USER' validate_format 'user' is_object_valid 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user" diff --git a/bin/v-delete-user-backup b/bin/v-delete-user-backup index ba3bb5f6b..863b39b50 100755 --- a/bin/v-delete-user-backup +++ b/bin/v-delete-user-backup @@ -1,6 +1,6 @@ #!/bin/bash # info: delete user backup -# options: user nackup +# options: USER NACKUP # # The function deletes user backup. @@ -22,7 +22,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user backup' +check_args '2' "$#" 'USER BACKUP' validate_format 'user' 'backup' is_system_enabled "$BACKUP_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-delete-user-ips b/bin/v-delete-user-ips index 864694e06..bf7b06401 100755 --- a/bin/v-delete-user-ips +++ b/bin/v-delete-user-ips @@ -1,6 +1,6 @@ #!/bin/bash # info: delete user ips -# options: user +# options: USER # # The function deletes all user's ip addresses. @@ -22,7 +22,7 @@ source $VESTA/func/ip.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user' +check_args '1' "$#" 'USER' validate_format 'user' is_object_valid 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user" diff --git a/bin/v-delete-user-package b/bin/v-delete-user-package index 1867bf961..d9862acd0 100755 --- a/bin/v-delete-user-package +++ b/bin/v-delete-user-package @@ -1,6 +1,6 @@ #!/bin/bash # info: delete user package -# options: package +# options: PACKAGE # # The function for deleting user package. It does not allow to delete pacakge # if it is in use. @@ -31,7 +31,7 @@ is_package_in_use() { # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'package' +check_args '1' "$#" 'PACKAGE' validate_format 'package' is_package_valid is_package_in_use diff --git a/bin/v-delete-web-domain b/bin/v-delete-web-domain index d58cd70c9..eed4d1dc2 100755 --- a/bin/v-delete-web-domain +++ b/bin/v-delete-web-domain @@ -1,6 +1,6 @@ #!/bin/bash # info: delete web domain -# options: user domain +# options: USER DOMAIN # # The call of function leads to the removal of domain and all its components # (statistics, folders contents, ssl certificates, etc.). This operation is @@ -29,7 +29,7 @@ source $VESTA/func/ip.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain' +check_args '2' "$#" 'USER DOMAIN' validate_format 'user' 'domain' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-delete-web-domain-alias b/bin/v-delete-web-domain-alias index 7bb7d8fa5..55b94ef19 100755 --- a/bin/v-delete-web-domain-alias +++ b/bin/v-delete-web-domain-alias @@ -1,6 +1,6 @@ #!/bin/bash # info: delete web domain alias -# options: user domain alias [restart] +# options: USER DOMAIN ALIAS [RESTART] # # The function of deleting the alias domain (parked domain). By this call # default www aliase can be removed as well. @@ -28,7 +28,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain dom_alias [restart]' +check_args '3' "$#" 'USER DOMAIN DOM_ALIAS [RESTART]' validate_format 'user' 'domain' 'dom_alias' is_system_enabled 'WEB_SYSTEM' is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-delete-web-domain-cgi b/bin/v-delete-web-domain-cgi index 47b057cdd..847fb2a8b 100755 --- a/bin/v-delete-web-domain-cgi +++ b/bin/v-delete-web-domain-cgi @@ -1,6 +1,6 @@ #!/bin/bash # info: delete web domain cgi support -# options: user domain +# options: USER DOMAIN # # The function for deleting cgi support (adds -ExecCGI directive into # configuration file). It is recommended to apply this function only for a @@ -27,7 +27,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain' +check_args '2' "$#" 'USER DOMAIN' validate_format 'user' 'domain' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-delete-web-domain-elog b/bin/v-delete-web-domain-elog index 4b33fa7f4..9eeda4880 100755 --- a/bin/v-delete-web-domain-elog +++ b/bin/v-delete-web-domain-elog @@ -1,6 +1,6 @@ #!/bin/bash # info: delete web domain error loggin support -# options: user domain [restart] +# options: USER DOMAIN [RESTART] # # The function of disabling error logging feature. It comments ErrorLog # direcitve in apache or/and nginx configuration. The data already collected @@ -27,7 +27,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain [restart]' +check_args '2' "$#" 'USER DOMAIN [RESTART]' validate_format 'user' 'domain' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" "$user" diff --git a/bin/v-delete-web-domain-ftp b/bin/v-delete-web-domain-ftp index 80942be77..ca71d31dc 100755 --- a/bin/v-delete-web-domain-ftp +++ b/bin/v-delete-web-domain-ftp @@ -1,6 +1,6 @@ #!/bin/bash # info: delete webdomain ftp account. -# options: user domain +# options: USER DOMAIN # # The function deletes additional ftp account. @@ -24,7 +24,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain' +check_args '2' "$#" 'USER DOMAIN' validate_format 'user' 'domain' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-delete-web-domain-nginx b/bin/v-delete-web-domain-nginx index f7613ae20..4c4c4b031 100755 --- a/bin/v-delete-web-domain-nginx +++ b/bin/v-delete-web-domain-nginx @@ -1,6 +1,6 @@ #!/bin/bash # info: deleting web domain nginx configuration -# options: user domain +# options: USER DOMAIN # # The function of deleting the virtualhost nginx configuration. @@ -25,7 +25,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain' +check_args '2' "$#" 'USER DOMAIN' validate_format 'user' 'domain' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-delete-web-domain-ssl b/bin/v-delete-web-domain-ssl index c3361514b..367434084 100755 --- a/bin/v-delete-web-domain-ssl +++ b/bin/v-delete-web-domain-ssl @@ -1,6 +1,6 @@ #!/bin/bash # info: delete web domain ssl support -# options: user domain +# options: USER DOMAIN # # The function disable https support and deletes SSL certificates. @@ -25,7 +25,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain' +check_args '2' "$#" 'USER DOMAIN' validate_format 'user' 'domain' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-delete-web-domain-stats b/bin/v-delete-web-domain-stats index 041246752..a69130996 100755 --- a/bin/v-delete-web-domain-stats +++ b/bin/v-delete-web-domain-stats @@ -1,6 +1,6 @@ #!/bin/bash # info: delete web domain statistics -# options: user domain +# options: USER DOMAIN # # The function of deleting site's system of statistics. Its type is # automatically chooses from client's configuration file. @@ -24,7 +24,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain' +check_args '2' "$#" 'USER DOMAIN' validate_format 'user' 'domain' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-delete-web-domain-stats-user b/bin/v-delete-web-domain-stats-user index 35f244414..dc63a3eb7 100755 --- a/bin/v-delete-web-domain-stats-user +++ b/bin/v-delete-web-domain-stats-user @@ -1,6 +1,6 @@ #!/bin/bash # info: disable webdomain stats authentication support -# options: user domain +# options: USER DOMAIN # # The function removes authentication of statistics system. If the script is # called without naming a certain user, all users will be removed. After @@ -26,7 +26,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain' +check_args '2' "$#" 'USER DOMAIN' validate_format 'user' 'domain' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-delete-web-domains b/bin/v-delete-web-domains index fe7910068..2824433fa 100755 --- a/bin/v-delete-web-domains +++ b/bin/v-delete-web-domains @@ -1,6 +1,6 @@ #!/bin/bash # info: delete web domains -# options: user [restart] +# options: USER [RESTART] # # The function deteles all user's webdomains. @@ -22,7 +22,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user [restart]' +check_args '1' "$#" 'USER [RESTART]' validate_format 'user' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-get-dns-domain-value b/bin/v-get-dns-domain-value index a69ae2696..b5b88d778 100755 --- a/bin/v-get-dns-domain-value +++ b/bin/v-get-dns-domain-value @@ -1,6 +1,6 @@ #!/bin/bash # info: get dns domain value -# options: user domain key +# options: USER DOMAIN KEY # # The function for getting a certain DNS domain parameter. @@ -23,7 +23,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain key' +check_args '3' "$#" 'USER DOMAIN KEY' validate_format 'user' 'domain' is_object_valid 'user' 'USER' "$user" is_object_valid 'dns' 'DOMAIN' "$domain" diff --git a/bin/v-get-mail-account-value b/bin/v-get-mail-account-value index 067fcb6ba..c920e2fa4 100755 --- a/bin/v-get-mail-account-value +++ b/bin/v-get-mail-account-value @@ -1,6 +1,6 @@ #!/bin/bash # info: get mail account value -# options: user domain account key +# options: USER DOMAIN ACCOUNT KEY # # The function for getting a certain mail account parameter. @@ -24,7 +24,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain key' +check_args '3' "$#" 'USER DOMAIN KEY' validate_format 'user' 'domain' is_object_valid 'user' 'USER' "$user" is_object_valid 'mail' 'DOMAIN' "$domain" diff --git a/bin/v-get-mail-domain-value b/bin/v-get-mail-domain-value index 1fd54adce..1fab391fb 100755 --- a/bin/v-get-mail-domain-value +++ b/bin/v-get-mail-domain-value @@ -1,6 +1,6 @@ #!/bin/bash # info: get mail domain value -# options: user domain key +# options: USER DOMAIN KEY # # The function for getting a certain mail domain parameter. @@ -23,7 +23,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain key' +check_args '3' "$#" 'USER DOMAIN KEY' validate_format 'user' 'domain' is_object_valid 'user' 'USER' "$user" is_object_valid 'mail' 'DOMAIN' "$domain" diff --git a/bin/v-get-user-value b/bin/v-get-user-value index d8c193fdc..f5eeb99dd 100755 --- a/bin/v-get-user-value +++ b/bin/v-get-user-value @@ -1,6 +1,6 @@ #!/bin/bash # info: get user value -# options: user key +# options: USER KEY # # The function for obtaining certain user's parameters. @@ -22,7 +22,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user key' +check_args '2' "$#" 'USER KEY' validate_format 'user' is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-get-web-domain-value b/bin/v-get-web-domain-value index 1d968261d..f1529da6e 100755 --- a/bin/v-get-web-domain-value +++ b/bin/v-get-web-domain-value @@ -1,6 +1,6 @@ #!/bin/bash # info: get web domain value -# options: user domain key +# options: USER DOMAIN KEY # # The function is intended for obtaining a domain value by the key. This call # is useful for arranging composite queries. The answer is displayed only in @@ -27,7 +27,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain key' +check_args '3' "$#" 'USER DOMAIN KEY' validate_format 'user' 'domain' is_object_valid 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user" diff --git a/bin/v-list-cron-job b/bin/v-list-cron-job index 3e9488be1..166525eab 100755 --- a/bin/v-list-cron-job +++ b/bin/v-list-cron-job @@ -1,6 +1,6 @@ #!/bin/bash # info: list cron job -# options: user job [format] +# options: USER JOB [FORMAT] # # The function of obtaining cron job settings. @@ -62,7 +62,7 @@ shell_list_job() { # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user job [format]' +check_args '2' "$#" 'USER JOB [FORMAT]' is_object_valid 'user' 'USER' "$user" @@ -80,7 +80,7 @@ case $format in json) json_list_job ;; plain) nohead=1; shell_list_job ;; shell) shell_list_job |column -t ;; - *) check_args '2' '0' 'user job [format]' + *) check_args '2' '0' 'USER JOB [FORMAT]' esac diff --git a/bin/v-list-cron-jobs b/bin/v-list-cron-jobs index 944bada2c..1fc327fde 100755 --- a/bin/v-list-cron-jobs +++ b/bin/v-list-cron-jobs @@ -1,6 +1,6 @@ #!/bin/bash # info: list user cron jobs -# options: user [format] +# options: USER [FORMAT] # # The function for obtaining the list of all users cron jobs. @@ -70,7 +70,7 @@ shell_list_cron() { # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user [format]' +check_args '1' "$#" 'USER [FORMAT]' validate_format 'user' is_object_valid 'user' 'USER' "$user" @@ -95,7 +95,7 @@ case $format in shell_list_cron ;; shell) fields='$JOB~$SUSPENDED~$MIN~$HOUR~$DAY~$MONTH~$WDAY~$CMD'; shell_list_cron |column -t -s '~';; - *) check_args '1' '0' 'user [format]' ;; + *) check_args '1' '0' 'USER [FORMAT]' ;; esac diff --git a/bin/v-list-database b/bin/v-list-database index 16cbbe907..d9136aeed 100755 --- a/bin/v-list-database +++ b/bin/v-list-database @@ -1,6 +1,6 @@ #!/bin/bash # info: list database -# options: user database [format] +# options: USER DATABASE [FORMAT] # # The function for obtaining of all database's parameters. @@ -58,7 +58,7 @@ shell_list_db() { # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user database [format]' +check_args '2' "$#" 'USER DATABASE [FORMAT]' validate_format 'user' 'database' is_object_valid 'user' 'USER' "$user" is_object_valid 'db' 'DB' "$database" @@ -78,7 +78,7 @@ case $format in json) json_list_db ;; plain) shell_list_db ;; shell) shell_list_db | column -t ;; - *) check_args '2' '0' 'user database [format]' + *) check_args '2' '0' 'USER DATABASE [FORMAT]' esac diff --git a/bin/v-list-database-server b/bin/v-list-database-server index 36776ddcc..f459c7d0d 100755 --- a/bin/v-list-database-server +++ b/bin/v-list-database-server @@ -1,6 +1,6 @@ #!/bin/bash # info: list database server -# options: type host [format] +# options: TYPE HOST [FORMAT] # # The function for obtaining database server parameters. @@ -58,7 +58,7 @@ shell_list_dbhost() { # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'type host [format]' +check_args '2' "$#" 'TYPE HOST [FORMAT]' validate_format 'host' is_object_valid "../../conf/$type" 'HOST' "$host" @@ -77,7 +77,7 @@ case $format in json) json_list_dbhost ;; plain) nohead=1; shell_list_dbhost ;; shell) shell_list_dbhost | column -t;; - *) check_args '2' '0' 'type host [format]' + *) check_args '2' '0' 'TYPE HOST [FORMAT]' esac diff --git a/bin/v-list-database-servers b/bin/v-list-database-servers index 32b1d340e..3a436f769 100755 --- a/bin/v-list-database-servers +++ b/bin/v-list-database-servers @@ -1,6 +1,6 @@ #!/bin/bash # info: list database servers -# options: type [format] +# options: TYPE [FORMAT] # # The function for obtaining the list of all hosts of the same databases' type. @@ -22,7 +22,7 @@ source $VESTA/func/main.sh #----------------------------------------------------------# # Checking args -check_args '1' "$#" 'type [format]' +check_args '1' "$#" 'TYPE [FORMAT]' #----------------------------------------------------------# @@ -40,7 +40,7 @@ case $format in plain) nohead=1; shell_list;; shell) fields='$HOST $PORT $MAX_DB $U_DB_BASES $SUSPENDED $DATE'; shell_list | column -t ;; - *) check_args '2' '0' 'type [format]' + *) check_args '2' '0' 'TYPE [FORMAT]' esac diff --git a/bin/v-list-database-types b/bin/v-list-database-types index a3bf247ba..8a08a25b1 100755 --- a/bin/v-list-database-types +++ b/bin/v-list-database-types @@ -1,6 +1,6 @@ #!/bin/bash # info: list supported database types -# options: [format] +# options: [FORMAT] # # The function for obtaining the list of database types. @@ -55,7 +55,7 @@ case $format in json) json_list_dbtypes ;; plain) nohead=1; shell_list_dbtypes ;; shell) shell_list_dbtypes ;; - *) check_args '1' '0' '[format]' ;; + *) check_args '1' '0' '[FORMAT]' ;; esac diff --git a/bin/v-list-databases b/bin/v-list-databases index 2e2c545ef..282fb52c2 100755 --- a/bin/v-list-databases +++ b/bin/v-list-databases @@ -1,6 +1,6 @@ #!/bin/bash # info: listing databases -# options: user [format] +# options: USER [FORMAT] # # The function for obtaining the list of all user's databases. @@ -21,7 +21,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user [format]' +check_args '1' "$#" 'USER [FORMAT]' validate_format 'user' is_object_valid 'user' 'USER' "$user" @@ -40,7 +40,7 @@ case $format in plain) nohead=1; shell_list ;; shell) fields='$DB $DBUSER $HOST $TYPE $U_DISK $DATE'; shell_list | column -t ;; - *) check_args '1' '0' 'user [format]' + *) check_args '1' '0' 'USER [FORMAT]' esac diff --git a/bin/v-list-dns-domain b/bin/v-list-dns-domain index db3da01c4..8f24a37c3 100755 --- a/bin/v-list-dns-domain +++ b/bin/v-list-dns-domain @@ -1,6 +1,6 @@ #!/bin/bash # info: list dns domain -# options: user domain [format] +# options: USER DOMAIN [FORMAT] # # The function of obtaining the list of domain parameters. This call, just as # all v_list_* calls, supports 3 formats - json, shell and plain. @@ -76,7 +76,7 @@ shell_list_domain() { # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain [format]' +check_args '2' "$#" 'USER DOMAIN [FORMAT]' is_object_valid 'user' 'USER' "$user" is_object_valid 'dns' 'DOMAIN' "$domain" @@ -94,7 +94,7 @@ case $format in json) json_list_domain ;; plain) nohead=1; shell_list_domain ;; shell) shell_list_domain |column -t ;; - *) check_args '2' '0' 'user domain [format]' + *) check_args '2' '0' 'USER DOMAIN [FORMAT]' esac diff --git a/bin/v-list-dns-domain-records b/bin/v-list-dns-domain-records index 785a8441e..56ed5fb90 100755 --- a/bin/v-list-dns-domain-records +++ b/bin/v-list-dns-domain-records @@ -1,6 +1,6 @@ #!/bin/bash # info: list dns domain records -# options: user domain [format] +# options: USER DOMAIN [FORMAT] # # The function for getting all DNS domain records. @@ -74,7 +74,7 @@ shell_list_dns() { # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain [format]' +check_args '2' "$#" 'USER DOMAIN [FORMAT]' validate_format 'user' 'domain' is_object_valid 'user' 'USER' "$user" is_object_valid 'dns' 'DOMAIN' "$domain" @@ -94,7 +94,7 @@ case $format in plain) nohead=1; shell_list_dns ;; shell) fields='$ID $RECORD $TYPE $VALUE'; shell_list_dns | column -t ;; - *) check_args '2' '0' 'user domain [format]' + *) check_args '2' '0' 'USER DOMAIN [FORMAT]' esac diff --git a/bin/v-list-dns-domains b/bin/v-list-dns-domains index 0ad1dd2f5..10ccafa5b 100755 --- a/bin/v-list-dns-domains +++ b/bin/v-list-dns-domains @@ -1,6 +1,6 @@ #!/bin/bash # info: list dns domains -# options: user [format] +# options: USER [FORMAT] # # The function for obtaining all DNS domains of a user. @@ -21,7 +21,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user [format]' +check_args '1' "$#" 'USER [FORMAT]' validate_format 'user' is_object_valid 'user' 'USER' "$user" @@ -40,7 +40,7 @@ case $format in plain) nohead=1; shell_list ;; shell) fields='$DOMAIN $IP $TPL $TTL $EXP $DATE'; shell_list| column -t ;; - *) check_args '1' '0' 'user [format]';; + *) check_args '1' '0' 'USER [FORMAT]';; esac diff --git a/bin/v-list-dns-template b/bin/v-list-dns-template index c6f4abe16..5ff2b337d 100755 --- a/bin/v-list-dns-template +++ b/bin/v-list-dns-template @@ -1,6 +1,6 @@ #!/bin/bash # info: list dns template -# options: template [format] +# options: TEMPLATE [FORMAT] # # The function for obtaining the DNS template parameters. @@ -73,7 +73,7 @@ shell_list_dns() { # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'template [format]' +check_args '1' "$#" 'TEMPLATE [FORMAT]' validate_format 'template' is_dns_template_valid @@ -91,7 +91,7 @@ case $format in json) json_list_dns ;; plain) nohead=1; shell_list_dns ;; shell) shell_list_dns | column -t ;; - *) check_args '1' '0' 'template [format]';; + *) check_args '1' '0' 'TEMPLATE [FORMAT]';; esac diff --git a/bin/v-list-dns-templates b/bin/v-list-dns-templates index a837fc44e..18090b52b 100755 --- a/bin/v-list-dns-templates +++ b/bin/v-list-dns-templates @@ -1,6 +1,6 @@ #!/bin/bash # info: list dns templates -# options: [format] +# options: [FORMAT] # # The function for obtaining the list of all DNS templates available. @@ -54,7 +54,7 @@ case $format in json) json_list_dnstpl;; plain) nohead=1; shell_list_dnstpl ;; shell) shell_list_dnstpl ;; - *) check_args '1' '0' '[format] [limit] [offset]';; + *) check_args '1' '0' '[FORMAT] [LIMIT] [OFFSET]';; esac diff --git a/bin/v-list-mail-account b/bin/v-list-mail-account index a9e3bc671..eb18c6a2e 100755 --- a/bin/v-list-mail-account +++ b/bin/v-list-mail-account @@ -1,6 +1,6 @@ #!/bin/bash # info: list mail domain account -# options: user domain account [format] +# options: USER DOMAIN ACCOUNT [FORMAT] # # The function of obtaining the list of account parameters. @@ -62,7 +62,7 @@ shell_list_account() { # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain account [format]' +check_args '3' "$#" 'USER DOMAIN ACCOUNT [FORMAT]' is_object_valid 'user' 'USER' "$user" is_object_valid 'mail' 'DOMAIN' "$domain" is_object_valid "mail/$domain" 'ACCOUNT' "$account" @@ -83,7 +83,7 @@ case $format in json) json_list_account ;; plain) nohead=1; shell_list_account ;; shell) shell_list_account |column -t ;; - *) check_args '2' '0' 'user domain account [format]' + *) check_args '2' '0' 'USER DOMAIN ACCOUNT [FORMAT]' esac diff --git a/bin/v-list-mail-account-autoreply b/bin/v-list-mail-account-autoreply index f8de66f3e..c5ba6020c 100755 --- a/bin/v-list-mail-account-autoreply +++ b/bin/v-list-mail-account-autoreply @@ -1,6 +1,6 @@ #!/bin/bash # info: list mail account autoreply -# options: user domain account [format] +# options: USER DOMAIN ACCOUNT [FORMAT] # # The function of obtainin mail account autoreply message. @@ -39,7 +39,7 @@ shell_list_msg() { # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain [format]' +check_args '2' "$#" 'USER DOMAIN [FORMAT]' is_object_valid 'user' 'USER' "$user" is_object_valid 'mail' 'DOMAIN' "$domain" is_object_unsuspended 'mail' 'DOMAIN' "$domain" @@ -61,7 +61,7 @@ case $format in json) json_list_msg ;; plain) nohead=1; shell_list_msg ;; shell) shell_list_msg ;; - *) check_args '1' '0' '[format]' + *) check_args '1' '0' '[FORMAT]' esac diff --git a/bin/v-list-mail-accounts b/bin/v-list-mail-accounts index 7100b70f3..15a071873 100755 --- a/bin/v-list-mail-accounts +++ b/bin/v-list-mail-accounts @@ -1,6 +1,6 @@ #!/bin/bash # info: list mail domain accounts -# options: user domain [format] +# options: USER DOMAIN [FORMAT] # # The function of obtaining the list of all user domains. @@ -22,7 +22,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain [format]' +check_args '2' "$#" 'USER DOMAIN [FORMAT]' validate_format 'user' 'domain' is_object_valid 'user' 'USER' "$user" is_object_valid 'mail' 'DOMAIN' "$domain" @@ -43,7 +43,7 @@ case $format in plain) nohead=1; shell_list ;; shell) fields='$ACCOUNT $AUTOREPLY $QUOTA $U_DISK $SUSPENDED $TIME $DATE'; shell_list | column -t ;; - *) check_args '1' '0' 'user [format]' + *) check_args '1' '0' 'USER [FORMAT]' esac diff --git a/bin/v-list-mail-domain b/bin/v-list-mail-domain index aeaf08061..fae895279 100755 --- a/bin/v-list-mail-domain +++ b/bin/v-list-mail-domain @@ -1,6 +1,6 @@ #!/bin/bash # info: list web domain -# options: user domain [format] +# options: USER DOMAIN [FORMAT] # # The function of obtaining the list of domain parameters. This call, just as # all v_list_* calls, supports 3 formats - json, shell and plain. @@ -60,7 +60,7 @@ shell_list_domain() { # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain [format]' +check_args '2' "$#" 'USER DOMAIN [FORMAT]' is_object_valid 'user' 'USER' "$user" is_object_valid 'mail' 'DOMAIN' "$domain" @@ -79,7 +79,7 @@ case $format in json) json_list_domain ;; plain) nohead=1; shell_list_domain ;; shell) shell_list_domain |column -t ;; - *) check_args '2' '0' 'user domain [format]' + *) check_args '2' '0' 'USER DOMAIN [FORMAT]' esac diff --git a/bin/v-list-mail-domain-dkim b/bin/v-list-mail-domain-dkim index 3985c2c39..37b8917ee 100755 --- a/bin/v-list-mail-domain-dkim +++ b/bin/v-list-mail-domain-dkim @@ -1,6 +1,6 @@ #!/bin/bash # info: list mail domain dkim -# options: user domain [format] +# options: USER DOMAIN [FORMAT] # # The function of obtaining domain dkim files. @@ -41,7 +41,7 @@ shell_list_ssl() { # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain [format]' +check_args '2' "$#" 'USER DOMAIN [FORMAT]' is_object_valid 'user' 'USER' "$user" is_object_valid 'mail' 'DOMAIN' "$domain" @@ -62,7 +62,7 @@ case $format in json) json_list_ssl ;; plain) nohead=1; shell_list_ssl ;; shell) shell_list_ssl ;; - *) check_args '1' '0' '[format]' + *) check_args '1' '0' '[FORMAT]' esac diff --git a/bin/v-list-mail-domains b/bin/v-list-mail-domains index 87a74515c..e9daa34d6 100755 --- a/bin/v-list-mail-domains +++ b/bin/v-list-mail-domains @@ -1,6 +1,6 @@ #!/bin/bash # info: list mail domains -# options: user [format] +# options: USER [FORMAT] # # The function of obtaining the list of all user domains. @@ -21,7 +21,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user [format]' +check_args '1' "$#" 'USER [FORMAT]' validate_format 'user' is_object_valid 'user' 'USER' "$user" @@ -41,7 +41,7 @@ case $format in plain) nohead=1; shell_list ;; shell) fields='$DOMAIN $ANTIVIRUS $ANTISPAM $DKIM $ACCOUNTS $U_DISK $DATE'; shell_list | column -t ;; - *) check_args '1' '0' 'user [format]' + *) check_args '1' '0' 'USER [FORMAT]' esac diff --git a/bin/v-list-sys-config b/bin/v-list-sys-config index 47df57ab2..740290294 100755 --- a/bin/v-list-sys-config +++ b/bin/v-list-sys-config @@ -1,6 +1,6 @@ #!/bin/bash # info: list system config -# options: [format] +# options: [FORMAT] # # The function for obtaining the list of system parameters. diff --git a/bin/v-list-sys-interfaces b/bin/v-list-sys-interfaces index b039f5314..3bc8be1ef 100755 --- a/bin/v-list-sys-interfaces +++ b/bin/v-list-sys-interfaces @@ -1,6 +1,6 @@ #!/bin/bash # info: list system interfaces -# options: [format] +# options: [FORMAT] # # The function for obtaining the list of network interfaces. @@ -54,7 +54,7 @@ case $format in json) json_list_iface ;; plain) nohead=1; shell_list_iface ;; shell) shell_list_iface ;; - *) check_args '1' '0' '[format]' ;; + *) check_args '1' '0' '[FORMAT]' ;; esac diff --git a/bin/v-list-sys-ip b/bin/v-list-sys-ip index d6552186b..0ba7f7c09 100755 --- a/bin/v-list-sys-ip +++ b/bin/v-list-sys-ip @@ -1,6 +1,6 @@ #!/bin/bash # info: list system ip -# options: ip [format] +# options: IP [FORMAT] # # The function for getting the list of system ip parameters. @@ -63,7 +63,7 @@ shell_list_ip() { #----------------------------------------------------------# # Checking args -check_args '1' "$#" 'ip [format]' +check_args '1' "$#" 'IP [FORMAT]' validate_format 'ip' is_ip_valid @@ -81,7 +81,7 @@ case $format in json) json_list_ip ;; plain) shell_list_ip ;; shell) shell_list_ip | column -t ;; - *) check_args '1' '0' 'ip [format]' + *) check_args '1' '0' 'IP [FORMAT]' esac diff --git a/bin/v-list-sys-ips b/bin/v-list-sys-ips index c23fe8874..a757019c9 100755 --- a/bin/v-list-sys-ips +++ b/bin/v-list-sys-ips @@ -1,6 +1,6 @@ #!/bin/bash # info: list system ips -# options: [format] +# options: [FORMAT] # # The function for obtaining the list of system ip's. @@ -83,7 +83,7 @@ case $format in plain) nohead=1; shell_list_ips ;; shell) fields='$IP $NETMASK $OWNER $STATUS $U_WEB_DOMAINS'; shell_list_ips | column -t ;; - *) check_args '1' '0' '[format]' + *) check_args '1' '0' '[FORMAT]' esac diff --git a/bin/v-list-sys-rrd b/bin/v-list-sys-rrd index 0d425d2fd..68eb4a8c6 100755 --- a/bin/v-list-sys-rrd +++ b/bin/v-list-sys-rrd @@ -1,6 +1,6 @@ #!/bin/bash # info: list system rrd charts -# options: [format] +# options: [FORMAT] # # List available rrd graphics, its titles and paths. diff --git a/bin/v-list-sys-shells b/bin/v-list-sys-shells index 587019bc1..227db0d03 100755 --- a/bin/v-list-sys-shells +++ b/bin/v-list-sys-shells @@ -1,6 +1,6 @@ #!/bin/bash # info: list system shells -# options: [format] +# options: [FORMAT] # # The function for obtaining the list of system shells. @@ -56,7 +56,7 @@ case $format in json) json_list_sh ;; plain) nohead=1; shell_list_sh ;; shell) shell_list_sh ;; - *) check_args '1' '0' '[format]' ;; + *) check_args '1' '0' '[FORMAT]' ;; esac diff --git a/bin/v-list-sys-users b/bin/v-list-sys-users index f210ee72c..3bae74183 100755 --- a/bin/v-list-sys-users +++ b/bin/v-list-sys-users @@ -1,6 +1,6 @@ #!/bin/bash # info: list system users -# options: [format] +# options: [FORMAT] # # The function for obtaining the list of system users without # detailed information. @@ -54,7 +54,7 @@ case $format in json) json_list_users ;; plain) nohead=1; shell_list_users ;; shell) shell_list_users ;; - *) check_args '1' '0' '[format]' ;; + *) check_args '1' '0' '[FORMAT]' ;; esac diff --git a/bin/v-list-user b/bin/v-list-user index 3b56d380a..d4d798d6c 100755 --- a/bin/v-list-user +++ b/bin/v-list-user @@ -1,6 +1,6 @@ #!/bin/bash # info: list system user -# options: user [format] +# options: USER [FORMAT] # # The function for obtainig the list of all user's parameters. @@ -59,7 +59,7 @@ shell_list_user() { # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user [format]' +check_args '1' "$#" 'USER [FORMAT]' validate_format 'user' is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-list-user-backups b/bin/v-list-user-backups index 5fc61819b..c08c79f53 100755 --- a/bin/v-list-user-backups +++ b/bin/v-list-user-backups @@ -1,6 +1,6 @@ #!/bin/bash # info: list user backups -# options: user [format] +# options: USER [FORMAT] # # The function for obtainig the list of available user backups. @@ -20,7 +20,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user [format]' +check_args '1' "$#" 'USER [FORMAT]' validate_format 'user' is_object_valid 'user' 'USER' "$user" @@ -45,7 +45,7 @@ case $format in plain) nohead=1; shell_list ;; shell) fields='$BACKUP $TYPE $SIZE $RUNTIME $TIME $DATE'; shell_list |column -t;; - *) check_args '1' '0' '[format]' ;; + *) check_args '1' '0' '[FORMAT]' ;; esac diff --git a/bin/v-list-user-ips b/bin/v-list-user-ips index 717ad5026..945556a8a 100755 --- a/bin/v-list-user-ips +++ b/bin/v-list-user-ips @@ -1,6 +1,6 @@ #!/bin/bash # info: list user ips -# options: user [format] +# options: USER [FORMAT] # # The function for obtainig the list of available ip addresses. @@ -93,7 +93,7 @@ shell_list_user_ips() { # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user [format]' +check_args '1' "$#" 'USER [FORMAT]' validate_format 'user' is_object_valid 'user' 'USER' "$user" @@ -110,7 +110,7 @@ case $format in json) json_list_user_ips ;; plain) nohead=1; shell_list_user_ips ;; shell) shell_list_user_ips | column -t ;; - *) check_args '1' '0' 'user [format]' ;; + *) check_args '1' '0' 'USER [FORMAT]' ;; esac diff --git a/bin/v-list-user-log b/bin/v-list-user-log index 0054b8c36..c5fdcc1f7 100755 --- a/bin/v-list-user-log +++ b/bin/v-list-user-log @@ -1,6 +1,6 @@ #!/bin/bash # info: list user log -# options: user [format] +# options: USER [FORMAT] # # The function of obtaining the list of 100 last users commands. @@ -56,7 +56,7 @@ json_list_history() { # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user [format]' +check_args '1' "$#" 'USER [FORMAT]' validate_format 'user' is_object_valid 'user' 'USER' "$user" @@ -77,7 +77,7 @@ case $format in plain) nohead=1; shell_list ;; shell) fields='$ID~$DATE~$TIME~$CMD'; shell_list |column -t -s '~';; - *) check_args '1' '0' 'user [format]' + *) check_args '1' '0' 'USER [FORMAT]' esac diff --git a/bin/v-list-user-ns b/bin/v-list-user-ns index 21c5bcd6e..d296191b3 100755 --- a/bin/v-list-user-ns +++ b/bin/v-list-user-ns @@ -1,6 +1,6 @@ #!/bin/bash # info: list user nameservers -# options: user [format] +# options: USER [FORMAT] # # Function for obtainig the list of user's DNS servers. @@ -50,7 +50,7 @@ shell_list_ns() { # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user [format]' +check_args '1' "$#" 'USER [FORMAT]' validate_format 'user' is_object_valid 'user' 'USER' "$user" @@ -64,7 +64,7 @@ case $format in json) json_list_ns ;; plain) nohead=1; shell_list_ns ;; shell) shell_list_ns ;; - *) check_args '1' '0' 'user [format]' + *) check_args '1' '0' 'USER [FORMAT]' esac diff --git a/bin/v-list-user-package b/bin/v-list-user-package index dd89bbc87..13941589c 100755 --- a/bin/v-list-user-package +++ b/bin/v-list-user-package @@ -1,6 +1,6 @@ #!/bin/bash # info: list user package -# options: package [format] +# options: PACKAGE [FORMAT] # # The function for getting the list of system ip parameters. @@ -62,7 +62,7 @@ shell_list_package() { #----------------------------------------------------------# # Checking args -check_args '1' "$#" 'package [format]' +check_args '1' "$#" 'PACKAGE [FORMAT]' validate_format 'package' is_package_valid @@ -81,7 +81,7 @@ case $format in json) json_list_package ;; plain) shell_list_package ;; shell) shell_list_package | column -t ;; - *) check_args '1' '0' 'ip [format]' + *) check_args '1' '0' 'IP [FORMAT]' esac diff --git a/bin/v-list-user-packages b/bin/v-list-user-packages index 1cf32535c..d4dadaa0c 100755 --- a/bin/v-list-user-packages +++ b/bin/v-list-user-packages @@ -1,6 +1,6 @@ #!/bin/bash # info: list user packages -# options: [format] +# options: [FORMAT] # # The function for obtaining the list of available hosting packages. @@ -80,7 +80,7 @@ case $format in json) json_list_pkgs ;; plain) nohead=1; shell_list_pkgs ;; shell) shell_list_pkgs | column -t ;; - *) check_args '1' '0' '[format]' + *) check_args '1' '0' '[FORMAT]' esac diff --git a/bin/v-list-user-stats b/bin/v-list-user-stats index a958b9fc6..b93fa50b3 100755 --- a/bin/v-list-user-stats +++ b/bin/v-list-user-stats @@ -1,6 +1,6 @@ #!/bin/bash # info: list user stats -# options: user [format] +# options: USER [FORMAT] # # The function for listing user statistics @@ -21,7 +21,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user [format]' +check_args '1' "$#" 'USER [FORMAT]' validate_format 'user' is_object_valid 'user' 'USER' "$user" @@ -47,7 +47,7 @@ case $format in shell) fields='$DATE $PACKAGE $U_DISK $U_BANDWIDTH $U_WEB_DOMAINS'; fields="$fields \$U_DATABASES" shell_list | column -t ;; - *) check_args '1' '0' 'user [format]' + *) check_args '1' '0' 'USER [FORMAT]' esac diff --git a/bin/v-list-users b/bin/v-list-users index 1aa67ea6d..a2d276911 100755 --- a/bin/v-list-users +++ b/bin/v-list-users @@ -1,6 +1,6 @@ #!/bin/bash # info: list system users -# options: [format] +# options: [FORMAT] # # The function for obtainig the list of all server's users. diff --git a/bin/v-list-users-stats b/bin/v-list-users-stats index b731747d4..8b9af2a89 100755 --- a/bin/v-list-users-stats +++ b/bin/v-list-users-stats @@ -1,6 +1,6 @@ #!/bin/bash # info: list overall user stats -# options: [format] +# options: [FORMAT] # # The function for listing overall user statistics @@ -20,7 +20,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '0' "$#" '[format]' +check_args '0' "$#" '[FORMAT]' #----------------------------------------------------------# @@ -44,7 +44,7 @@ case $format in shell) fields='$DATE $U_DISK $U_BANDWIDTH $U_WEB_DOMAINS $U_DATABASES'; fields="$fields \$U_DATABASES" shell_list | column -t ;; - *) check_args '1' '0' '[format]' + *) check_args '1' '0' '[FORMAT]' esac diff --git a/bin/v-list-web-domain b/bin/v-list-web-domain index bf6e0190b..d74d1c68d 100755 --- a/bin/v-list-web-domain +++ b/bin/v-list-web-domain @@ -1,6 +1,6 @@ #!/bin/bash # info: list web domain -# options: user domain [format] +# options: USER DOMAIN [FORMAT] # # The function of obtaining the list of domain parameters. This call, just as # all v_list_* calls, supports 3 formats - json, shell and plain. @@ -62,7 +62,7 @@ shell_list_domain() { # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain [format]' +check_args '2' "$#" 'USER DOMAIN [FORMAT]' is_object_valid 'user' 'USER' "$user" is_object_valid 'web' 'DOMAIN' "$domain" @@ -83,7 +83,7 @@ case $format in json) json_list_domain ;; plain) nohead=1; shell_list_domain ;; shell) shell_list_domain |column -t;; - *) check_args '2' '0' 'user domain [format]' + *) check_args '2' '0' 'USER DOMAIN [FORMAT]' esac diff --git a/bin/v-list-web-domain-ssl b/bin/v-list-web-domain-ssl index 2b17707e7..eb79b8f2c 100755 --- a/bin/v-list-web-domain-ssl +++ b/bin/v-list-web-domain-ssl @@ -1,6 +1,6 @@ #!/bin/bash # info: list web domain ssl certificate -# options: user domain [format] +# options: USER DOMAIN [FORMAT] # # The function of obtaining domain ssl files. @@ -46,7 +46,7 @@ shell_list_ssl() { # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain [format]' +check_args '2' "$#" 'USER DOMAIN [FORMAT]' is_object_valid 'user' 'USER' "$user" is_object_valid 'web' 'DOMAIN' "$domain" @@ -70,7 +70,7 @@ case $format in json) json_list_ssl ;; plain) nohead=1; shell_list_ssl ;; shell) shell_list_ssl ;; - *) check_args '1' '0' '[format]' + *) check_args '1' '0' '[FORMAT]' esac diff --git a/bin/v-list-web-domains b/bin/v-list-web-domains index 95442a347..17eeef031 100755 --- a/bin/v-list-web-domains +++ b/bin/v-list-web-domains @@ -1,6 +1,6 @@ #!/bin/bash # info: list web domains -# options: user [format] +# options: USER [FORMAT] # # The function of obtaining the list of all user domains. @@ -21,7 +21,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user [format]' +check_args '1' "$#" 'USER [FORMAT]' validate_format 'user' is_object_valid 'user' 'USER' "$user" @@ -44,7 +44,7 @@ case $format in plain) nohead=1; shell_list ;; shell) fields='$DOMAIN $IP $U_DISK $U_BANDWIDTH $TPL $DATE'; shell_list | column -t ;; - *) check_args '1' '0' 'user [format]' + *) check_args '1' '0' 'USER [FORMAT]' esac diff --git a/bin/v-list-web-domains-alias b/bin/v-list-web-domains-alias index 81a886664..fb8f24514 100755 --- a/bin/v-list-web-domains-alias +++ b/bin/v-list-web-domains-alias @@ -1,6 +1,6 @@ #!/bin/bash # info: list web domains and alias key -# options: user [format] +# options: USER [FORMAT] # # The function for obtaining the list of aliases of all user's domains. This # call was arranged for filling in the lack of information by applying @@ -23,7 +23,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user [format]' +check_args '1' "$#" 'USER [FORMAT]' validate_format 'user' is_object_valid 'user' 'USER' "$user" @@ -43,7 +43,7 @@ case $format in json) json_list ;; plain) nohead=1; shell_list ;; shell) shell_list;; - *) check_args '1' '0' 'user [format]' + *) check_args '1' '0' 'USER [FORMAT]' esac diff --git a/bin/v-list-web-domains-elog b/bin/v-list-web-domains-elog index 95f75051f..ed99a0448 100755 --- a/bin/v-list-web-domains-elog +++ b/bin/v-list-web-domains-elog @@ -1,6 +1,6 @@ #!/bin/bash # info: list web domains and elog key -# options: user [format] +# options: USER [FORMAT] # # The function for obtaining the list of domains with parameter ErrorLog # displayed. This call was arranged for filling in the lack of information by @@ -23,7 +23,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user [format]' +check_args '1' "$#" 'USER [FORMAT]' validate_format 'user' is_object_valid 'user' 'USER' "$user" @@ -43,7 +43,7 @@ case $format in json) json_list ;; plain) nohead=1; shell_list ;; shell) shell_list | column -t ;; - *) check_args '1' '0' 'user [format]' + *) check_args '1' '0' 'USER [FORMAT]' esac diff --git a/bin/v-list-web-domains-nginx b/bin/v-list-web-domains-nginx index 5bcb30829..7642eb89e 100755 --- a/bin/v-list-web-domains-nginx +++ b/bin/v-list-web-domains-nginx @@ -1,6 +1,6 @@ #!/bin/bash # info: list web domains and nginx key -# options: user [format] +# options: USER [FORMAT] # # The function for obtaining the list of domains with nginx parameter # displayed. This call was arranged for filling in the lack of information by @@ -23,7 +23,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user [format]' +check_args '1' "$#" 'USER [FORMAT]' validate_format 'user' is_object_valid 'user' 'USER' "$user" @@ -43,7 +43,7 @@ case $format in json) json_list ;; plain) nohead=1; shell_list ;; shell) shell_list | column -t ;; - *) check_args '1' '0' 'user [format]' + *) check_args '1' '0' 'USER [FORMAT]' esac diff --git a/bin/v-list-web-domains-ssl b/bin/v-list-web-domains-ssl index 35c742004..6f05bc743 100755 --- a/bin/v-list-web-domains-ssl +++ b/bin/v-list-web-domains-ssl @@ -1,6 +1,6 @@ #!/bin/bash # info: list web domains and alias key -# options: user [format] +# options: USER [FORMAT] # # The function for obtaining the list of domains with SSL parameter displayed. # This call was arranged for filling in the lack of information by applying @@ -23,7 +23,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user [format]' +check_args '1' "$#" 'USER [FORMAT]' validate_format 'user' is_object_valid 'user' 'USER' "$user" @@ -43,7 +43,7 @@ case $format in json) json_list ;; plain) nohead=1; shell_list ;; shell) shell_list | column -t ;; - *) check_args '1' "0" 'user [format]' + *) check_args '1' "0" 'USER [FORMAT]' esac diff --git a/bin/v-list-web-domains-stats b/bin/v-list-web-domains-stats index b0b890cae..52c3eb23a 100755 --- a/bin/v-list-web-domains-stats +++ b/bin/v-list-web-domains-stats @@ -1,6 +1,6 @@ #!/bin/bash # info: list web domains and stats key -# options: user [format] +# options: USER [FORMAT] # # The function for obtaining the list of domains with statistics parameter # displayed, including authentication settings. This call was arranged for @@ -24,7 +24,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user [format]' +check_args '1' "$#" 'USER [FORMAT]' validate_format 'user' is_object_valid 'user' 'USER' "$user" @@ -44,7 +44,7 @@ case $format in json) json_list ;; plain) nohead=1; shell_list ;; shell) shell_list | column -t ;; - *) check_args '1' "0" 'user [format]' + *) check_args '1' "0" 'USER [FORMAT]' esac diff --git a/bin/v-list-web-stats b/bin/v-list-web-stats index 086dcc8fc..33d56c24a 100755 --- a/bin/v-list-web-stats +++ b/bin/v-list-web-stats @@ -1,6 +1,6 @@ #!/bin/bash # info: list web statistics -# options: [format] +# options: [FORMAT] # # The function for obtaining the list of web statistics analyzer. @@ -55,7 +55,7 @@ case $format in json) json_list_st ;; plain) nohead=1; shell_list_st ;; shell) shell_list_st ;; - *) check_args '1' '0' '[format]' ;; + *) check_args '1' '0' '[FORMAT]' ;; esac diff --git a/bin/v-list-web-templates b/bin/v-list-web-templates index f3009dc34..973ad9134 100755 --- a/bin/v-list-web-templates +++ b/bin/v-list-web-templates @@ -1,6 +1,6 @@ #!/bin/bash # info: list web templates -# options: user [format] +# options: USER [FORMAT] # # The function for obtaining the list of apache templates available to a user. @@ -57,7 +57,7 @@ case $format in json) json_list_wtpl ;; plain) nohead=1; shell_list_wtpl ;; shell) shell_list_wtpl ;; - *) check_args '1' '0' '[format]' + *) check_args '1' '0' '[FORMAT]' esac diff --git a/bin/v-list-web-templates-nginx b/bin/v-list-web-templates-nginx index aa4993ddf..4b6b0f640 100755 --- a/bin/v-list-web-templates-nginx +++ b/bin/v-list-web-templates-nginx @@ -1,6 +1,6 @@ #!/bin/bash # info: listing nginx templates -# options: [format] +# options: [FORMAT] # # The function for obtaining the list of nginx templates available to a user. @@ -56,7 +56,7 @@ case $format in json) json_list_wtpl ;; plain) nohead=1; shell_list_wtpl ;; shell) shell_list_wtpl ;; - *) check_args '1' '0' '[format]' + *) check_args '1' '0' '[FORMAT]' esac diff --git a/bin/v-rebuild-cron-jobs b/bin/v-rebuild-cron-jobs index 84f5fa6be..f27b6ccf4 100755 --- a/bin/v-rebuild-cron-jobs +++ b/bin/v-rebuild-cron-jobs @@ -1,6 +1,6 @@ #!/bin/bash # info: rebuild cron jobs -# options: user [restart] +# options: USER [RESTART] # # The function rebuilds system cron config file for specified user. @@ -22,7 +22,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user [restart]' +check_args '1' "$#" 'USER [RESTART]' validate_format 'user' is_system_enabled "$CRON_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-rebuild-databases b/bin/v-rebuild-databases index 2052fa5c4..eee88915b 100755 --- a/bin/v-rebuild-databases +++ b/bin/v-rebuild-databases @@ -1,6 +1,6 @@ #!/bin/bash # info: rebuild databases -# options: user +# options: USER # # The function for rebuilding of all databases of a single user. @@ -22,7 +22,7 @@ source $VESTA/func/db.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user' +check_args '1' "$#" 'USER' validate_format 'user' is_system_enabled "$DB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-rebuild-dns-domains b/bin/v-rebuild-dns-domains index 1f4892167..aaec4e981 100755 --- a/bin/v-rebuild-dns-domains +++ b/bin/v-rebuild-dns-domains @@ -1,6 +1,6 @@ #!/bin/bash # info: rebuild dns domains -# options: user [restart] +# options: USER [RESTART] # # The function rebuilds BIND configuration files for all dns domains. @@ -23,7 +23,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user [restart]' +check_args '1' "$#" 'USER [RESTART]' validate_format 'user' is_system_enabled "$DNS_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-rebuild-mail-domains b/bin/v-rebuild-mail-domains index 2771f097c..db539ad6a 100755 --- a/bin/v-rebuild-mail-domains +++ b/bin/v-rebuild-mail-domains @@ -1,6 +1,6 @@ #!/bin/bash # info: rebuild mail domains -# options: user +# options: USER # # The function rebuilds EXIM configuration files for all mail domains. @@ -22,7 +22,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user' +check_args '1' "$#" 'USER' validate_format 'user' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-rebuild-user b/bin/v-rebuild-user index 356c9dadf..ee71c53a7 100755 --- a/bin/v-rebuild-user +++ b/bin/v-rebuild-user @@ -1,6 +1,6 @@ #!/bin/bash # info: rebuild system user -# options: user [restart] +# options: USER [RESTART] # # The function rebuilds system user account. @@ -22,7 +22,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user [restart]' +check_args '1' "$#" 'USER [RESTART]' validate_format 'user' is_object_valid 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user" diff --git a/bin/v-rebuild-web-domains b/bin/v-rebuild-web-domains index 107c2621e..5534b3c53 100755 --- a/bin/v-rebuild-web-domains +++ b/bin/v-rebuild-web-domains @@ -1,6 +1,6 @@ #!/bin/bash # info: rebuild dns domains -# options: user [restart] +# options: USER [RESTART] # # The function rebuilds BIND configuration files for all dns domains. @@ -24,7 +24,7 @@ source $VESTA/func/ip.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user [restart]' +check_args '1' "$#" 'USER [RESTART]' validate_format 'user' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-restart-cron b/bin/v-restart-cron index 3499a3f2a..458aa4bf6 100755 --- a/bin/v-restart-cron +++ b/bin/v-restart-cron @@ -1,6 +1,6 @@ #!/bin/bash # info: restart cron service -# options: none +# options: NONE # # The function tells crond service to reread its configuration files. diff --git a/bin/v-restart-dns b/bin/v-restart-dns index b99373732..8fc51dd2a 100755 --- a/bin/v-restart-dns +++ b/bin/v-restart-dns @@ -1,6 +1,6 @@ #!/bin/bash # info: restart dns service -# options: none +# options: NONE # # The function tells BIND service to reload dns zone files. diff --git a/bin/v-restart-mail b/bin/v-restart-mail index 6c3021791..d1467be1a 100755 --- a/bin/v-restart-mail +++ b/bin/v-restart-mail @@ -1,6 +1,6 @@ #!/bin/bash # info: restart mail service -# options: none +# options: NONE # # The function tells Exim service to reload configuration files. diff --git a/bin/v-restart-web b/bin/v-restart-web index 64d00d71d..7ad083380 100755 --- a/bin/v-restart-web +++ b/bin/v-restart-web @@ -1,6 +1,6 @@ #!/bin/bash # info: restart dns service -# options: none +# options: NONE # # The function tells BIND service to reload dns zone files. diff --git a/bin/v-restore-user b/bin/v-restore-user index 235689724..84cc3e383 100755 --- a/bin/v-restore-user +++ b/bin/v-restore-user @@ -1,6 +1,6 @@ #!/bin/bash # info: restore user -# options: user backup +# options: USER BACKUP # # The function for resotring user from backup. diff --git a/bin/v-search-domain-owner b/bin/v-search-domain-owner index c09a1c945..21ed0b098 100755 --- a/bin/v-search-domain-owner +++ b/bin/v-search-domain-owner @@ -1,6 +1,6 @@ #!/bin/bash # info: search domain owner -# options: domain [type] +# options: DOMAIN [TYPE] # # The function that allows to find user objects. @@ -21,7 +21,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'domain [type]' +check_args '1' "$#" 'DOMAIN [TYPE]' #----------------------------------------------------------# diff --git a/bin/v-search-object b/bin/v-search-object index 0cc2e47bd..7c4185ad4 100755 --- a/bin/v-search-object +++ b/bin/v-search-object @@ -1,6 +1,6 @@ #!/bin/bash # info: search objects -# options: object [format] +# options: OBJECT [FORMAT] # # The function that allows to find system objects. @@ -70,7 +70,7 @@ shell_list_search() { # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'object [format]' +check_args '1' "$#" 'OBJECT [FORMAT]' validate_format 'object' @@ -243,7 +243,7 @@ case $format in plain) nohead=1; shell_list_search ;; shell) fields='$USER~$TYPE~$KEY~$RESULT~$ALIAS'; shell_list |column -t -s '~' ;; - *) check_args '1' '0' 'object [format]' + *) check_args '1' '0' 'OBJECT [FORMAT]' esac rm $conf diff --git a/bin/v-search-user-object b/bin/v-search-user-object index 9d956c70e..86e4bbcfb 100755 --- a/bin/v-search-user-object +++ b/bin/v-search-user-object @@ -1,6 +1,6 @@ #!/bin/bash # info: search objects -# options: user object [format] +# options: USER OBJECT [FORMAT] # # The function that allows to find user objects. @@ -71,7 +71,7 @@ shell_list_search() { # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user object [format]' +check_args '2' "$#" 'USER OBJECT [FORMAT]' validate_format 'user' 'object' is_object_valid 'user' 'USER' "$user" @@ -243,7 +243,7 @@ case $format in plain) nohead=1; shell_list_search ;; shell) fields='$USER~$TYPE~$KEY~$RESULT~$ALIAS'; shell_list |column -t -s '~' ;; - *) check_args '2' '0' 'user object [format]' + *) check_args '2' '0' 'USER OBJECT [FORMAT]' esac rm $conf diff --git a/bin/v-suspend-cron-job b/bin/v-suspend-cron-job index 43d118c80..a9c290192 100755 --- a/bin/v-suspend-cron-job +++ b/bin/v-suspend-cron-job @@ -1,6 +1,6 @@ #!/bin/bash # info: suspend cron job -# options: user job [restart] +# options: USER JOB [RESTART] # # The function suspends a certain job of the cron scheduler. @@ -23,7 +23,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user job [restart]' +check_args '2' "$#" 'USER JOB [RESTART]' validate_format 'user' 'job' is_object_valid 'user' 'USER' "$user" is_object_valid 'cron' 'JOB' "$job" diff --git a/bin/v-suspend-cron-jobs b/bin/v-suspend-cron-jobs index 6d4505550..5dadc5c6d 100755 --- a/bin/v-suspend-cron-jobs +++ b/bin/v-suspend-cron-jobs @@ -1,6 +1,6 @@ #!/bin/bash # info: Suspending sys cron jobs -# options: user [restart] +# options: USER [RESTART] # # The function suspends all user cron jobs. @@ -22,7 +22,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user' +check_args '1' "$#" 'USER' validate_format 'user' is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-suspend-database b/bin/v-suspend-database index 84b943db9..7153182cc 100755 --- a/bin/v-suspend-database +++ b/bin/v-suspend-database @@ -1,6 +1,6 @@ #!/bin/bash # info: suspend database -# options: user database +# options: USER DATABASE # # The function for suspending a certain user database. @@ -23,7 +23,7 @@ source $VESTA/func/db.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user database' +check_args '2' "$#" 'USER DATABASE' validate_format 'user' 'database' is_system_enabled "$DB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-suspend-database-server b/bin/v-suspend-database-server index 2854dae62..51d3e4282 100755 --- a/bin/v-suspend-database-server +++ b/bin/v-suspend-database-server @@ -1,6 +1,6 @@ #!/bin/bash # info: suspend database server -# options: type host +# options: TYPE HOST # # The function for suspending a database server. @@ -22,7 +22,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'type host' +check_args '2' "$#" 'TYPE HOST' validate_format 'type' 'host' is_system_enabled "$DB_SYSTEM" is_object_valid "../../conf/$type" 'HOST' "$host" diff --git a/bin/v-suspend-databases b/bin/v-suspend-databases index 8ff792e96..e3ed49bbd 100755 --- a/bin/v-suspend-databases +++ b/bin/v-suspend-databases @@ -1,6 +1,6 @@ #!/bin/bash # info: suspend databases -# options: user +# options: USER # # The function for suspending of all databases of a single user. @@ -21,7 +21,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user' +check_args '1' "$#" 'USER' validate_format 'user' is_system_enabled "$DB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-suspend-dns-domain b/bin/v-suspend-dns-domain index 7ce528d88..7f061805d 100755 --- a/bin/v-suspend-dns-domain +++ b/bin/v-suspend-dns-domain @@ -1,6 +1,6 @@ #!/bin/bash # info: suspend dns domain -# options: user domain [restart] +# options: USER DOMAIN [RESTART] # # The function suspends a certain user's domain. @@ -24,7 +24,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain [restart]' +check_args '2' "$#" 'USER DOMAIN [RESTART]' validate_format 'user' 'domain' is_system_enabled "$DNS_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-suspend-dns-domain-record b/bin/v-suspend-dns-domain-record index d7f1b5170..bad2e6cf8 100755 --- a/bin/v-suspend-dns-domain-record +++ b/bin/v-suspend-dns-domain-record @@ -1,6 +1,6 @@ #!/bin/bash # info: suspend dns domain record -# options: user domain id [restart] +# options: USER DOMAIN ID [RESTART] # # The function suspends a certain domain record. @@ -26,7 +26,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain id [restart]' +check_args '3' "$#" 'USER DOMAIN ID [RESTART]' validate_format 'user' 'domain' 'id' is_system_enabled "$DNS_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-suspend-dns-domains b/bin/v-suspend-dns-domains index 7bb2e8c1f..fa64aaed9 100755 --- a/bin/v-suspend-dns-domains +++ b/bin/v-suspend-dns-domains @@ -1,6 +1,6 @@ #!/bin/bash # info: suspend dns domains -# options: user [restart] +# options: USER [RESTART] # # The function suspends all user's DNS domains. @@ -22,7 +22,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user [restart]' +check_args '1' "$#" 'USER [RESTART]' validate_format 'user' is_system_enabled "$DNS_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-suspend-mail-account b/bin/v-suspend-mail-account index 1944612f3..6d1f90479 100755 --- a/bin/v-suspend-mail-account +++ b/bin/v-suspend-mail-account @@ -1,6 +1,6 @@ #!/bin/bash # info: suspend mail account -# options: user domain account +# options: USER DOMAIN ACCOUNT # # The function suspends mail account. @@ -26,7 +26,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain account' +check_args '3' "$#" 'USER DOMAIN ACCOUNT' validate_format 'user' 'domain' 'account' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-suspend-mail-accounts b/bin/v-suspend-mail-accounts index 789c34921..e0b439cc2 100755 --- a/bin/v-suspend-mail-accounts +++ b/bin/v-suspend-mail-accounts @@ -1,6 +1,6 @@ #!/bin/bash # info: suspend all mail domain accounts -# options: user domain +# options: USER DOMAIN # # The function suspends all mail domain accounts. @@ -24,7 +24,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain' +check_args '2' "$#" 'USER DOMAIN' validate_format 'user' 'domain' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-suspend-mail-domain b/bin/v-suspend-mail-domain index ef60bc22b..7fdc60f22 100755 --- a/bin/v-suspend-mail-domain +++ b/bin/v-suspend-mail-domain @@ -1,6 +1,6 @@ #!/bin/bash # info: suspend mail domain -# options: user domain +# options: USER DOMAIN # # The function suspends mail domain. @@ -25,7 +25,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain' +check_args '2' "$#" 'USER DOMAIN' validate_format 'user' 'domain' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-suspend-mail-domains b/bin/v-suspend-mail-domains index 99ee8e468..60fba66b0 100755 --- a/bin/v-suspend-mail-domains +++ b/bin/v-suspend-mail-domains @@ -1,6 +1,6 @@ #!/bin/bash # info: suspend mail domains -# options: user +# options: USER # # The function suspends all user's MAIL domains. @@ -22,7 +22,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user' +check_args '1' "$#" 'USER' validate_format 'user' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-suspend-user b/bin/v-suspend-user index f159b7832..16c9569aa 100755 --- a/bin/v-suspend-user +++ b/bin/v-suspend-user @@ -1,6 +1,6 @@ #!/bin/bash # info: suspend user -# options: user [restart] +# options: USER [RESTART] # # The function suspends a certain user and all his objects. @@ -22,7 +22,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user [restart]' +check_args '1' "$#" 'USER [RESTART]' validate_format 'user' is_object_valid 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user" diff --git a/bin/v-suspend-web-domain b/bin/v-suspend-web-domain index 349be3e04..de707089c 100755 --- a/bin/v-suspend-web-domain +++ b/bin/v-suspend-web-domain @@ -1,6 +1,6 @@ #!/bin/bash # info: suspend web domain -# options: user domain +# options: USER DOMAIN # # The function for suspending the site's operation. After blocking it all # visitors will be redirected to a web page explaining the reason of suspend. @@ -28,7 +28,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain [restart]' +check_args '2' "$#" 'USER DOMAIN [RESTART]' validate_format 'user' 'domain' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-suspend-web-domains b/bin/v-suspend-web-domains index 90a85f8e5..7fa0d83b2 100755 --- a/bin/v-suspend-web-domains +++ b/bin/v-suspend-web-domains @@ -1,6 +1,6 @@ #!/bin/bash # info: suspend web domains -# options: user [restart] +# options: USER [RESTART] # # The function of suspending all user's sites. @@ -23,7 +23,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user [restart]' +check_args '1' "$#" 'USER [RESTART]' validate_format 'user' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-unsuspend-cron-job b/bin/v-unsuspend-cron-job index 64e6d62b4..23c45bbac 100755 --- a/bin/v-unsuspend-cron-job +++ b/bin/v-unsuspend-cron-job @@ -1,6 +1,6 @@ #!/bin/bash # info: unuspend cron job -# options: user job [restart] +# options: USER JOB [RESTART] # # The function unsuspen certain cron job. @@ -23,7 +23,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user job [restart]' +check_args '2' "$#" 'USER JOB [RESTART]' validate_format 'user' 'job' 'restart' is_object_valid 'user' 'USER' "$user" is_object_valid 'cron' 'JOB' "$job" diff --git a/bin/v-unsuspend-cron-jobs b/bin/v-unsuspend-cron-jobs index b05d00951..066b6d629 100755 --- a/bin/v-unsuspend-cron-jobs +++ b/bin/v-unsuspend-cron-jobs @@ -1,6 +1,6 @@ #!/bin/bash # info: unuspend sys cron -# options: user [restart] +# options: USER [RESTART] # # The function unsuspends all suspended cron jobs. @@ -22,7 +22,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user [restart]' +check_args '1' "$#" 'USER [RESTART]' validate_format 'user' is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-unsuspend-database b/bin/v-unsuspend-database index d700dd0a9..b62297583 100755 --- a/bin/v-unsuspend-database +++ b/bin/v-unsuspend-database @@ -1,6 +1,6 @@ #!/bin/bash # info: unsuspend database -# options: user database +# options: USER DATABASE # # The function for unsuspending database. @@ -23,7 +23,7 @@ source $VESTA/func/db.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user database' +check_args '2' "$#" 'USER DATABASE' validate_format 'user' 'database' is_system_enabled "$DB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-unsuspend-database-server b/bin/v-unsuspend-database-server index 387e1cf16..8c98945b3 100755 --- a/bin/v-unsuspend-database-server +++ b/bin/v-unsuspend-database-server @@ -1,6 +1,6 @@ #!/bin/bash # info: unsuspend database server -# options: type host +# options: TYPE HOST # # The function for unsuspending a database server. @@ -22,7 +22,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'type host' +check_args '2' "$#" 'TYPE HOST' validate_format 'type' 'host' is_system_enabled "$DB_SYSTEM" is_object_valid "../../conf/$type" 'HOST' "$host" diff --git a/bin/v-unsuspend-databases b/bin/v-unsuspend-databases index 5d48a209b..d036cadbc 100755 --- a/bin/v-unsuspend-databases +++ b/bin/v-unsuspend-databases @@ -1,6 +1,6 @@ #!/bin/bash # info: unsuspend databases -# options: user +# options: USER # # The function for unsuspending all user's databases. @@ -22,7 +22,7 @@ source $VESTA/func/db.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user' +check_args '1' "$#" 'USER' validate_format 'user' is_system_enabled "$DB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-unsuspend-dns-domain b/bin/v-unsuspend-dns-domain index 9cfdf2120..eb0cabf73 100755 --- a/bin/v-unsuspend-dns-domain +++ b/bin/v-unsuspend-dns-domain @@ -1,6 +1,6 @@ #!/bin/bash # info: unsuspend dns domain -# options: user domain +# options: USER DOMAIN # # The function unsuspends a certain user's domain. @@ -24,7 +24,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain' +check_args '2' "$#" 'USER DOMAIN' validate_format 'user' 'domain' is_system_enabled "$DNS_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-unsuspend-dns-domain-record b/bin/v-unsuspend-dns-domain-record index a95a75d90..66e1b93c3 100755 --- a/bin/v-unsuspend-dns-domain-record +++ b/bin/v-unsuspend-dns-domain-record @@ -1,6 +1,6 @@ #!/bin/bash # info: unsuspend dns domain record -# options: user domain id [restart] +# options: USER DOMAIN ID [RESTART] # # The function unsuspends a certain domain record. @@ -26,7 +26,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain id [restart]' +check_args '3' "$#" 'USER DOMAIN ID [RESTART]' validate_format 'user' 'domain' 'id' is_system_enabled "$DNS_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-unsuspend-dns-domains b/bin/v-unsuspend-dns-domains index 468b41a00..54173de42 100755 --- a/bin/v-unsuspend-dns-domains +++ b/bin/v-unsuspend-dns-domains @@ -1,6 +1,6 @@ #!/bin/bash # info: unsuspend dns domains -# options: user [restart] +# options: USER [RESTART] # # The function unsuspends all user's DNS domains. @@ -22,7 +22,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user [restart]' +check_args '1' "$#" 'USER [RESTART]' validate_format 'user' is_system_enabled "$DNS_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-unsuspend-mail-account b/bin/v-unsuspend-mail-account index 2cf7216aa..8c2179d91 100755 --- a/bin/v-unsuspend-mail-account +++ b/bin/v-unsuspend-mail-account @@ -1,6 +1,6 @@ #!/bin/bash # info: unsuspend mail account -# options: user domain account +# options: USER DOMAIN ACCOUNT # # The function unsuspends mail account. @@ -26,7 +26,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'user domain account' +check_args '3' "$#" 'USER DOMAIN ACCOUNT' validate_format 'user' 'domain' 'account' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-unsuspend-mail-accounts b/bin/v-unsuspend-mail-accounts index e71f57901..f3deb1757 100755 --- a/bin/v-unsuspend-mail-accounts +++ b/bin/v-unsuspend-mail-accounts @@ -1,6 +1,6 @@ #!/bin/bash # info: unsuspend all mail domain accounts -# options: user domain +# options: USER DOMAIN # # The function unsuspends all mail domain accounts. @@ -24,7 +24,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain' +check_args '2' "$#" 'USER DOMAIN' validate_format 'user' 'domain' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-unsuspend-mail-domain b/bin/v-unsuspend-mail-domain index 7f2504d5e..c6374a0df 100755 --- a/bin/v-unsuspend-mail-domain +++ b/bin/v-unsuspend-mail-domain @@ -1,6 +1,6 @@ #!/bin/bash # info: unsuspend mail domain -# options: user domain +# options: USER DOMAIN # # The function unsuspends mail domain. @@ -25,7 +25,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain' +check_args '2' "$#" 'USER DOMAIN' validate_format 'user' 'domain' is_system_enabled 'MAIL_SYSTEM' is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-unsuspend-mail-domains b/bin/v-unsuspend-mail-domains index a1c37bc68..08161d4f2 100755 --- a/bin/v-unsuspend-mail-domains +++ b/bin/v-unsuspend-mail-domains @@ -1,6 +1,6 @@ #!/bin/bash # info: unsuspend mail domains -# options: user +# options: USER # # The function unsuspends all user's MAIL domains. @@ -22,7 +22,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user' +check_args '1' "$#" 'USER' validate_format 'user' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-unsuspend-user b/bin/v-unsuspend-user index 10ecbc23e..4a0b3e14d 100755 --- a/bin/v-unsuspend-user +++ b/bin/v-unsuspend-user @@ -1,6 +1,6 @@ #!/bin/bash # info: unsuspend user -# options: user [restart] +# options: USER [RESTART] # # The function unsuspends user and all his objects. @@ -22,7 +22,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user' +check_args '1' "$#" 'USER' validate_format 'user' is_object_valid 'user' 'USER' "$user" if [ "$user" = 'admin' ]; then diff --git a/bin/v-unsuspend-web-domain b/bin/v-unsuspend-web-domain index 85d1dbcd3..b62fa1aed 100755 --- a/bin/v-unsuspend-web-domain +++ b/bin/v-unsuspend-web-domain @@ -1,6 +1,6 @@ #!/bin/bash # info: unsuspend web domain -# options: user domain +# options: USER DOMAIN # # The function of unsuspending the domain. @@ -25,7 +25,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain [restart]' +check_args '2' "$#" 'USER DOMAIN [RESTART]' validate_format 'user' 'domain' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-unsuspend-web-domains b/bin/v-unsuspend-web-domains index 474766fac..dda4a09c2 100755 --- a/bin/v-unsuspend-web-domains +++ b/bin/v-unsuspend-web-domains @@ -1,6 +1,6 @@ #!/bin/bash # info: unsuspend web domains -# options: user [restart] +# options: USER [RESTART] # # The function of unsuspending all user's sites. @@ -23,7 +23,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user [restart]' +check_args '1' "$#" 'USER [RESTART]' validate_format 'user' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-update-database-disk b/bin/v-update-database-disk index 528a031c9..695fb8c2b 100755 --- a/bin/v-update-database-disk +++ b/bin/v-update-database-disk @@ -1,6 +1,6 @@ #!/bin/bash # info: update database disk usage -# options: user database +# options: USER DATABASE # # The function recalculates disk usage for speciefic database. @@ -23,7 +23,7 @@ source $VESTA/func/db.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user database' +check_args '2' "$#" 'USER DATABASE' validate_format 'user' 'database' is_system_enabled "$DB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-update-databases-disk b/bin/v-update-databases-disk index 1031a1b0b..c434be053 100755 --- a/bin/v-update-databases-disk +++ b/bin/v-update-databases-disk @@ -1,6 +1,6 @@ #!/bin/bash # info: update databases disk usage -# options: user +# options: USER # # The function recalculates disk usage for all user databases. @@ -21,7 +21,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user' +check_args '1' "$#" 'USER' validate_format 'user' is_system_enabled "$DB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-update-mail-domain-disk b/bin/v-update-mail-domain-disk index 8919afed0..6d82aed0a 100755 --- a/bin/v-update-mail-domain-disk +++ b/bin/v-update-mail-domain-disk @@ -1,6 +1,6 @@ #!/bin/bash # info: update mail domain disk usage -# options: user domain +# options: USER DOMAIN # # The function updates domain disk usage. @@ -24,7 +24,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain' +check_args '2' "$#" 'USER DOMAIN' validate_format 'user' 'domain' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-update-mail-domains-disk b/bin/v-update-mail-domains-disk index d2c835c73..f711dabee 100755 --- a/bin/v-update-mail-domains-disk +++ b/bin/v-update-mail-domains-disk @@ -1,6 +1,6 @@ #!/bin/bash # info: calculate disk usage for all mail domains -# options: user +# options: USER # # The function calculates disk usage for all mail domains. @@ -21,7 +21,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user' +check_args '1' "$#" 'USER' validate_format 'user' is_system_enabled "$MAIL_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-update-sys-ip b/bin/v-update-sys-ip index c34387e37..da5bca6f3 100755 --- a/bin/v-update-sys-ip +++ b/bin/v-update-sys-ip @@ -1,6 +1,6 @@ #!/bin/bash # info: update system ip -# options: [user] [ip_status] +# options: [USER] [IP_STATUS] # # The function scans configured ip in the system and register them with vesta # internal database. This call is intended for use on vps servers, where ip is @@ -26,7 +26,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '0' "$#" '[user] [ip_status]' +check_args '0' "$#" '[USER] [IP_STATUS]' validate_format 'user' 'ip_status' is_object_valid 'user' 'USER' "$user" "$user" diff --git a/bin/v-update-sys-queue b/bin/v-update-sys-queue index 54b4d1963..04868006a 100755 --- a/bin/v-update-sys-queue +++ b/bin/v-update-sys-queue @@ -1,6 +1,6 @@ #!/bin/bash # info: update system queue -# options: pipe +# options: PIPE # # This function is responsible queue processing. Restarts of services, # scheduled backups, web log parsing and other heavy resource consuming @@ -31,7 +31,7 @@ PATH=$PATH:$BIN # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'queue' +check_args '1' "$#" 'QUEUE' #----------------------------------------------------------# @@ -47,7 +47,7 @@ case $queue in backup) bash $VESTA/data/queue/backup.pipe;; disk) bash $VESTA/data/queue/disk.pipe;; traffic) bash $VESTA/data/queue/traffic.pipe;; - *) check_args '1' '0' 'queue' + *) check_args '1' '0' 'QUEUE' esac diff --git a/bin/v-update-sys-rrd b/bin/v-update-sys-rrd index e264d4fc6..8b6aba36b 100755 --- a/bin/v-update-sys-rrd +++ b/bin/v-update-sys-rrd @@ -1,6 +1,6 @@ #!/bin/bash # info: update system rrd charts -# options: none +# options: NONE # # The script is wrapper for all rrd functions. It updates all # v-update-sys-rrd_* at once. diff --git a/bin/v-update-sys-rrd-ftp b/bin/v-update-sys-rrd-ftp index e79623bcf..4436f2828 100755 --- a/bin/v-update-sys-rrd-ftp +++ b/bin/v-update-sys-rrd-ftp @@ -1,6 +1,6 @@ #!/bin/bash # info: update ftp rrd -# options: period +# options: PERIOD # # The function is for updating ftpd rrd database and graphic. diff --git a/bin/v-update-sys-rrd-httpd b/bin/v-update-sys-rrd-httpd index 297d1028a..620631c6a 100755 --- a/bin/v-update-sys-rrd-httpd +++ b/bin/v-update-sys-rrd-httpd @@ -1,6 +1,6 @@ #!/bin/bash # info: update httpd rrd -# options: period +# options: PERIOD # # The function is for updating apache rrd database and graphic. diff --git a/bin/v-update-sys-rrd-la b/bin/v-update-sys-rrd-la index 8879446b9..da63024be 100755 --- a/bin/v-update-sys-rrd-la +++ b/bin/v-update-sys-rrd-la @@ -1,6 +1,6 @@ #!/bin/bash # info: update load average rrd -# options: period +# options: PERIOD # # The function is for updating load average rrd database and graphic. diff --git a/bin/v-update-sys-rrd-mem b/bin/v-update-sys-rrd-mem index 639db83b5..85269b827 100755 --- a/bin/v-update-sys-rrd-mem +++ b/bin/v-update-sys-rrd-mem @@ -1,6 +1,6 @@ #!/bin/bash # info: update memory rrd -# options: period +# options: PERIOD # # The function is for updating memory rrd database and graphic. diff --git a/bin/v-update-sys-rrd-mysql b/bin/v-update-sys-rrd-mysql index 95baf5eee..bc74f5049 100755 --- a/bin/v-update-sys-rrd-mysql +++ b/bin/v-update-sys-rrd-mysql @@ -1,6 +1,6 @@ #!/bin/bash # info: update MySQL rrd -# options: period +# options: PERIOD # # The function is for updating mysql rrd database and graphic. diff --git a/bin/v-update-sys-rrd-net b/bin/v-update-sys-rrd-net index b66397846..0c2ead684 100755 --- a/bin/v-update-sys-rrd-net +++ b/bin/v-update-sys-rrd-net @@ -1,6 +1,6 @@ #!/bin/bash # info: update network rrd -# options: period +# options: PERIOD # # The function is for updating network usage rrd database and graphic. diff --git a/bin/v-update-sys-rrd-nginx b/bin/v-update-sys-rrd-nginx index 6acd6433e..6f2664e11 100755 --- a/bin/v-update-sys-rrd-nginx +++ b/bin/v-update-sys-rrd-nginx @@ -1,6 +1,6 @@ #!/bin/bash # info: update nginx rrd -# options: period +# options: PERIOD # # The function is for updating nginx rrd database and graphic. diff --git a/bin/v-update-sys-rrd-pgsql b/bin/v-update-sys-rrd-pgsql index 5a4e9f38b..8aec1a280 100755 --- a/bin/v-update-sys-rrd-pgsql +++ b/bin/v-update-sys-rrd-pgsql @@ -1,6 +1,6 @@ #!/bin/bash # info: update PostgreSQL rrd -# options: period +# options: PERIOD # # The function is for updating postgresql rrd database and graphic. diff --git a/bin/v-update-sys-rrd-ssh b/bin/v-update-sys-rrd-ssh index 5fcb7e273..814f3878b 100755 --- a/bin/v-update-sys-rrd-ssh +++ b/bin/v-update-sys-rrd-ssh @@ -1,6 +1,6 @@ #!/bin/bash # info: update ssh rrd -# options: period +# options: PERIOD # # The function is for updating ssh rrd database and graphic. diff --git a/bin/v-update-sys-vesta b/bin/v-update-sys-vesta index 6e31b0ed4..788fcf57b 100755 --- a/bin/v-update-sys-vesta +++ b/bin/v-update-sys-vesta @@ -1,6 +1,6 @@ #!/bin/bash # info: update vesta after rpm update -# options: version +# options: VERSION # # The function is runs as rpm update trigger. It pulls shell script from vesta # server and runs it. @@ -27,7 +27,7 @@ source $VESTA/func/main.sh #----------------------------------------------------------# # Checking arg number -check_args '1' "$#" 'version' +check_args '1' "$#" 'VERSION' #----------------------------------------------------------# diff --git a/bin/v-update-user-backups b/bin/v-update-user-backups index 628ea3c06..3604ae5b6 100755 --- a/bin/v-update-user-backups +++ b/bin/v-update-user-backups @@ -1,6 +1,6 @@ #!/bin/bash # info: update user backups -# options: user +# options: USER # # The function rescan backup directory and updates backup database. @@ -174,7 +174,7 @@ check_ftp_connection(){ # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user' +check_args '1' "$#" 'USER' is_system_enabled "$BACKUP_SYSTEM" validate_format 'user' is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-update-user-counters b/bin/v-update-user-counters index a90debbb7..e81db53b5 100755 --- a/bin/v-update-user-counters +++ b/bin/v-update-user-counters @@ -1,6 +1,6 @@ #!/bin/bash # info: update user usage counters -# options: user +# options: USER # # Function updates usage counters like U_WEB_DOMAINS, U_MAIL_ACCOUNTS, etc. @@ -21,7 +21,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '0' "$#" 'user' +check_args '0' "$#" 'USER' if [ ! -z "$user" ]; then validate_format 'user' is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-update-user-disk b/bin/v-update-user-disk index 19d4812b5..b567f1243 100755 --- a/bin/v-update-user-disk +++ b/bin/v-update-user-disk @@ -1,6 +1,6 @@ #!/bin/bash # info: update user disk usage -# options: user +# options: USER # # The functions recalculates disk usage and updates database. @@ -21,7 +21,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user' +check_args '1' "$#" 'USER' validate_format 'user' is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-update-user-package b/bin/v-update-user-package index 933a333ad..780d21b28 100755 --- a/bin/v-update-user-package +++ b/bin/v-update-user-package @@ -1,6 +1,6 @@ #!/bin/bash # info: update user package -# options: pacakge +# options: PACAKGE # # The function propogates package to connected users. @@ -21,7 +21,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'package' +check_args '1' "$#" 'PACKAGE' validate_format 'package' is_package_valid diff --git a/bin/v-update-user-stats b/bin/v-update-user-stats index b62945274..1ddf95654 100755 --- a/bin/v-update-user-stats +++ b/bin/v-update-user-stats @@ -1,6 +1,6 @@ #!/bin/bash # info: update user statistics -# options: user +# options: USER # # Function logs user parameters into statistics database. @@ -26,7 +26,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '0' "$#" 'user' +check_args '0' "$#" 'USER' if [ ! -z "$user" ]; then validate_format 'user' is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-update-web-domain-disk b/bin/v-update-web-domain-disk index 5e838a062..b820748f7 100755 --- a/bin/v-update-web-domain-disk +++ b/bin/v-update-web-domain-disk @@ -1,6 +1,6 @@ #!/bin/bash # info: update disk usage for domain -# options: user domain +# options: USER DOMAIN # # The function recalculates disk usage for speciefic webdomain. @@ -24,7 +24,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain' +check_args '2' "$#" 'USER DOMAIN' validate_format 'user' 'domain' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-update-web-domain-stat b/bin/v-update-web-domain-stat index 58093590e..cdaff9370 100755 --- a/bin/v-update-web-domain-stat +++ b/bin/v-update-web-domain-stat @@ -1,6 +1,6 @@ #!/bin/bash # info: update domain statistics -# options: user domain +# options: USER DOMAIN # # The function runs log analyzer for speciefic webdomain. @@ -24,7 +24,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain' +check_args '2' "$#" 'USER DOMAIN' validate_format 'user' 'domain' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-update-web-domain-traff b/bin/v-update-web-domain-traff index e0be5b0d1..6792cc37d 100755 --- a/bin/v-update-web-domain-traff +++ b/bin/v-update-web-domain-traff @@ -1,6 +1,6 @@ #!/bin/bash # info: update domain bandwidth usage -# options: user domain +# options: USER DOMAIN # # The function recalculates bandwidth usage for speciefic domain. @@ -24,7 +24,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'user domain' +check_args '2' "$#" 'USER DOMAIN' validate_format 'user' 'domain' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-update-web-domains-disk b/bin/v-update-web-domains-disk index b30fdc791..baee1b2cd 100755 --- a/bin/v-update-web-domains-disk +++ b/bin/v-update-web-domains-disk @@ -1,6 +1,6 @@ #!/bin/bash # info: update domains disk usage -# options: user +# options: USER # # The function recalculates disk usage for all user webdomains. @@ -21,7 +21,7 @@ source $VESTA/func/main.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user' +check_args '1' "$#" 'USER' validate_format 'user' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-update-web-domains-stat b/bin/v-update-web-domains-stat index 61c7615cc..ae9485184 100755 --- a/bin/v-update-web-domains-stat +++ b/bin/v-update-web-domains-stat @@ -1,6 +1,6 @@ #!/bin/bash # info: update domains statistics -# options: user +# options: USER # # The function runs log analyzer usage for all user webdomains. @@ -22,7 +22,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user' +check_args '1' "$#" 'USER' validate_format 'user' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-update-web-domains-traff b/bin/v-update-web-domains-traff index baf170db7..386c09b5a 100755 --- a/bin/v-update-web-domains-traff +++ b/bin/v-update-web-domains-traff @@ -1,6 +1,6 @@ #!/bin/bash # info: update domains bandwidth usage -# options: user +# options: USER # # The function recalculates bandwidth usage for all user webdomains. @@ -22,7 +22,7 @@ source $VESTA/func/domain.sh # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'user' +check_args '1' "$#" 'USER' validate_format 'user' is_system_enabled "$WEB_SYSTEM" is_object_valid 'user' 'USER' "$user" "$user"