github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-20 05:14:08 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 462edaf480 into 873693b2ed

Browse source
This commit is contained in:
Prime-DevIT 2025-06-04 22:53:22 +01:00 • committed by GitHub
commit 338599123d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1028 changed files with 5391 additions and 5368 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ISSUE_TEMPLATE.md
View file

@ -2,7 +2,7 @@
Type here, e.g. CentOS 6
### VestaCP Version:
### DevITCP Version:
Type here, e.g. 3.14159
@ -12,7 +12,7 @@ Type here, e.g. php-fpm, apache, nginx, mysql
### Steps to Reproduce:
Type here, e.g. install vesta and type rm -rf / --no-preserve-root
Type here, e.g. install devit and type rm -rf / --no-preserve-root
### Related Issues/Forum Threads:

18
README.md
View file

@ -1,13 +1,13 @@
[Vesta Control Panel](http://vestacp.com/)
[DevIT Control Panel](http://devitcp.com/)
==================================================
Vesta is back under active development as of 25 February 2024. We are commited to open source, and will engage with the community to identify the new roadmap for Vesta. Stay tuned!
DevIT is back under active development as of 25 February 2024. We are commited to open source, and will engage with the community to identify the new roadmap for DevIT. Stay tuned!
[![Join the chat at https://gitter.im/vesta-cp/Lobby](https://badges.gitter.im/vesta-cp/Lobby.svg)](https://gitter.im/vesta-cp/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Join the chat at https://gitter.im/devit-cp/Lobby](https://badges.gitter.im/devit-cp/Lobby.svg)](https://gitter.im/devit-cp/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
* Vesta is an open source hosting control panel.
* Vesta has a clean and focused interface without the clutter.
* Vesta has the latest of very innovative technologies.
* DevIT is an open source hosting control panel.
* DevIT has a clean and focused interface without the clutter.
* DevIT has the latest of very innovative technologies.
How to install (2 step)
----------------------------
@ -18,7 +18,7 @@ ssh root@your.server
Download the installation script, and run it:
```bash
curl https://vestacp.com/pub/vst-install.sh | bash
curl https://devitcp.com/pub/vst-install.sh | bash
```
How to install (3 step)
@ -31,7 +31,7 @@ ssh root@your.server
Download the installation script:
```bash
curl -O https://vestacp.com/pub/vst-install.sh
curl -O https://devitcp.com/pub/vst-install.sh
```
Then run it:
```bash
@ -40,5 +40,5 @@ bash vst-install.sh
License
----------------------------
Vesta is licensed under [GPL v3 ](https://github.com/outroll/vesta/blob/master/LICENSE) license
DevIT is licensed under [GPL v3 ](https://github.com/outroll/devit/blob/master/LICENSE) license

2
SECURITY.md
View file

@ -2,4 +2,4 @@
## Reporting a Vulnerability
Please report security issues to dev@vestacp.com
Please report security issues to dev@devitcp.com

6
bin/v-acknowledge-user-notification
View file

@ -14,8 +14,8 @@ user=$1
nid=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -48,7 +48,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Updating notification counter

22
bin/v-activate-vesta-license
View file

@ -1,8 +1,8 @@
#!/bin/bash
# info: activate vesta license
# info: activate devit license
# options: MODULE LICENSE
#
# The function activates and registers the vesta license
# The function activates and registers the devit license
#----------------------------------------------------------#
@ -17,8 +17,8 @@ license=$2
source /etc/profile
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -34,9 +34,9 @@ is_user_format_valid "$license" "license"
#----------------------------------------------------------#
# Activating license
v_host='https://vestacp.com/checkout'
v_host='https://devitcp.com/checkout'
answer=$(curl -s "$v_host/activate.php?licence_key=$license&module=$module")
check_result $? "cant' connect to vestacp.com " $E_CONNECT
check_result $? "cant' connect to devitcp.com " $E_CONNECT
# Checking server answer
if [[ "$answer" != '0' ]]; then
@ -46,14 +46,14 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Updating vesta.conf
if [ -z "$(grep "${module}_KEY" $VESTA/conf/vesta.conf)" ]; then
echo "${module}_KEY='$license'" >> $VESTA/conf/vesta.conf
# Updating devit.conf
if [ -z "$(grep "${module}_KEY" $devit/conf/devit.conf)" ]; then
echo "${module}_KEY='$license'" >> $devit/conf/devit.conf
else
sed -i "s/${module}_KEY=.*/${module}_KEY='$license'/g" $VESTA/conf/vesta.conf
sed -i "s/${module}_KEY=.*/${module}_KEY='$license'/g" $devit/conf/devit.conf
fi
# Activating sftpjail

18
bin/v-add-backup-host
View file

@ -18,8 +18,8 @@ path=${5-/backup}
port=$6
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
# Defining ftp command function
ftpc() {
@ -173,25 +173,25 @@ if [ $type != 'local' ]; then
date=$(echo "$time_n_date" |cut -f 2 -d \ )
str="HOST='$host'\nUSERNAME='$user'\nPASSWORD='$password'"
str="$str\nBPATH='$path'\nPORT='$port'\nTIME='$time'\nDATE='$date'"
echo -e "$str" > $VESTA/conf/$type.backup.conf
chmod 660 $VESTA/conf/$type.backup.conf
echo -e "$str" > $devit/conf/$type.backup.conf
chmod 660 $devit/conf/$type.backup.conf
fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Update vesta.conf
if [ -z "$(grep BACKUP_SYSTEM $VESTA/conf/vesta.conf)" ]; then
echo "BACKUP_SYSTEM='$type'" >> $VESTA/conf/vesta.conf
# Update devit.conf
if [ -z "$(grep BACKUP_SYSTEM $devit/conf/devit.conf)" ]; then
echo "BACKUP_SYSTEM='$type'" >> $devit/conf/devit.conf
else
bckp=$(echo "$BACKUP_SYSTEM,$type" |\
sed "s/,/\n/g"|\
sort -r -u |\
sed "/^$/d"|\
sed ':a;N;$!ba;s/\n/,/g')
sed -i "s/BACKUP_SYSTEM=.*/BACKUP_SYSTEM='$bckp'/g" $VESTA/conf/vesta.conf
sed -i "s/BACKUP_SYSTEM=.*/BACKUP_SYSTEM='$bckp'/g" $devit/conf/devit.conf
fi
# Logging

10
bin/v-add-cron-job
View file

@ -22,8 +22,8 @@ job=$8
restart=$9
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
HIDE=7
@ -57,10 +57,10 @@ str="JOB='$job' MIN='$min' HOUR='$hour' DAY='$day' MONTH='$month' WDAY='$wday'"
str="$str CMD='$command' SUSPENDED='no' TIME='$time' DATE='$date'"
# Adding to crontab
echo "$str" >> $VESTA/data/users/$user/cron.conf
echo "$str" >> $devit/data/users/$user/cron.conf
# Changing permissions
chmod 660 $VESTA/data/users/$user/cron.conf
chmod 660 $devit/data/users/$user/cron.conf
# Sort jobs by id number
sort_cron_jobs
@ -70,7 +70,7 @@ sync_cron_jobs
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Increasing cron value

10
bin/v-add-cron-letsencrypt-job
View file

@ -10,8 +10,8 @@
#----------------------------------------------------------#
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -26,15 +26,15 @@ is_system_enabled "$CRON_SYSTEM" 'CRON_SYSTEM'
#----------------------------------------------------------#
# Add cron job
cmd="sudo /usr/local/vesta/bin/v-update-sys-queue letsencrypt"
check_cron=$(grep "$cmd" $VESTA/data/users/admin/cron.conf 2> /dev/null)
cmd="sudo /usr/local/devit/bin/v-update-sys-queue letsencrypt"
check_cron=$(grep "$cmd" $devit/data/users/admin/cron.conf 2> /dev/null)
if [ -z "$check_cron" ] && [ ! -z "$CRON_SYSTEM" ]; then
$BIN/v-add-cron-job admin '*/5' '*' '*' '*' '*' "$cmd"
fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

6
bin/v-add-cron-reports
View file

@ -14,8 +14,8 @@
user=$1
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -41,7 +41,7 @@ sync_cron_jobs
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Restart crond

10
bin/v-add-cron-restart-job
View file

@ -10,8 +10,8 @@
#----------------------------------------------------------#
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -26,15 +26,15 @@ is_system_enabled "$CRON_SYSTEM" 'CRON_SYSTEM'
#----------------------------------------------------------#
# Add cron job
cmd="sudo /usr/local/vesta/bin/v-update-sys-queue restart"
check_cron=$(grep "$cmd" $VESTA/data/users/admin/cron.conf 2> /dev/null)
cmd="sudo /usr/local/devit/bin/v-update-sys-queue restart"
check_cron=$(grep "$cmd" $devit/data/users/admin/cron.conf 2> /dev/null)
if [ -z "$check_cron" ] && [ ! -z "$CRON_SYSTEM" ]; then
$BIN/v-add-cron-job admin '*' '*' '*' '*' '*' "$cmd"
fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

18
bin/v-add-cron-vesta-autoupdate
View file

@ -1,8 +1,8 @@
#!/bin/bash
# info: add cron job for vesta autoupdates
# info: add cron job for devit autoupdates
# options: NONE
#
# The function adds cronjob for vesta autoupdate.
# The function adds cronjob for devit autoupdate.
#----------------------------------------------------------#
@ -13,8 +13,8 @@
user=admin
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -24,7 +24,7 @@ source $VESTA/conf/vesta.conf
is_system_enabled "$CRON_SYSTEM" 'CRON_SYSTEM'
is_package_full 'CRON_JOBS'
get_next_cronjob
check_cron=$(grep 'v-update-sys-vesta-all' $USER_DATA/cron.conf)
check_cron=$(grep 'v-update-sys-devit-all' $USER_DATA/cron.conf)
if [ ! -z "$check_cron" ]; then
exit
fi
@ -45,17 +45,17 @@ hour=$(generate_password '1234567' '1')
day='*'
month='*'
wday='*'
command='sudo /usr/local/vesta/bin/v-update-sys-vesta-all'
command='sudo /usr/local/devit/bin/v-update-sys-devit-all'
# Concatenating cron string
str="JOB='$job' MIN='$min' HOUR='$hour' DAY='$day' MONTH='$month' WDAY='$wday'"
str="$str CMD='$command' SUSPENDED='no' TIME='$time' DATE='$date'"
# Adding to crontab
echo "$str" >> $VESTA/data/users/$user/cron.conf
echo "$str" >> $devit/data/users/$user/cron.conf
# Chaning permissions
chmod 660 $VESTA/data/users/$user/cron.conf
chmod 660 $devit/data/users/$user/cron.conf
# Sort jobs by id number
sort_cron_jobs
@ -65,7 +65,7 @@ sync_cron_jobs
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Increasing cron value

8
bin/v-add-database
View file

@ -26,9 +26,9 @@ charset=${7-UTF8}
charset=$(echo "$charset" |tr '[:lower:]' '[:upper:]')
# Includes
source $VESTA/func/main.sh
source $VESTA/func/db.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/db.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -63,7 +63,7 @@ esac
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Generating timestamp

20
bin/v-add-database-host
View file

@ -23,9 +23,9 @@ charsets=${7-UTF8,LATIN1,WIN1250,WIN1251,WIN1252,WIN1256,WIN1258,KOI8}
template=${8-template1}
# Includes
source $VESTA/func/main.sh
source $VESTA/func/db.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/db.sh
source $devit/conf/devit.conf
is_mysql_host_alive() {
mycnf=$(mktemp)
@ -94,23 +94,23 @@ esac
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Adding host to conf
echo "$str" >> $VESTA/conf/$type.conf
chmod 660 $VESTA/conf/$type.conf
echo "$str" >> $devit/conf/$type.conf
chmod 660 $devit/conf/$type.conf
# Updating vesta.conf
if [ -z "$(grep DB_SYSTEM $VESTA/conf/vesta.conf)" ]; then
echo "DB_SYSTEM='$type'" >> $VESTA/conf/vesta.conf
# Updating devit.conf
if [ -z "$(grep DB_SYSTEM $devit/conf/devit.conf)" ]; then
echo "DB_SYSTEM='$type'" >> $devit/conf/devit.conf
else
db=$(echo "$DB_SYSTEM,$type" |\
sed "s/,/\n/g"|\
sort -r -u |\
sed "/^$/d"|\
sed ':a;N;$!ba;s/\n/,/g')
sed -i "s/DB_SYSTEM=.*/DB_SYSTEM='$db'/g" $VESTA/conf/vesta.conf
sed -i "s/DB_SYSTEM=.*/DB_SYSTEM='$db'/g" $devit/conf/devit.conf
fi
# Logging

10
bin/v-add-dns-domain
View file

@ -28,9 +28,9 @@ ns8=${11}
restart=${12}
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
# Additional argument formatting
format_domain
@ -184,12 +184,12 @@ fi
# Updating dns-cluster queue
if [ ! -z "$DNS_CLUSTER" ]; then
cmd="$BIN/v-add-remote-dns-domain $user $domain yes"
echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
echo "$cmd" >> $devit/data/queue/dns-cluster.pipe
fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Increasing domain value

8
bin/v-add-dns-on-web-alias
View file

@ -16,9 +16,9 @@ ip=$3
restart=$4
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -77,7 +77,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# No logging

12
bin/v-add-dns-record
View file

@ -28,9 +28,9 @@ if [ -z "$priority" ]; then
fi
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
# Null priority for none MX/SRV records
if [ "$rtype" != 'MX' ] && [ "$rtype" != 'SRV' ]; then
@ -106,16 +106,16 @@ fi
# Updating dns-cluster queue
if [ ! -z "$DNS_CLUSTER" ]; then
# Check for first sync
dlock=$(grep "domain $user $domain" $VESTA/data/queue/dns-cluster.pipe)
dlock=$(grep "domain $user $domain" $devit/data/queue/dns-cluster.pipe)
if [ -z "$dlock" ]; then
cmd="$BIN/v-add-remote-dns-record $user $domain $id"
echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
echo "$cmd" >> $devit/data/queue/dns-cluster.pipe
fi
fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Update counters

8
bin/v-add-domain
View file

@ -16,9 +16,9 @@ ip=$3
restart="${4-yes}"
# Includes
source $VESTA/func/main.sh
source $VESTA/func/ip.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/ip.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -75,7 +75,7 @@ check_result $? "can't restart dns" > /dev/null
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
exit

12
bin/v-add-firewall-ban
View file

@ -20,8 +20,8 @@ chain=$(echo $2|tr '[:lower:]' '[:upper:]')
iptables="/sbin/iptables"
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -38,19 +38,19 @@ is_system_enabled "$FIREWALL_SYSTEM" 'FIREWALL_SYSTEM'
#----------------------------------------------------------#
# Checking server ip
if [ -e "$VESTA/data/ips/$ip" ] || [ "$ip" = '127.0.0.1' ]; then
if [ -e "$devit/data/ips/$ip" ] || [ "$ip" = '127.0.0.1' ]; then
exit
fi
# Checking ip exclusions
excludes="$VESTA/data/firewall/excludes.conf"
excludes="$devit/data/firewall/excludes.conf"
check_excludes=$(grep "^$ip$" $excludes 2>/dev/null)
if [ ! -z "$check_excludes" ]; then
exit
fi
# Checking ip in banlist
conf="$VESTA/data/firewall/banlist.conf"
conf="$devit/data/firewall/banlist.conf"
check_ip=$(grep "IP='$ip' CHAIN='$chain'" $conf 2>/dev/null)
if [ ! -z "$check_ip" ]; then
exit
@ -74,7 +74,7 @@ chmod 660 $conf
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

18
bin/v-add-firewall-chain
View file

@ -21,15 +21,15 @@ protocol=$(echo $protocol|tr '[:lower:]' '[:upper:]')
# Defining absolute path to iptables
iptables="/sbin/iptables"
# Get vesta port by reading nginx.conf
vestaport=$(grep 'listen' $VESTA/nginx/conf/nginx.conf | awk '{print $2}' | sed "s|;||")
if [ -z "$vestaport" ]; then
vestaport=8083
# Get devit port by reading nginx.conf
devitport=$(grep 'listen' $devit/nginx/conf/nginx.conf | awk '{print $2}' | sed "s|;||")
if [ -z "$devitport" ]; then
devitport=8083
fi
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -59,7 +59,7 @@ case $chain in
DNS) port=53; protocol=UDP ;;
WEB) port='80,443'; protocol=TCP ;;
DB) port='3306,5432'; protocol=TCP ;;
VESTA) port=$vestaport; protocol=TCP ;;
devit) port=$devitport; protocol=TCP ;;
*) check_args '2' "$#" 'CHAIN PORT' ;;
esac
@ -78,7 +78,7 @@ if [ $? -eq 0 ]; then
fi
# Preserving chain
chains=$VESTA/data/firewall/chains.conf
chains=$devit/data/firewall/chains.conf
check_chain=$(grep "CHAIN='$chain'" $chains 2>/dev/null)
if [ -z "$check_chain" ]; then
echo "CHAIN='$chain' PORT='$port' PROTOCOL='$protocol'" >> $chains
@ -89,7 +89,7 @@ chmod 660 $chains
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

20
bin/v-add-firewall-rule
View file

@ -22,23 +22,23 @@ comment=$5
rule=$6
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
# Get next firewall rule id
get_next_fw_rule() {
if [ -z "$rule" ]; then
curr_str=$(grep "RULE=" $VESTA/data/firewall/rules.conf |\
curr_str=$(grep "RULE=" $devit/data/firewall/rules.conf |\
cut -f 2 -d \' | sort -n | tail -n1)
rule="$((curr_str +1))"
fi
}
sort_fw_rules() {
cat $VESTA/data/firewall/rules.conf |\
sort -n -k 2 -t \' > $VESTA/data/firewall/rules.conf.tmp
mv -f $VESTA/data/firewall/rules.conf.tmp \
$VESTA/data/firewall/rules.conf
cat $devit/data/firewall/rules.conf |\
sort -n -k 2 -t \' > $devit/data/firewall/rules.conf.tmp
mv -f $devit/data/firewall/rules.conf.tmp \
$devit/data/firewall/rules.conf
}
@ -72,10 +72,10 @@ str="$str IP='$ip' COMMENT='$comment' SUSPENDED='no'"
str="$str TIME='$time' DATE='$date'"
# Adding to config
echo "$str" >> $VESTA/data/firewall/rules.conf
echo "$str" >> $devit/data/firewall/rules.conf
# Changing permissions
chmod 660 $VESTA/data/firewall/rules.conf
chmod 660 $devit/data/firewall/rules.conf
# Sorting firewall rules by id number
sort_fw_rules
@ -85,7 +85,7 @@ $BIN/v-update-firewall
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

6
bin/v-add-fs-archive
View file

@ -14,9 +14,9 @@ if [ -z "$src0" ]; then
exit 1
fi
# Checking vesta user
if [ ! -e "$VESTA/data/users/$user" ]; then
echo "Error: vesta user $user doesn't exist"
# Checking devit user
if [ ! -e "$devit/data/users/$user" ]; then
echo "Error: devit user $user doesn't exist"
exit 3
fi

6
bin/v-add-fs-directory
View file

@ -13,9 +13,9 @@ if [ -z "$dst_dir" ]; then
exit 1
fi
# Checking vesta user
if [ ! -e "$VESTA/data/users/$user" ]; then
echo "Error: vesta user $user doesn't exist"
# Checking devit user
if [ ! -e "$devit/data/users/$user" ]; then
echo "Error: devit user $user doesn't exist"
exit 3
fi

6
bin/v-add-fs-file
View file

@ -13,9 +13,9 @@ if [ -z "$dst_file" ]; then
exit 1
fi
# Checking vesta user
if [ ! -e "$VESTA/data/users/$user" ]; then
echo "Error: vesta user $user doesn't exist"
# Checking devit user
if [ ! -e "$devit/data/users/$user" ]; then
echo "Error: devit user $user doesn't exist"
exit 3
fi

180
bin/v-add-letsencrypt-domain
View file

@ -18,9 +18,9 @@ aliases=$3
API='https://acme-v02.api.letsencrypt.org'
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
# Additional argument formatting
format_identifier_idn() {
@ -74,15 +74,15 @@ is_object_valid 'web' 'DOMAIN' "$domain"
is_object_unsuspended 'web' 'DOMAIN' "$domain"
get_domain_values 'web'
echo "-----------------------------------------------------------------------------------" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : v-add-letsencrypt-domain $domain [$aliases]" >> /usr/local/vesta/log/letsencrypt.log
echo "-----------------------------------------------------------------------------------" >> /usr/local/devit/log/letsencrypt.log
echo "[$(date)] : v-add-letsencrypt-domain $domain [$aliases]" >> /usr/local/devit/log/letsencrypt.log
# check if alias is the letsencrypt wildcard domain, if not, make the normal checks
if [[ "$aliases" != "*.$domain" ]]; then
for alias in $(echo "$aliases" |tr ',' '\n' |sort -u); do
check_alias="$(echo $ALIAS |tr ',' '\n' |grep ^$alias$)"
if [ -z "$check_alias" ]; then
echo "[$(date)] : EXIT=domain alias $alias doesn't exist" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : EXIT=domain alias $alias doesn't exist" >> /usr/local/devit/log/letsencrypt.log
check_result $E_NOTEXIST "domain alias $alias doesn't exist"
fi
done
@ -93,14 +93,14 @@ fi;
#----------------------------------------------------------#
# Registering LetsEncrypt user account
echo "[$(date)] : v-add-letsencrypt-user $user" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : v-add-letsencrypt-user $user" >> /usr/local/devit/log/letsencrypt.log
$BIN/v-add-letsencrypt-user $user
echo "[$(date)] : result: $?" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : result: $?" >> /usr/local/devit/log/letsencrypt.log
if [ "$?" -ne 0 ]; then
touch $VESTA/data/queue/letsencrypt.pipe
sed -i "/ $domain /d" $VESTA/data/queue/letsencrypt.pipe
touch $devit/data/queue/letsencrypt.pipe
sed -i "/ $domain /d" $devit/data/queue/letsencrypt.pipe
send_notice "LETSENCRYPT" "Account registration failed"
echo "[$(date)] : EXIT=LE account registration" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : EXIT=LE account registration" >> /usr/local/devit/log/letsencrypt.log
check_result $E_CONNECT "LE account registration" >/dev/null
fi
@ -109,11 +109,11 @@ source $USER_DATA/ssl/le.conf
# Checking wildcard alias
if [ "$aliases" = "*.$domain" ]; then
echo "[$(date)] : Checking wildcard alias" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : Checking wildcard alias" >> /usr/local/devit/log/letsencrypt.log
wildcard='yes'
proto="dns-01"
if [ ! -e "$VESTA/data/users/$user/dns/$domain.conf" ]; then
echo "[$(date)] : EXIT=DNS domain $domain doesn't exist" >> /usr/local/vesta/log/letsencrypt.log
if [ ! -e "$devit/data/users/$user/dns/$domain.conf" ]; then
echo "[$(date)] : EXIT=DNS domain $domain doesn't exist" >> /usr/local/devit/log/letsencrypt.log
check_result $E_NOTEXIST "DNS domain $domain doesn't exist"
fi
else
@ -121,21 +121,21 @@ else
fi
# Requesting nonce / STEP 1
echo "[$(date)] : --- Requesting nonce / STEP 1 ---" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : curl -s -I \"$API/directory\"" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : --- Requesting nonce / STEP 1 ---" >> /usr/local/devit/log/letsencrypt.log
echo "[$(date)] : curl -s -I \"$API/directory\"" >> /usr/local/devit/log/letsencrypt.log
answer=$(curl -s -I "$API/directory")
echo "[$(date)] : answer=$answer" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : answer=$answer" >> /usr/local/devit/log/letsencrypt.log
nonce=$(echo "$answer" |grep -i nonce |cut -f2 -d \ |tr -d '\r\n')
echo "[$(date)] : nonce=$nonce" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : nonce=$nonce" >> /usr/local/devit/log/letsencrypt.log
status=$(echo "$answer"|grep HTTP/ |tail -n1 |cut -f 2 -d ' ')
echo "[$(date)] : status=$status" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : status=$status" >> /usr/local/devit/log/letsencrypt.log
if [[ "$status" -ne 200 ]]; then
echo "[$(date)] : EXIT=Let's Encrypt nonce request status $status" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : EXIT=Let's Encrypt nonce request status $status" >> /usr/local/devit/log/letsencrypt.log
check_result $E_CONNECT "Let's Encrypt nonce request status $status"
fi
# Placing new order / STEP 2
echo "[$(date)] : --- Placing new order / STEP 2 ---" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : --- Placing new order / STEP 2 ---" >> /usr/local/devit/log/letsencrypt.log
url="$API/acme/new-order"
payload='{"identifiers":['
for identifier in $(echo $domain,$aliases |tr ',' '\n' |sort -u); do
@ -144,47 +144,47 @@ for identifier in $(echo $domain,$aliases |tr ',' '\n' |sort -u); do
done
payload=$(echo "$payload"|sed "s/,$//")
payload=$payload']}'
echo "[$(date)] : payload=$payload" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : query_le_v2 \"$url\" \"$payload\" \"$nonce\"" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : payload=$payload" >> /usr/local/devit/log/letsencrypt.log
echo "[$(date)] : query_le_v2 \"$url\" \"$payload\" \"$nonce\"" >> /usr/local/devit/log/letsencrypt.log
answer=$(query_le_v2 "$url" "$payload" "$nonce")
echo "[$(date)] : answer=$answer" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : answer=$answer" >> /usr/local/devit/log/letsencrypt.log
nonce=$(echo "$answer" |grep -i nonce |cut -f2 -d \ |tr -d '\r\n')
echo "[$(date)] : nonce=$nonce" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : nonce=$nonce" >> /usr/local/devit/log/letsencrypt.log
authz=$(echo "$answer" |grep "acme/authz" |cut -f2 -d '"')
echo "[$(date)] : authz=$authz" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : authz=$authz" >> /usr/local/devit/log/letsencrypt.log
finalize=$(echo "$answer" |grep 'finalize":' |cut -f4 -d '"')
echo "[$(date)] : finalize=$finalize" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : finalize=$finalize" >> /usr/local/devit/log/letsencrypt.log
status=$(echo "$answer" |grep HTTP/ |tail -n1 |cut -f2 -d ' ')
echo "[$(date)] : status=$status" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : status=$status" >> /usr/local/devit/log/letsencrypt.log
if [[ "$status" -ne 201 ]]; then
echo "[$(date)] : EXIT=Let's Encrypt new auth status $status" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : EXIT=Let's Encrypt new auth status $status" >> /usr/local/devit/log/letsencrypt.log
check_result $E_CONNECT "Let's Encrypt new auth status $status"
fi
# Requesting authorization token / STEP 3
echo "[$(date)] : --- Requesting authorization token / STEP 3 ---" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : --- Requesting authorization token / STEP 3 ---" >> /usr/local/devit/log/letsencrypt.log
for auth in $authz; do
payload=''
echo "[$(date)] : for auth=$auth" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : query_le_v2 \"$auth\" \"$payload\" \"$nonce\"" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : for auth=$auth" >> /usr/local/devit/log/letsencrypt.log
echo "[$(date)] : query_le_v2 \"$auth\" \"$payload\" \"$nonce\"" >> /usr/local/devit/log/letsencrypt.log
answer=$(query_le_v2 "$auth" "$payload" "$nonce")
echo "[$(date)] : answer=$answer" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : answer=$answer" >> /usr/local/devit/log/letsencrypt.log
url=$(echo "$answer" |grep -A3 $proto |grep '"url"' |cut -f 4 -d \")
echo "[$(date)] : url=$url" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : url=$url" >> /usr/local/devit/log/letsencrypt.log
token=$(echo "$answer" |grep -A3 $proto |grep token |cut -f 4 -d \")
echo "[$(date)] : token=$token" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : token=$token" >> /usr/local/devit/log/letsencrypt.log
nonce=$(echo "$answer" |grep -i nonce |cut -f2 -d \ |tr -d '\r\n')
echo "[$(date)] : nonce=$nonce" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : nonce=$nonce" >> /usr/local/devit/log/letsencrypt.log
status=$(echo "$answer"|grep HTTP/ |tail -n1 |cut -f 2 -d ' ')
echo "[$(date)] : status=$status" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : status=$status" >> /usr/local/devit/log/letsencrypt.log
if [[ "$status" -ne 200 ]]; then
echo "[$(date)] : EXIT=Let's Encrypt acme/authz bad status $status" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : EXIT=Let's Encrypt acme/authz bad status $status" >> /usr/local/devit/log/letsencrypt.log
check_result $E_CONNECT "Let's Encrypt acme/authz bad status $status"
fi
# Configuring challenge / STEP 4
echo "[$(date)] : --- Configuring challenge / STEP 4 ---" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : wildcard=$wildcard" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : --- Configuring challenge / STEP 4 ---" >> /usr/local/devit/log/letsencrypt.log
echo "[$(date)] : wildcard=$wildcard" >> /usr/local/devit/log/letsencrypt.log
if [ "$wildcard" = 'yes' ]; then
record=$(printf "%s" "$token.$THUMB" |\
openssl dgst -sha256 -binary |encode_base64)
@ -195,20 +195,20 @@ for auth in $authz; do
done
$BIN/v-add-dns-record "$user" "$domain" "_acme-challenge" "TXT" "$record"
exitstatus=$?
echo "[$(date)] : v-add-dns-record \"$user\" \"$domain\" \"_acme-challenge\" \"TXT\" \"$record\"" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : v-add-dns-record \"$user\" \"$domain\" \"_acme-challenge\" \"TXT\" \"$record\"" >> /usr/local/devit/log/letsencrypt.log
if [ "$exitstatus" -ne 0 ]; then
echo "[$(date)] : EXIT=DNS _acme-challenge record wasn't created" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : EXIT=DNS _acme-challenge record wasn't created" >> /usr/local/devit/log/letsencrypt.log
fi
check_result $exitstatus "DNS _acme-challenge record wasn't created"
else
if [ "$WEB_SYSTEM" = 'nginx' ] || [ ! -z "$PROXY_SYSTEM" ]; then
if [ -f "/usr/local/vesta/web/inc/nginx_proxy" ]; then
# if vesta is behind main nginx
if [ -f "/usr/local/devit/web/inc/nginx_proxy" ]; then
# if devit is behind main nginx
well_known="$HOMEDIR/$user/web/$domain/public_html/.well-known"
acme_challenge="$well_known/acme-challenge"
mkdir -p $acme_challenge
echo "$token.$THUMB" > $acme_challenge/$token
echo "[$(date)] : in $acme_challenge/$token we put: $token.$THUMB" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : in $acme_challenge/$token we put: $token.$THUMB" >> /usr/local/devit/log/letsencrypt.log
chown -R $user:$user $well_known
else
# default nginx method
@ -221,20 +221,20 @@ for auth in $authz; do
echo ' return 200 "$1.'$THUMB'";' >> $conf
echo '}' >> $conf
# fi
echo "[$(date)] : in $conf we put: $THUMB" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : in $conf we put: $THUMB" >> /usr/local/devit/log/letsencrypt.log
if [ ! -e "$sconf" ]; then
ln -s "$conf" "$sconf"
fi
echo "[$(date)] : v-restart-proxy" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : v-restart-proxy" >> /usr/local/devit/log/letsencrypt.log
$BIN/v-restart-proxy
if [ -z "$PROXY_SYSTEM" ]; then
# apache-less variant
echo "[$(date)] : v-restart-web" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : v-restart-web" >> /usr/local/devit/log/letsencrypt.log
$BIN/v-restart-web
fi
exitstatus=$?
if [ "$exitstatus" -ne 0 ]; then
echo "[$(date)] : EXIT=Proxy restart failed = $exitstatus" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : EXIT=Proxy restart failed = $exitstatus" >> /usr/local/devit/log/letsencrypt.log
fi
check_result $exitstatus "Proxy restart failed" >/dev/null
fi
@ -244,16 +244,16 @@ for auth in $authz; do
mkdir -p $acme_challenge
echo "$token.$THUMB" > $acme_challenge/$token
chown -R $user:$user $well_known
echo "[$(date)] : in $acme_challenge/$token we put: $token.$THUMB" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : in $acme_challenge/$token we put: $token.$THUMB" >> /usr/local/devit/log/letsencrypt.log
# $BIN/v-restart-web
# check_result $? "Web restart failed" >/dev/null
fi
fi
# Requesting ACME validation / STEP 5
echo "[$(date)] : --- Requesting ACME validation / STEP 5 ---" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : --- Requesting ACME validation / STEP 5 ---" >> /usr/local/devit/log/letsencrypt.log
validation_check=$(echo "$answer" |grep '"valid"')
echo "[$(date)] : validation_check=$validation_check" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : validation_check=$validation_check" >> /usr/local/devit/log/letsencrypt.log
if [[ ! -z "$validation_check" ]]; then
validation='valid'
else
@ -263,33 +263,33 @@ for auth in $authz; do
# Doing pol check on status
i=1
while [ "$validation" = 'pending' ]; do
echo "[$(date)] : - Doing pol check on status" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : - Doing pol check on status" >> /usr/local/devit/log/letsencrypt.log
payload='{}'
echo "[$(date)] : query_le_v2 \"$url\" \"$payload\" \"$nonce\"" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : query_le_v2 \"$url\" \"$payload\" \"$nonce\"" >> /usr/local/devit/log/letsencrypt.log
answer=$(query_le_v2 "$url" "$payload" "$nonce")
echo "[$(date)] : answer=$answer" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : answer=$answer" >> /usr/local/devit/log/letsencrypt.log
validation=$(echo "$answer"|grep -A1 $proto |tail -n1|cut -f4 -d \")
echo "[$(date)] : validation=$validation" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : validation=$validation" >> /usr/local/devit/log/letsencrypt.log
nonce=$(echo "$answer" |grep -i nonce |cut -f2 -d \ |tr -d '\r\n')
echo "[$(date)] : nonce=$nonce" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : nonce=$nonce" >> /usr/local/devit/log/letsencrypt.log
status=$(echo "$answer"|grep HTTP/ |tail -n1 |cut -f 2 -d ' ')
echo "[$(date)] : status=$status" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : status=$status" >> /usr/local/devit/log/letsencrypt.log
if [[ "$status" -ne 200 ]]; then
echo "[$(date)] : EXIT=Let's Encrypt validation status $status" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : EXIT=Let's Encrypt validation status $status" >> /usr/local/devit/log/letsencrypt.log
check_result $E_CONNECT "Let's Encrypt validation status $status"
fi
i=$((i + 1))
if [ "$i" -gt 10 ]; then
echo "[$(date)] : EXIT=Let's Encrypt domain validation timeout" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : EXIT=Let's Encrypt domain validation timeout" >> /usr/local/devit/log/letsencrypt.log
check_result $E_CONNECT "Let's Encrypt domain validation timeout"
fi
sleeping=$((i*2))
echo "[$(date)] : sleep $sleeping (i=$i)" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : sleep $sleeping (i=$i)" >> /usr/local/devit/log/letsencrypt.log
sleep $sleeping
done
if [ "$validation" = 'invalid' ]; then
echo "[$(date)] : EXIT=Let's Encrypt domain verification failed" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : EXIT=Let's Encrypt domain verification failed" >> /usr/local/devit/log/letsencrypt.log
check_result $E_CONNECT "Let's Encrypt domain verification failed"
fi
done
@ -297,52 +297,52 @@ done
# Generating new ssl certificate
ssl_dir=$($BIN/v-generate-ssl-cert "$domain" "info@$domain" "US" "California"\
"San Francisco" "Vesta" "IT" "$aliases" |tail -n1 |awk '{print $2}')
"San Francisco" "devit" "IT" "$aliases" |tail -n1 |awk '{print $2}')
# Sending CSR to finalize order / STEP 6
echo "[$(date)] : --- Sending CSR to finalize order / STEP 6 ---" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : --- Sending CSR to finalize order / STEP 6 ---" >> /usr/local/devit/log/letsencrypt.log
csr=$(openssl req -in $ssl_dir/$domain.csr -outform DER |encode_base64)
payload='{"csr":"'$csr'"}'
echo "[$(date)] : query_le_v2 \"$finalize\" \"$payload\" \"$nonce\"" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : query_le_v2 \"$finalize\" \"$payload\" \"$nonce\"" >> /usr/local/devit/log/letsencrypt.log
answer=$(query_le_v2 "$finalize" "$payload" "$nonce")
echo "[$(date)] : answer=$answer" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : answer=$answer" >> /usr/local/devit/log/letsencrypt.log
nonce=$(echo "$answer" |grep -i nonce |cut -f2 -d \ |tr -d '\r\n')
echo "[$(date)] : nonce=$nonce" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : nonce=$nonce" >> /usr/local/devit/log/letsencrypt.log
status=$(echo "$answer"|grep HTTP/ |tail -n1 |cut -f 2 -d ' ')
echo "[$(date)] : status=$status" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : status=$status" >> /usr/local/devit/log/letsencrypt.log
certificate=$(echo "$answer"|grep 'certificate":' |cut -f4 -d '"')
echo "[$(date)] : certificate=$certificate" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : certificate=$certificate" >> /usr/local/devit/log/letsencrypt.log
if [[ "$status" -ne 200 ]]; then
echo "[$(date)] : EXIT=Let's Encrypt finalize bad status $status" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : EXIT=Let's Encrypt finalize bad status $status" >> /usr/local/devit/log/letsencrypt.log
check_result $E_CONNECT "Let's Encrypt finalize bad status $status"
fi
# Downloading signed certificate / STEP 7
echo "[$(date)] : --- Downloading signed certificate / STEP 7 ---" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : query_le_v2 \"$certificate\" \"\" \"$nonce\"" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : --- Downloading signed certificate / STEP 7 ---" >> /usr/local/devit/log/letsencrypt.log
echo "[$(date)] : query_le_v2 \"$certificate\" \"\" \"$nonce\"" >> /usr/local/devit/log/letsencrypt.log
answer=$(query_le_v2 "$certificate" "" "$nonce" "$ssl_dir/$domain.pem")
echo "[$(date)] : answer=$answer" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : answer=$answer" >> /usr/local/devit/log/letsencrypt.log
status=$(echo "$answer"|grep HTTP/ |tail -n1 |cut -f 2 -d ' ')
echo "[$(date)] : status=$status" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : status=$status" >> /usr/local/devit/log/letsencrypt.log
if [[ "$status" -ne 200 ]]; then
[ -d "$ssl_dir" ] && rm -rf "$ssl_dir"
echo "[$(date)] : EXIT=Let's Encrypt downloading signed cert failed status: $status" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : EXIT=Let's Encrypt downloading signed cert failed status: $status" >> /usr/local/devit/log/letsencrypt.log
check_result $E_NOTEXIST "Let's Encrypt downloading signed cert failed status: $status"
fi
# Splitting up downloaded pem
# echo "[$(date)] : - Splitting up downloaded pem" >> /usr/local/vesta/log/letsencrypt.log
# echo "[$(date)] : - Splitting up downloaded pem" >> /usr/local/devit/log/letsencrypt.log
crt_end=$(grep -n 'END CERTIFICATE' $ssl_dir/$domain.pem |head -n1 |cut -f1 -d:)
# echo "[$(date)] : crt_end=$crt_end" >> /usr/local/vesta/log/letsencrypt.log
# echo "[$(date)] : crt_end=$crt_end" >> /usr/local/devit/log/letsencrypt.log
head -n $crt_end $ssl_dir/$domain.pem > $ssl_dir/$domain.crt
pem_lines=$(wc -l $ssl_dir/$domain.pem |cut -f 1 -d ' ')
# echo "[$(date)] : pem_lines=$pem_lines" >> /usr/local/vesta/log/letsencrypt.log
# echo "[$(date)] : pem_lines=$pem_lines" >> /usr/local/devit/log/letsencrypt.log
ca_end=$(grep -n 'BEGIN CERTIFICATE' $ssl_dir/$domain.pem |tail -n1 |cut -f 1 -d :)
# echo "[$(date)] : ca_end=$ca_end" >> /usr/local/vesta/log/letsencrypt.log
# echo "[$(date)] : ca_end=$ca_end" >> /usr/local/devit/log/letsencrypt.log
ca_end=$(( pem_lines - crt_end + 1 ))
# echo "[$(date)] : ca_end=$ca_end" >> /usr/local/vesta/log/letsencrypt.log
# echo "[$(date)] : ca_end=$ca_end" >> /usr/local/devit/log/letsencrypt.log
tail -n $ca_end $ssl_dir/$domain.pem > $ssl_dir/$domain.ca
# Temporary fix for double "END CERTIFICATE"
@ -353,20 +353,20 @@ fi
# Adding SSL
ssl_home=$(search_objects 'web' 'LETSENCRYPT' 'yes' 'SSL_HOME')
$BIN/v-delete-web-domain-ssl $user $domain >/dev/null 2>&1
echo "[$(date)] : v-add-web-domain-ssl $user $domain $ssl_dir $ssl_home" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : v-add-web-domain-ssl $user $domain $ssl_dir $ssl_home" >> /usr/local/devit/log/letsencrypt.log
$BIN/v-add-web-domain-ssl $user $domain $ssl_dir $ssl_home
exitstatus=$?
echo "[$(date)] : v-add-web-domain-ssl status: $exitstatus" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : v-add-web-domain-ssl status: $exitstatus" >> /usr/local/devit/log/letsencrypt.log
if [ "$exitstatus" -ne '0' ]; then
touch $VESTA/data/queue/letsencrypt.pipe
sed -i "/ $domain /d" $VESTA/data/queue/letsencrypt.pipe
echo "[$(date)] : EXIT=$domain certificate installation failed" >> /usr/local/vesta/log/letsencrypt.log
touch $devit/data/queue/letsencrypt.pipe
sed -i "/ $domain /d" $devit/data/queue/letsencrypt.pipe
echo "[$(date)] : EXIT=$domain certificate installation failed" >> /usr/local/devit/log/letsencrypt.log
send_notice 'LETSENCRYPT' "$domain certificate installation failed"
check_result $exitstatus "SSL install" >/dev/null
fi
# Adding LE autorenew cronjob
if [ -z "$(grep v-update-lets $VESTA/data/users/admin/cron.conf)" ]; then
if [ -z "$(grep v-update-lets $devit/data/users/admin/cron.conf)" ]; then
min=$(generate_password '012345' '2')
hour=$(generate_password '1234567' '1')
cmd="sudo $BIN/v-update-letsencrypt-ssl"
@ -382,16 +382,16 @@ update_object_value 'web' 'DOMAIN' "$domain" '$LETSENCRYPT' 'yes'
reset_web_counter "$user" "$domain" 'LETSENCRYPT_FAIL_COUNT'
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Deleteing task from queue
touch $VESTA/data/queue/letsencrypt.pipe
sed -i "/ $domain /d" $VESTA/data/queue/letsencrypt.pipe
touch $devit/data/queue/letsencrypt.pipe
sed -i "/ $domain /d" $devit/data/queue/letsencrypt.pipe
# Notifying user
send_notice 'LETSENCRYPT' "$domain SSL has been installed successfully"
echo "[$(date)] : EXIT=***** $domain SSL has been installed successfully *****" >> /usr/local/vesta/log/letsencrypt.log
echo "[$(date)] : EXIT=***** $domain SSL has been installed successfully *****" >> /usr/local/devit/log/letsencrypt.log
# Logging
log_event "$OK" "$ARGUMENTS"

6
bin/v-add-letsencrypt-user
View file

@ -16,8 +16,8 @@ user=$1
API='https://acme-v02.api.letsencrypt.org'
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
# encode base64
encode_base64() {
@ -119,7 +119,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Adding le.conf

8
bin/v-add-mail-account
View file

@ -17,9 +17,9 @@ password=$4; HIDE=4
quota=${5-unlimited}
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
# Additional argument formatting
if [[ "$account" =~ [[:upper:]] ]]; then
@ -65,7 +65,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Generating timestamp

10
bin/v-add-mail-account-alias
View file

@ -17,9 +17,9 @@ account=$3
malias=$4
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
# Additional argument formatting
format_domain
@ -55,10 +55,10 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Adding vesta alias
# Adding devit alias
aliases=$(get_object_value "mail/$domain" 'ACCOUNT' "$account" '$ALIAS')
if [ -z "$aliases" ]; then
aliases="$malias"

8
bin/v-add-mail-account-autoreply
View file

@ -17,9 +17,9 @@ account=$3
autoreply=$4
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
# Define mail user
if [ "$MAIL_SYSTEM" = 'exim4' ]; then
@ -64,7 +64,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Adding autoreply message

8
bin/v-add-mail-account-forward
View file

@ -17,9 +17,9 @@ account=$3
forward=$4
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
# Additional argument formatting
format_domain
@ -66,7 +66,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Updating config

8
bin/v-add-mail-account-fwd-only
View file

@ -16,9 +16,9 @@ domain_idn=$2
account=$3
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
# Define mail user
if [ "$MAIL_SYSTEM" = 'exim4' ]; then
@ -66,7 +66,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Updating config

8
bin/v-add-mail-domain
View file

@ -18,9 +18,9 @@ dkim=${5-yes}
dkim_size=${6-1024}
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
# Define mail user
if [ "$MAIL_SYSTEM" = 'exim4' ]; then
@ -130,7 +130,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Increasing domain value

8
bin/v-add-mail-domain-antispam
View file

@ -15,9 +15,9 @@ domain=$2
domain_idn=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
# Additional argument formatting
format_domain
@ -50,7 +50,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Adding antispam in config

8
bin/v-add-mail-domain-antivirus
View file

@ -15,9 +15,9 @@ domain=$2
domain_idn=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
# Additional argument formatting
format_domain
@ -50,7 +50,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Adding antivirus in config

8
bin/v-add-mail-domain-catchall
View file

@ -16,9 +16,9 @@ domain_idn=$2
email="$3"
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
# Additional argument formatting
format_domain
@ -51,7 +51,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Adding antispam in config

8
bin/v-add-mail-domain-dkim
View file

@ -16,9 +16,9 @@ domain_idn=$2
dkim_size=${3-1024}
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
# Define mail user
if [ "$MAIL_SYSTEM" = 'exim4' ]; then
@ -78,7 +78,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Adding dkim in config

14
bin/v-add-remote-dns-domain
View file

@ -16,9 +16,9 @@ flush=$3
# Includes
source $VESTA/func/main.sh
source $VESTA/func/remote.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/remote.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -39,7 +39,7 @@ remote_dns_health_check
# Parsing domain record
str=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf 2>/dev/null)
if [ -z "$str" ]; then
pipe="$VESTA/data/queue/dns-cluster.pipe"
pipe="$devit/data/queue/dns-cluster.pipe"
queue_str=$(grep -n "$SCRIPT $1 $2 " $pipe |cut -f1 -d: |head -n1)
if [ ! -z "$queue_str" ]; then
sed -i "$queue_str d" $pipe
@ -48,7 +48,7 @@ if [ -z "$str" ]; then
fi
IFS=$'\n'
for cluster in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do
for cluster in $(grep "SUSPENDED='no'" $devit/conf/dns-cluster.conf); do
# Parsing remote dns host parameters
eval $cluster
@ -77,12 +77,12 @@ done
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Updating pipe
rm -f $tmpfile
pipe="$VESTA/data/queue/dns-cluster.pipe"
pipe="$devit/data/queue/dns-cluster.pipe"
str=$(grep -n "$SCRIPT $1 $2 " $pipe | cut -f1 -d: | head -n1)
if [ ! -z "$str" ]; then
sed -i "$str d" $pipe

22
bin/v-add-remote-dns-host
View file

@ -24,9 +24,9 @@ dns_user=${6-dns-cluster}
DNS_USER=$dns_user
# Includes
source $VESTA/func/main.sh
source $VESTA/func/remote.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/remote.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -57,14 +57,14 @@ str="$str DNS_USER='$dns_user' TYPE='$type' SUSPENDED='no'"
str="$str TIME='$time' DATE='$date'"
# Adding host to dns-cluster.conf
echo "$str" >> $VESTA/conf/dns-cluster.conf
chmod 660 $VESTA/conf/dns-cluster.conf
echo "$str" >> $devit/conf/dns-cluster.conf
chmod 660 $devit/conf/dns-cluster.conf
# Enabling DNS_CLUSTER
if [ -z "$(grep DNS_CLUSTER $VESTA/conf/vesta.conf)" ]; then
sed -i "s/^STATS_/DNS_CLUSTER='yes'\nSTATS_/g" $VESTA/conf/vesta.conf
if [ -z "$(grep DNS_CLUSTER $devit/conf/devit.conf)" ]; then
sed -i "s/^STATS_/DNS_CLUSTER='yes'\nSTATS_/g" $devit/conf/devit.conf
else
sed -i "s/DNS_CLUSTER=.*/DNS_CLUSTER='yes'/g" $VESTA/conf/vesta.conf
sed -i "s/DNS_CLUSTER=.*/DNS_CLUSTER='yes'/g" $devit/conf/devit.conf
fi
# Enabling remote dns-cluster queue
@ -77,12 +77,12 @@ check_result $? "$HOST sync failed" $E_CONNECT
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Adding local dns-cluster cron job
cmd="sudo /usr/local/vesta/bin/v-update-sys-queue dns-cluster"
check_cron=$(grep "$cmd" $VESTA/data/users/admin/cron.conf 2> /dev/null)
cmd="sudo /usr/local/devit/bin/v-update-sys-queue dns-cluster"
check_cron=$(grep "$cmd" $devit/data/users/admin/cron.conf 2> /dev/null)
if [ -z "$check_cron" ] && [ ! -z "$CRON_SYSTEM" ]; then
$BIN/v-add-cron-job admin '*/5' '*' '*' '*' '*' "$cmd"
fi

14
bin/v-add-remote-dns-record
View file

@ -15,9 +15,9 @@ domain=$2
id=$3
# Includes
source $VESTA/func/main.sh
source $VESTA/func/remote.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/remote.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -40,7 +40,7 @@ remote_dns_health_check
# Parsing record
str=$(grep "ID='$id'" $USER_DATA/dns/$domain.conf)
if [ -z "$str" ]; then
pipe="$VESTA/data/queue/dns-cluster.pipe"
pipe="$devit/data/queue/dns-cluster.pipe"
queue_str=$(grep -n "$SCRIPT $1 $2 $3$" $pipe | cut -f1 -d: | head -n1)
if [ ! -z "$queue_str" ]; then
sed -i "$queue_str d" $pipe
@ -49,7 +49,7 @@ if [ -z "$str" ]; then
fi
IFS=$'\n'
for cluster in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do
for cluster in $(grep "SUSPENDED='no'" $devit/conf/dns-cluster.conf); do
# Parsing remote host parameters
eval $cluster
@ -72,11 +72,11 @@ done
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Updating pipe
pipe="$VESTA/data/queue/dns-cluster.pipe"
pipe="$devit/data/queue/dns-cluster.pipe"
str=$(grep -n "$SCRIPT $1 $2 $3$" $pipe | cut -f1 -d: | head -n1)
if [ ! -z "$str" ]; then
sed -i "$str d" $pipe

18
bin/v-add-sys-firewall
View file

@ -10,8 +10,8 @@
#----------------------------------------------------------#
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -28,19 +28,19 @@ fi
#----------------------------------------------------------#
# Adding firewall directory
mkdir -p $VESTA/data/firewall/
mkdir -p $devit/data/firewall/
# Adding default ruleset
if [ ! -e "$VESTA/data/firewall/rules.conf" ]; then
cp $VESTA/install/rhel/7/* $VESTA/data/firewall/
if [ ! -e "$devit/data/firewall/rules.conf" ]; then
cp $devit/install/rhel/7/* $devit/data/firewall/
fi
# Updating FIREWAL_SYSTEM value
if [ -z "$(grep FIREWALL_SYSTEM $VESTA/conf/vesta.conf)" ]; then
echo "FIREWALL_SYSTEM='iptables'" >> $VESTA/conf/vesta.conf
if [ -z "$(grep FIREWALL_SYSTEM $devit/conf/devit.conf)" ]; then
echo "FIREWALL_SYSTEM='iptables'" >> $devit/conf/devit.conf
else
sed -i "s/FIREWALL_SYSTEM.*/FIREWALL_SYSTEM='iptables'/g" \
$VESTA/conf/vesta.conf
$devit/conf/devit.conf
fi
# Updating firewall rules
@ -48,7 +48,7 @@ $BIN/v-update-firewall
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

22
bin/v-add-sys-ip
View file

@ -24,10 +24,10 @@ ip_name=$6
nat_ip=$7
# Includes
source $VESTA/func/main.sh
source $VESTA/func/ip.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/ip.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -62,7 +62,7 @@ if [ -z "$sys_ip_check" ]; then
# Adding RHEL/CentOS/Fedora/Amazon startup script
if [ -d "/etc/sysconfig" ]; then
sys_ip="# Added by vesta"
sys_ip="# Added by devit"
sys_ip="$sys_ip\nDEVICE=$iface"
sys_ip="$sys_ip\nBOOTPROTO=static"
sys_ip="$sys_ip\nONBOOT=yes"
@ -73,7 +73,7 @@ if [ -z "$sys_ip_check" ]; then
# Adding Debian/Ubuntu startup script
if [ -e "/etc/debian_version" ]; then
sys_ip="\n# Added by vesta"
sys_ip="\n# Added by devit"
sys_ip="$sys_ip\nauto $iface"
sys_ip="$sys_ip\niface $iface inet static"
sys_ip="$sys_ip\naddress $ip"
@ -87,7 +87,7 @@ time_n_date=$(date +'%T %F')
time=$(echo "$time_n_date" |cut -f 1 -d \ )
date=$(echo "$time_n_date" |cut -f 2 -d \ )
# Adding vesta ip
# Adding devit ip
echo "OWNER='$user'
STATUS='$ip_status'
NAME='$ip_name'
@ -97,8 +97,8 @@ INTERFACE='$interface'
NETMASK='$netmask'
NAT='$nat_ip'
TIME='$time'
DATE='$date'" > $VESTA/data/ips/$ip
chmod 660 $VESTA/data/ips/$ip
DATE='$date'" > $devit/data/ips/$ip
chmod 660 $devit/data/ips/$ip
# WEB support
if [ ! -z "$WEB_SYSTEM" ]; then
@ -154,14 +154,14 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Updating user counters
increase_user_value "$user" '$IP_OWNED'
if [ "$user" = 'admin' ]; then
if [ "$ip_status" = 'shared' ]; then
for user in $(ls $VESTA/data/users); do
for user in $(ls $devit/data/users); do
increase_user_value "$user" '$IP_AVAIL'
done
else

20
bin/v-add-sys-mail-ssl
View file

@ -15,9 +15,9 @@ domain=$2
restart=$3
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -39,8 +39,8 @@ is_object_value_exist 'web' 'DOMAIN' "$domain" '$SSL'
# Defining certificate location
dom_crt="/home/$user/conf/web/ssl.$domain.pem"
dom_key="/home/$user/conf/web/ssl.$domain.key"
vst_crt="$VESTA/ssl/mail.crt"
vst_key="$VESTA/ssl/mail.key"
vst_crt="$devit/ssl/mail.crt"
vst_key="$devit/ssl/mail.key"
# Checking certificate
if [ ! -e "$dom_crt" ] || [ ! -e "$dom_key" ]; then
@ -79,7 +79,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Restarting services
@ -92,12 +92,12 @@ if [ "$restart" != 'no' ]; then
fi
fi
# Updating vesta.conf
if [ -z "$(grep MAIL_CERTIFICATE $VESTA/conf/vesta.conf)" ]; then
echo "MAIL_CERTIFICATE='$user:$domain'" >> $VESTA/conf/vesta.conf
# Updating devit.conf
if [ -z "$(grep MAIL_CERTIFICATE $devit/conf/devit.conf)" ]; then
echo "MAIL_CERTIFICATE='$user:$domain'" >> $devit/conf/devit.conf
else
sed -i "s/MAIL_CERTIFICATE.*/MAIL_CERTIFICATE='$user:$domain'/g" \
$VESTA/conf/vesta.conf
$devit/conf/devit.conf
fi
# Logging

16
bin/v-add-sys-quota
View file

@ -10,8 +10,8 @@
#----------------------------------------------------------#
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -67,21 +67,21 @@ if [ ! -z "$(quotaon -pa | grep " $mnt " | grep 'user\|group' | grep 'is off')"
check_result $? "quota can't be enabled in $mnt" $E_DISK
fi
# Updating vesta.conf value
if [ -z "$(grep DISK_QUOTA $VESTA/conf/vesta.conf)" ]; then
echo "DISK_QUOTA='yes'" >> $VESTA/conf/vesta.conf
# Updating devit.conf value
if [ -z "$(grep DISK_QUOTA $devit/conf/devit.conf)" ]; then
echo "DISK_QUOTA='yes'" >> $devit/conf/devit.conf
else
sed -i "s/DISK_QUOTA=.*/DISK_QUOTA='yes'/g" $VESTA/conf/vesta.conf
sed -i "s/DISK_QUOTA=.*/DISK_QUOTA='yes'/g" $devit/conf/devit.conf
fi
# Rebuilding user quota
for user in $(ls $VESTA/data/users); do
for user in $(ls $devit/data/users); do
$BIN/v-update-user-quota $user
done
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

8
bin/v-add-sys-sftp-jail
View file

@ -14,8 +14,8 @@
source /etc/profile
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -58,7 +58,7 @@ fi
# Validating opensshd config
if [ "$restart" = 'yes' ]; then
subj="OpenSSH restart failed"
email=$(grep CONTACT $VESTA/data/users/admin/user.conf |cut -f 2 -d \')
email=$(grep CONTACT $devit/data/users/admin/user.conf |cut -f 2 -d \')
/usr/sbin/sshd -t >/dev/null 2>&1
if [ "$?" -ne 0 ]; then
mail_text="OpenSSH can not be restarted. Please check config:
@ -97,7 +97,7 @@ else
fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

32
bin/v-add-sys-vesta-ssl
View file

@ -1,8 +1,8 @@
#!/bin/bash
# info: add vesta ssl certificate
# info: add devit ssl certificate
# options: USER DOMAIN [RESTART]
#
# The function copies user domain SSL to vesta SSL directory
# The function copies user domain SSL to devit SSL directory
#----------------------------------------------------------#
@ -15,9 +15,9 @@ domain=$2
restart=$3
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -39,8 +39,8 @@ is_object_value_exist 'web' 'DOMAIN' "$domain" '$SSL'
# Defining certificate location
dom_crt="/home/$user/conf/web/ssl.$domain.pem"
dom_key="/home/$user/conf/web/ssl.$domain.key"
vst_crt="$VESTA/ssl/certificate.crt"
vst_key="$VESTA/ssl/certificate.key"
vst_crt="$devit/ssl/certificate.crt"
vst_key="$devit/ssl/certificate.key"
# Checking certificate
if [ ! -e "$dom_crt" ] || [ ! -e "$dom_key" ]; then
@ -62,7 +62,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Restarting services
@ -76,19 +76,19 @@ if [ "$restart" != 'no' ]; then
if [ ! -z "$FTP_SYSTEM" ]; then
$BIN/v-restart-service "$FTP_SYSTEM"
fi
if [ -e "/var/run/vesta-nginx.pid" ]; then
kill -HUP $(cat /var/run/vesta-nginx.pid)
if [ -e "/var/run/devit-nginx.pid" ]; then
kill -HUP $(cat /var/run/devit-nginx.pid)
else
service vesta restart
service devit restart
fi
fi
# Updating vesta.conf
if [ -z "$(grep VESTA_CERTIFICATE $VESTA/conf/vesta.conf)" ]; then
echo "VESTA_CERTIFICATE='$user:$domain'" >> $VESTA/conf/vesta.conf
# Updating devit.conf
if [ -z "$(grep devit_CERTIFICATE $devit/conf/devit.conf)" ]; then
echo "devit_CERTIFICATE='$user:$domain'" >> $devit/conf/devit.conf
else
sed -i "s/VESTA_CERTIFICATE.*/VESTA_CERTIFICATE='$user:$domain'/g" \
$VESTA/conf/vesta.conf
sed -i "s/devit_CERTIFICATE.*/devit_CERTIFICATE='$user:$domain'/g" \
$devit/conf/devit.conf
fi
# Logging

22
bin/v-add-user
View file

@ -18,8 +18,8 @@ fname=$5
lname=$6
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
is_user_free() {
check_sysuser=$(cut -f 1 -d : /etc/passwd | grep "^$user$" )
@ -48,7 +48,7 @@ is_package_valid
#----------------------------------------------------------#
# Parsing package data
pkg_data=$(cat $VESTA/data/packages/$package.pkg |egrep -v "TIME|DATE")
pkg_data=$(cat $devit/data/packages/$package.pkg |egrep -v "TIME|DATE")
# Checking shell
shell_conf=$(echo "$pkg_data" | grep 'SHELL' | cut -f 2 -d \')
@ -88,7 +88,7 @@ chattr +i $HOMEDIR/$user/conf
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Adding user dir
@ -119,18 +119,18 @@ chmod 660 $USER_DATA/backup.conf \
$USER_DATA/cron.conf
# Updating queue pipes
echo "$BIN/v-update-user-disk $user" >> $VESTA/data/queue/disk.pipe
echo "$BIN/v-update-user-disk $user" >> $devit/data/queue/disk.pipe
if [ ! -z "$WEB_SYSTEM" ]; then
echo "$BIN/v-update-web-domains-traff $user" \
>> $VESTA/data/queue/traffic.pipe
echo "$BIN/v-update-web-domains-disk $user" >> $VESTA/data/queue/disk.pipe
>> $devit/data/queue/traffic.pipe
echo "$BIN/v-update-web-domains-disk $user" >> $devit/data/queue/disk.pipe
fi
if [ ! -z "$MAIL_SYSTEM" ]; then
echo "$BIN/v-update-mail-domains-disk $user" >> $VESTA/data/queue/disk.pipe
echo "$BIN/v-update-mail-domains-disk $user" >> $devit/data/queue/disk.pipe
fi
if [ ! -z "$DB_SYSTEM" ]; then
echo "$BIN/v-update-databases-disk $user" >> $VESTA/data/queue/disk.pipe
echo "$BIN/v-update-databases-disk $user" >> $devit/data/queue/disk.pipe
fi
# Generating timestamp
@ -199,8 +199,8 @@ if [ "$user" != 'admin' ]; then
fi
# Run template trigger
if [ -x "$VESTA/data/packages/$package.sh" ]; then
$VESTA/data/packages/$package.sh "$user" "$email" "$fname" "$lname"
if [ -x "$devit/data/packages/$package.sh" ]; then
$devit/data/packages/$package.sh "$user" "$email" "$fname" "$lname"
fi
# Adding jailed sftp env

6
bin/v-add-user-favourites
View file

@ -17,8 +17,8 @@ email=$3
id=$3
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -115,7 +115,7 @@ FIREWALL='$FIREWALL'" > $USER_DATA/favourites.conf
chmod 640 $USER_DATA/favourites.conf
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

6
bin/v-add-user-notification
View file

@ -16,8 +16,8 @@ notice=$(echo $3 |sed "s/'/%quote%/g")
type=$4
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -63,7 +63,7 @@ chmod 660 $USER_DATA/notifications.conf
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Updating notification counter

12
bin/v-add-user-package
View file

@ -15,12 +15,12 @@ package=$2
rewrite=$3
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
# Functions
is_package_new() {
if [ -e "$VESTA/data/packages/$package.pkg" ]; then
if [ -e "$devit/data/packages/$package.pkg" ]; then
echo "Error: package $package already exists."
log_event "$E_EXISTS" "$ARGUMENTS"
exit $E_EXISTS
@ -83,12 +83,12 @@ is_package_consistent
# Action #
#----------------------------------------------------------#
cp -f $pkg_dir/$package.pkg $VESTA/data/packages/
chmod 644 $VESTA/data/packages/$package.pkg
cp -f $pkg_dir/$package.pkg $devit/data/packages/
chmod 644 $devit/data/packages/$package.pkg
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

6
bin/v-add-user-sftp-jail
View file

@ -13,8 +13,8 @@
user=$1
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -57,7 +57,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

82
bin/v-add-vesta-softaculous
View file

@ -1,5 +1,5 @@
#!/bin/bash
# info: add vesta softaculous
# info: add devit softaculous
# options: [TYPE]
#
# The script enables softaculous plugin
@ -13,8 +13,8 @@ TYPE=$1
# Includes
source /etc/profile
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -22,13 +22,13 @@ source $VESTA/conf/vesta.conf
#----------------------------------------------------------#
if [ "$TYPE" = 'WEB' ]; then
if [ ! -e "$VESTA/softaculous" ] && [ ! -e "$VESTA/ioncube" ]; then
$BIN/v-schedule-vesta-softaculous
if [ ! -e "$devit/softaculous" ] && [ ! -e "$devit/ioncube" ]; then
$BIN/v-schedule-devit-softaculous
exit
fi
else
cmd="v-add-vesta-softaculous"
check_cron=$(grep "$cmd" $VESTA/data/users/admin/cron.conf 2> /dev/null)
cmd="v-add-devit-softaculous"
check_cron=$(grep "$cmd" $devit/data/users/admin/cron.conf 2> /dev/null)
if [ ! -z "$check_cron" ]; then
eval $check_cron
$BIN/v-delete-cron-job admin $JOB
@ -48,83 +48,83 @@ fi
# Cleaning yum cache
if [ -d "/etc/sysconfig" ]; then
yum -q clean all
yum="yum -q -y --noplugins --disablerepo=* --enablerepo=vesta"
yum="yum -q -y --noplugins --disablerepo=* --enablerepo=devit"
else
export DEBIAN_FRONTEND=noninteractive
apt-get update -o Dir::Etc::sourcelist="sources.list.d/vesta.list" \
apt-get update -o Dir::Etc::sourcelist="sources.list.d/devit.list" \
-o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" -qq
fi
# Updating php pacakge
if [ -z "$($VESTA/php/bin/php -v|grep 'PHP 5.6')" ]; then
if [ -z "$($devit/php/bin/php -v|grep 'PHP 5.6')" ]; then
if [ -d "/etc/sysconfig" ]; then
$yum -y update vesta-php
check_result $? "vesta-php package upgrade failed" $E_UPDATE
$yum -y update devit-php
check_result $? "devit-php package upgrade failed" $E_UPDATE
else
apt-get -y install vesta-php
check_result $? "vesta-php package upgrade failed" $E_UPDATE
apt-get -y install devit-php
check_result $? "devit-php package upgrade failed" $E_UPDATE
fi
fi
# Adding vesta-ioncube package
# Adding devit-ioncube package
if [ -d "/etc/sysconfig" ]; then
rpm -q vesta-ioncube >/dev/null 2>&1
rpm -q devit-ioncube >/dev/null 2>&1
if [ $? -ne 0 ]; then
$yum -y install vesta-ioncube >/dev/null 2>&1
check_result $? "vesta-ioncube package installation failed" $E_UPDATE
$yum -y install devit-ioncube >/dev/null 2>&1
check_result $? "devit-ioncube package installation failed" $E_UPDATE
fi
else
dpkg -l vesta-ioncube |grep ^ii >/dev/null 2>&1
dpkg -l devit-ioncube |grep ^ii >/dev/null 2>&1
if [ $? -ne 0 ]; then
apt-get -y install vesta-ioncube >/dev/null 2>&1
check_result $? "vesta-ioncube package installation failed" $E_UPDATE
apt-get -y install devit-ioncube >/dev/null 2>&1
check_result $? "devit-ioncube package installation failed" $E_UPDATE
fi
fi
# Adding vesta-softaculous package
# Adding devit-softaculous package
if [ -d "/etc/sysconfig" ]; then
rpm -q vesta-softaculous >/dev/null 2>&1
rpm -q devit-softaculous >/dev/null 2>&1
if [ $? -ne 0 ]; then
$yum -y install vesta-softaculous >/dev/null 2>&1
check_result $? "vesta-softaculous package installation failed" $E_UPDATE
$yum -y install devit-softaculous >/dev/null 2>&1
check_result $? "devit-softaculous package installation failed" $E_UPDATE
fi
else
dpkg -l vesta-softaculous |grep ^ii >/dev/null 2>&1
dpkg -l devit-softaculous |grep ^ii >/dev/null 2>&1
if [ $? -ne 0 ]; then
apt-get -y install vesta-softaculous >/dev/null 2>&1
check_result $? "vesta-softaculous package installation failed" $E_UPDATE
apt-get -y install devit-softaculous >/dev/null 2>&1
check_result $? "devit-softaculous package installation failed" $E_UPDATE
fi
fi
# Installing softaculous
if [ ! -e "$VESTA/softaculous/vst_installed" ]; then
if [ ! -e "$devit/softaculous/vst_installed" ]; then
mkdir -p /var/softaculous
chown -R admin:admin /var/softaculous
cd $VESTA/softaculous
wget -q http://c.vestacp.com/3rdparty/softaculous_install.inc
$VESTA/php/bin/php softaculous_install.inc
check_result $? "vesta-softaculous package installation failed" $E_UPDATE
touch $VESTA/softaculous/vst_installed
cd $devit/softaculous
wget -q http://c.devitcp.com/3rdparty/softaculous_install.inc
$devit/php/bin/php softaculous_install.inc
check_result $? "devit-softaculous package installation failed" $E_UPDATE
touch $devit/softaculous/vst_installed
fi
# Enabling symlink
if [ -e "$VESTA/disabled_plugins/softaculous" ]; then
if [ ! -e "$VESTA/web/softaculous" ]; then
mv $VESTA/disabled_plugins/softaculous $VESTA/web/softaculous
if [ -e "$devit/disabled_plugins/softaculous" ]; then
if [ ! -e "$devit/web/softaculous" ]; then
mv $devit/disabled_plugins/softaculous $devit/web/softaculous
fi
fi
# Updating SOFTACULOUS value
if [ -z "$(grep SOFTACULOUS $VESTA/conf/vesta.conf)" ]; then
echo "SOFTACULOUS='yes'" >> $VESTA/conf/vesta.conf
if [ -z "$(grep SOFTACULOUS $devit/conf/devit.conf)" ]; then
echo "SOFTACULOUS='yes'" >> $devit/conf/devit.conf
else
sed -i "s/SOFTACULOUS.*/SOFTACULOUS='yes'/g" \
$VESTA/conf/vesta.conf
$devit/conf/devit.conf
fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

10
bin/v-add-web-domain
View file

@ -25,10 +25,10 @@ aliases=$5
proxy_ext=$6
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/func/ip.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/func/ip.sh
source $devit/conf/devit.conf
# Additional argument formatting
format_domain
@ -146,7 +146,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Increasing counters

10
bin/v-add-web-domain-alias
View file

@ -18,10 +18,10 @@ aliases=$3
restart="$4"
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/func/ip.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/func/ip.sh
source $devit/conf/devit.conf
# Additional argument formatting
format_domain
@ -81,7 +81,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Adding new alias

8
bin/v-add-web-domain-backend
View file

@ -16,9 +16,9 @@ template=${3-default}
restart=$4
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -63,7 +63,7 @@ cat $WEBTPL/$WEB_BACKEND/$template.tpl |\
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Restart backend server

8
bin/v-add-web-domain-ftp
View file

@ -18,9 +18,9 @@ password=$4; HIDE=4
ftp_path=$5
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
# Additional argument formatting
format_domain
@ -98,7 +98,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Transforming absolute path to relative

8
bin/v-add-web-domain-httpauth
View file

@ -17,9 +17,9 @@ password=$4; HIDE=4
restart=${5-yes}
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
# Defining htpasswd file
htaccess="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.$domain.conf_htaccess"
@ -91,7 +91,7 @@ if [ "$restart" != 'no' ] && [ "$restart_required" = 'yes' ]; then
fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Preparing web.conf keys

10
bin/v-add-web-domain-proxy
View file

@ -20,10 +20,10 @@ extentions=${4-$default_extentions}
restart="$5"
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/func/ip.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/func/ip.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -64,7 +64,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Update config

20
bin/v-add-web-domain-ssl
View file

@ -36,10 +36,10 @@ domain=$(idn -t --quiet -u "$domain" )
domain_idn=$(idn -t --quiet -a "$domain")
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/func/ip.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/func/ip.sh
source $devit/conf/devit.conf
# Additional argument formatting
format_domain
@ -103,7 +103,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Increasing domain value
@ -121,11 +121,11 @@ $BIN/v-restart-proxy $restart
check_result $? "Proxy restart failed" >/dev/null
# Updating system ssl dependencies
if [ ! -z "$VESTA_CERTIFICATE" ]; then
crt_user=$(echo "$VESTA_CERTIFICATE" |cut -f 1 -d :)
crt_domain=$(echo "$VESTA_CERTIFICATE" |cut -f 2 -d :)
if [ ! -z "$devit_CERTIFICATE" ]; then
crt_user=$(echo "$devit_CERTIFICATE" |cut -f 1 -d :)
crt_domain=$(echo "$devit_CERTIFICATE" |cut -f 2 -d :)
if [ "$user" = "$crt_user" ] && [ "$domain" = "$crt_domain" ]; then
$BIN/v-add-sys-vesta-ssl $user $domain >/dev/null 2>&1
$BIN/v-add-sys-devit-ssl $user $domain >/dev/null 2>&1
fi
fi
if [ ! -z "$MAIL_CERTIFICATE" ]; then
@ -144,7 +144,7 @@ if [ ! -z "$UPDATE_HOSTNAME_SSL" ] && [ "$UPDATE_HOSTNAME_SSL" = "yes" ]; then
fi
UPDATE_SSL_SCRIPT=''
source $VESTA/conf/vesta.conf
source $devit/conf/devit.conf
if [ ! -z "$UPDATE_SSL_SCRIPT" ]; then
eval "$UPDATE_SSL_SCRIPT $user $domain"
fi

10
bin/v-add-web-domain-stats
View file

@ -20,9 +20,9 @@ domain_idn=$2
type=$3
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
# Additional argument formatting
format_domain
@ -80,12 +80,12 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Schedule statistic processing
echo "$BIN/v-update-web-domain-stat $user $domain" >> \
$VESTA/data/queue/webstats.pipe
$devit/data/queue/webstats.pipe
# Update config
update_object_value 'web' 'DOMAIN' "$domain" '$STATS' "$type"

8
bin/v-add-web-domain-stats-user
View file

@ -17,9 +17,9 @@ password=$4; HIDE=4
restart=$5
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -62,7 +62,7 @@ echo "$stats_user:$stats_pass" > $stats_dir/.htpasswd
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Adding stats user in config

86
bin/v-backup-user
View file

@ -17,10 +17,10 @@ user=$1
notify=${2-no}
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/func/db.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/func/db.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -50,7 +50,7 @@ start_time=$(date '+%s')
# Set notification email and subject
subj="$user → backup failed"
email=$(grep CONTACT $VESTA/data/users/admin/user.conf |cut -f 2 -d \')
email=$(grep CONTACT $devit/data/users/admin/user.conf |cut -f 2 -d \')
# Checking load average
la=$(cat /proc/loadavg |cut -f 1 -d ' ' |cut -f 1 -d '.')
@ -61,7 +61,7 @@ while [ "$la" -ge "$BACKUP_LA_LIMIT" ]; do
if [ "$i" -ge "15" ]; then
la_error="LoadAverage $la is above threshold"
echo "$la_error" |$SENDMAIL -s "$subj" $email $notify
sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
sed -i "/ $user /d" $devit/data/queue/backup.pipe
check_result $E_LA "$la_error"
fi
la=$(cat /proc/loadavg |cut -f 1 -d ' ' |cut -f 1 -d '.')
@ -82,25 +82,25 @@ fi
# Backup sys configs
echo "-- SYSTEM --" |tee $BACKUP/$user.log
mkdir $tmpdir/vesta
mkdir $tmpdir/devit
echo -e "$(date "+%F %T") $user.conf" |tee -a $BACKUP/$user.log
cp -r $USER_DATA/user.conf $tmpdir/vesta/
cp -r $USER_DATA/ssl $tmpdir/vesta/
cp -r $USER_DATA/user.conf $tmpdir/devit/
cp -r $USER_DATA/ssl $tmpdir/devit/
if [ -e "$USER_DATA/stats.log" ]; then
echo -e "$(date "+%F %T") stats.log" |tee -a $BACKUP/$user.log
cp -r $USER_DATA/stats.log $tmpdir/vesta/
cp -r $USER_DATA/stats.log $tmpdir/devit/
fi
if [ -e "$USER_DATA/history.log" ]; then
echo -e "$(date "+%F %T") history.log" |tee -a $BACKUP/$user.log
cp -r $USER_DATA/history.log $tmpdir/vesta/
cp -r $USER_DATA/history.log $tmpdir/devit/
fi
if [ -e "$USER_DATA/backup-excludes.conf" ]; then
echo -e "$(date "+%F %T") backup-excludes.conf" |tee -a $BACKUP/$user.log
cp -r $USER_DATA/backup-excludes.conf $tmpdir/vesta/
cp -r $USER_DATA/backup-excludes.conf $tmpdir/devit/
fi
# Backup PAM
@ -139,7 +139,7 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then
((i ++))
echo -e "$(date "+%F %T") $domain" |tee -a $BACKUP/$user.log
mkdir -p $tmpdir/web/$domain/conf
mkdir -p $tmpdir/web/$domain/vesta
mkdir -p $tmpdir/web/$domain/devit
# Get domain variables
domain_idn=$domain
@ -149,7 +149,7 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then
# Backup web.conf
cd $tmpdir/web/$domain/
conf="$USER_DATA/web.conf"
grep "DOMAIN='$domain'" $conf > vesta/web.conf
grep "DOMAIN='$domain'" $conf > devit/web.conf
# Backup vhost config
conf=$HOMEDIR/$user/conf/web/$domain.$WEB_SYSTEM.conf
@ -213,7 +213,7 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then
# Backup ssl certificates
if [ "$SSL" = 'yes' ] ; then
cp $HOMEDIR/$user/conf/web/ssl.$domain.* conf/
cp $USER_DATA/ssl/$domain.* vesta/
cp $USER_DATA/ssl/$domain.* devit/
fi
# Changin dir to documentroot
@ -276,15 +276,15 @@ if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS" != '*' ]; then
# Building directory tree
mkdir -p $tmpdir/dns/$domain/conf
mkdir -p $tmpdir/dns/$domain/vesta
mkdir -p $tmpdir/dns/$domain/devit
# Backup dns.conf
cd $tmpdir/dns/$domain/
conf="$USER_DATA/dns.conf"
grep "DOMAIN='$domain'" $conf > vesta/dns.conf
grep "DOMAIN='$domain'" $conf > devit/dns.conf
# Backup dns recods
cp $USER_DATA/dns/$domain.conf vesta/$domain.conf
cp $USER_DATA/dns/$domain.conf devit/$domain.conf
if [ "$DNS_SYSTEM" != 'remote' ]; then
cp $HOMEDIR/$user/conf/dns/$domain.db conf/$domain.db
fi
@ -320,7 +320,7 @@ if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL" != '*' ]; then
((i ++))
echo -e "$(date "+%F %T") $domain" |tee -a $BACKUP/$user.log
mkdir -p $tmpdir/mail/$domain/conf
mkdir -p $tmpdir/mail/$domain/vesta
mkdir -p $tmpdir/mail/$domain/devit
domain_idn=$domain
format_domain_idn
@ -332,10 +332,10 @@ if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL" != '*' ]; then
# Backup mail.conf
conf="$USER_DATA/mail.conf"
grep "DOMAIN='$domain'" $conf > vesta/mail.conf
cp $USER_DATA/mail/$domain.* vesta/
grep "DOMAIN='$domain'" $conf > devit/mail.conf
cp $USER_DATA/mail/$domain.* devit/
if [ ! -z "$(ls $USER_DATA/mail/|grep *@$domain)" ]; then
cp $USER_DATA/mail/*@$domain.* vesta/
cp $USER_DATA/mail/*@$domain.* devit/
fi
# Backup emails
@ -394,10 +394,10 @@ if [ ! -z "$DB_SYSTEM" ] && [ "$DB" != '*' ]; then
echo -e "$(date "+%F %T") $database ($TYPE)" |tee -a $BACKUP/$user.log
mkdir -p $tmpdir/db/$database/conf
mkdir -p $tmpdir/db/$database/vesta
mkdir -p $tmpdir/db/$database/devit
cd $tmpdir/db/$database/
grep "DB='$database'" $conf > vesta/db.conf
grep "DB='$database'" $conf > devit/db.conf
dump="$tmpdir/db/$database/$database.$TYPE.sql"
dumpgz="$tmpdir/db/$database/$database.$TYPE.sql.gz"
@ -535,7 +535,7 @@ local_backup(){
if [ "$disk_usage" -ge "$BACKUP_DISK_LIMIT" ]; then
rm -rf $tmpdir
rm -f $BACKUP/$user.log
sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
sed -i "/ $user /d" $devit/data/queue/backup.pipe
echo "Not enough disk space" |$SENDMAIL -s "$subj" $email $notify
check_result "$E_DISK" "Not enough dsk space"
fi
@ -567,20 +567,20 @@ EOF
# Defining ftp storage function
ftp_backup() {
# Checking config
if [ ! -e "$VESTA/conf/ftp.backup.conf" ]; then
if [ ! -e "$devit/conf/ftp.backup.conf" ]; then
error="ftp.backup.conf doesn't exist"
rm -rf $tmpdir
rm -f $BACKUP/$user.log
echo "$error" |$SENDMAIL -s "$subj" $email $notify
sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
sed -i "/ $user /d" $devit/data/queue/backup.pipe
check_result "$E_NOTEXIST" "$error"
fi
# Parse config
source $VESTA/conf/ftp.backup.conf
source $devit/conf/ftp.backup.conf
# Set default port
if [ -z "$(grep 'PORT=' $VESTA/conf/ftp.backup.conf)" ]; then
if [ -z "$(grep 'PORT=' $devit/conf/ftp.backup.conf)" ]; then
PORT='21'
fi
@ -590,7 +590,7 @@ ftp_backup() {
rm -rf $tmpdir
rm -f $BACKUP/$user.log
echo "$error" |$SENDMAIL -s "$subj" $email $notify
sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
sed -i "/ $user /d" $devit/data/queue/backup.pipe
check_result "$E_PARSING" "$error"
fi
@ -605,7 +605,7 @@ ftp_backup() {
rm -rf $tmpdir
rm -f $BACKUP/$user.log
echo "$error" |$SENDMAIL -s "$subj" $email $notify
sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
sed -i "/ $user /d" $devit/data/queue/backup.pipe
check_result "$E_CONNECT" "$error"
fi
@ -623,7 +623,7 @@ ftp_backup() {
rm -rf $tmpdir
rm -f $BACKUP/$user.log
echo "$error" |$SENDMAIL -s "$subj" $email $notify
sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
sed -i "/ $user /d" $devit/data/queue/backup.pipe
check_result "$E_FTP" "$error"
fi
@ -730,20 +730,20 @@ EOF
sftp_backup() {
# Checking config
if [ ! -e "$VESTA/conf/sftp.backup.conf" ]; then
if [ ! -e "$devit/conf/sftp.backup.conf" ]; then
error="Can't open sftp.backup.conf"
rm -rf $tmpdir
rm -f $BACKUP/$user.log
echo "$error" |$SENDMAIL -s "$subj" $email $notify
sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
sed -i "/ $user /d" $devit/data/queue/backup.pipe
check_result "$E_NOTEXIST" "$error"
fi
# Parse config
source $VESTA/conf/sftp.backup.conf
source $devit/conf/sftp.backup.conf
# Set default port
if [ -z "$(grep 'PORT=' $VESTA/conf/sftp.backup.conf)" ]; then
if [ -z "$(grep 'PORT=' $devit/conf/sftp.backup.conf)" ]; then
PORT='22'
fi
@ -753,7 +753,7 @@ sftp_backup() {
rm -rf $tmpdir
rm -f $BACKUP/$user.log
echo "$error" |$SENDMAIL -s "$subj" $email $notify
sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
sed -i "/ $user /d" $devit/data/queue/backup.pipe
check_result "$E_PARSING" "$error"
fi
@ -778,7 +778,7 @@ sftp_backup() {
rm -rf $tmpdir
rm -f $BACKUP/$user.log
echo "$error" |$SENDMAIL -s "$subj" $email $notify
sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
sed -i "/ $user /d" $devit/data/queue/backup.pipe
check_result "$rc" "$error"
fi
@ -828,9 +828,9 @@ sftp_backup() {
google_backup() {
# Defining google settings
source $VESTA/conf/google.backup.conf
gsutil="$VESTA/3rdparty/gsutil/gsutil"
export BOTO_CONFIG="$VESTA/conf/.google.backup.boto"
source $devit/conf/google.backup.conf
gsutil="$devit/3rdparty/gsutil/gsutil"
export BOTO_CONFIG="$devit/conf/.google.backup.boto"
# Debug info
echo -e "$(date "+%F %T") Remote: gs://$BUCKET/$BPATH/$user.$backup_new_date.tar"
@ -897,7 +897,7 @@ echo "$(date "+%F %T") Runtime: $run_time $min" |tee -a $BACKUP/$user.log
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Removing duplicate
@ -922,7 +922,7 @@ mv -f $USER_DATA/backup.conf_ $USER_DATA/backup.conf
chmod 660 $USER_DATA/backup.conf
# Deleting task from queue
sed -i "/v-backup-user $user /d" $VESTA/data/queue/backup.pipe
sed -i "/v-backup-user $user /d" $devit/data/queue/backup.pipe
U_BACKUPS=$(grep BACKUP $USER_DATA/backup.conf |wc -l)
update_user_value "$user" '$U_BACKUPS' "$U_BACKUPS"

14
bin/v-backup-users
View file

@ -14,25 +14,25 @@
source /etc/profile
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
# Action #
#----------------------------------------------------------#
$BIN/v-check-vesta-license >/dev/null
$BIN/v-check-devit-license >/dev/null
if [ -z "$BACKUP_SYSTEM" ]; then
exit
fi
for user in $(grep '@' /etc/passwd |cut -f1 -d:); do
if [ ! -f "$VESTA/data/users/$user/user.conf" ]; then
if [ ! -f "$devit/data/users/$user/user.conf" ]; then
continue;
fi
check_suspend=$(grep "SUSPENDED='no'" $VESTA/data/users/$user/user.conf)
log=$VESTA/log/backup.log
check_suspend=$(grep "SUSPENDED='no'" $devit/data/users/$user/user.conf)
log=$devit/log/backup.log
if [ ! -z "$check_suspend" ]; then
echo -e "================================" >> $log
echo -e "$user" >> $log
@ -43,7 +43,7 @@ for user in $(grep '@' /etc/passwd |cut -f1 -d:); do
done
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# No Logging

6
bin/v-change-cron-job
View file

@ -21,8 +21,8 @@ wday=$7
command=$8
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -66,7 +66,7 @@ sync_cron_jobs
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Restarting crond

10
bin/v-change-database-host-password
View file

@ -16,9 +16,9 @@ dbuser=$3
password=$4; HIDE=4
# Includes
source $VESTA/func/main.sh
source $VESTA/func/db.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/db.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -37,7 +37,7 @@ dbpass="$password"
#----------------------------------------------------------#
# Define email
email=$(grep CONTACT $VESTA/data/users/admin/user.conf |cut -f2 -d \')
email=$(grep CONTACT $devit/data/users/admin/user.conf |cut -f2 -d \')
subj="v-change-database-host-password $*"
case $type in
@ -59,7 +59,7 @@ update_object_value "../../conf/$type" 'HOST' "$host" '$PASSWORD' "$dbpass"
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

18
bin/v-change-database-owner
View file

@ -14,10 +14,10 @@ database=$1
user=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/func/db.sh
source $VESTA/func/rebuild.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/db.sh
source $devit/func/rebuild.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -32,7 +32,7 @@ is_object_unsuspended 'user' 'USER' "$user"
# Check owner existance
owner=$(echo $database | cut -f 1 -d '_')
if [ ! -e "$VESTA/data/users/$owner" ]; then
if [ ! -e "$devit/data/users/$owner" ]; then
echo "Error: database owner doesn't exist"
log_event "$E_NOTEXIST" "$ARGUMENTS"
exit $E_NOTEXIST
@ -44,7 +44,7 @@ if [ "$owner" = "$user" ]; then
fi
# Check db existance
db_data=$(grep "DB='$database'" $VESTA/data/users/$owner/db.conf)
db_data=$(grep "DB='$database'" $devit/data/users/$owner/db.conf)
if [ -z "$db_data" ]; then
echo "Error: database $database doesn't exist"
log_event "$E_NOTEXIST" "$ARGUMENTS"
@ -53,7 +53,7 @@ fi
# Check if datbase name is uniq
new_db=$(echo $database | sed "s/^${owner}_/${user}_/")
check_db=$(grep "DB='$new_db'" $VESTA/data/users/$user/db.conf)
check_db=$(grep "DB='$new_db'" $devit/data/users/$user/db.conf)
if [ ! -z "$check_db" ]; then
echo "Error: $new_db database exists"
log_event "$E_EXISTS" "$ARGUMENTS"
@ -87,7 +87,7 @@ esac
# Import configuration
db_data=$(echo "$db_data" | sed "s/'${owner}_/'${user}_/g")
echo "$db_data" >> $VESTA/data/users/$user/db.conf
echo "$db_data" >> $devit/data/users/$user/db.conf
eval $db_data
# Unsuspend db
@ -115,7 +115,7 @@ $BIN/v-update-user-counters $user
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

8
bin/v-change-database-password
View file

@ -16,9 +16,9 @@ database=$2
password=$3; HIDE=3
# Includes
source $VESTA/func/main.sh
source $VESTA/func/db.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/db.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -48,7 +48,7 @@ esac
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Update config value

10
bin/v-change-database-user
View file

@ -16,10 +16,10 @@ dbuser="$user"_"$3"
password=$4; HIDE=4
# Includes
source $VESTA/func/main.sh
source $VESTA/func/db.sh
source $VESTA/func/rebuild.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/db.sh
source $devit/func/rebuild.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -81,7 +81,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

10
bin/v-change-dns-domain-exp
View file

@ -17,8 +17,8 @@ domain_idn=$2
exp=$3
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
# Additional argument formatting
format_domain
@ -49,16 +49,16 @@ update_object_value 'dns' 'DOMAIN' "$domain" '$EXP' "$exp"
# Updating dns-cluster queue
if [ ! -z "$DNS_CLUSTER" ]; then
# Check for first sync
dlock=$(grep "domain $user $domain" $VESTA/data/queue/dns-cluster.pipe)
dlock=$(grep "domain $user $domain" $devit/data/queue/dns-cluster.pipe)
if [ -z "$dlock" ]; then
cmd="$BIN/v-change-remote-dns-domain-exp $user $domain $exp"
echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
echo "$cmd" >> $devit/data/queue/dns-cluster.pipe
fi
fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

12
bin/v-change-dns-domain-ip
View file

@ -17,9 +17,9 @@ ip=$3
restart=$4
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
# Additional argument formatting
format_domain
@ -63,16 +63,16 @@ fi
# Updating dns-cluster queue
if [ ! -z "$DNS_CLUSTER" ]; then
# Check for first sync
dlock=$(grep "domain $user $domain" $VESTA/data/queue/dns-cluster.pipe)
dlock=$(grep "domain $user $domain" $devit/data/queue/dns-cluster.pipe)
if [ -z "$dlock" ]; then
cmd="$BIN/v-add-remote-dns-domain $user $domain domain yes"
echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
echo "$cmd" >> $devit/data/queue/dns-cluster.pipe
fi
fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Restarting named

12
bin/v-change-dns-domain-soa
View file

@ -18,9 +18,9 @@ soa=$(echo $3 | sed -e 's/\.*$//g' -e 's/^\.*//g')
restart=$4
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
# Additional argument formatting
format_domain
@ -57,16 +57,16 @@ fi
# Updating dns-cluster queue
if [ ! -z "$DNS_CLUSTER" ]; then
# Check for first sync
dlock=$(grep "domain $user $domain" $VESTA/data/queue/dns-cluster.pipe)
dlock=$(grep "domain $user $domain" $devit/data/queue/dns-cluster.pipe)
if [ -z "$dlock" ]; then
cmd="$BIN/v-change-remote-dns-domain-soa $user $domain $soa"
echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
echo "$cmd" >> $devit/data/queue/dns-cluster.pipe
fi
fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Restarting named

14
bin/v-change-dns-domain-tpl
View file

@ -19,9 +19,9 @@ template=$3
restart=$4
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
# Additional argument formatting
format_domain
@ -104,19 +104,19 @@ fi
# Updating dns-cluster queue
if [ ! -z "$DNS_CLUSTER" ]; then
# Check for first sync
dlock=$(grep "domain $user $domain" $VESTA/data/queue/dns-cluster.pipe)
dlock=$(grep "domain $user $domain" $devit/data/queue/dns-cluster.pipe)
if [ -z "$dlock" ]; then
cmd="$BIN/v-add-remote-dns-domain $user $domain domain"
echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
echo "$cmd" >> $devit/data/queue/dns-cluster.pipe
fi
fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Updating vesta config
# Updating devit config
update_object_value 'dns' 'DOMAIN' "$domain" '$TPL' "$template"
update_object_value 'dns' 'DOMAIN' "$domain" '$RECORDS' "$records"

12
bin/v-change-dns-domain-ttl
View file

@ -17,9 +17,9 @@ ttl=$3
restart=$4
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
# Additional argument formatting
format_domain
@ -56,16 +56,16 @@ fi
# Updating dns-cluster queue
if [ ! -z "$DNS_CLUSTER" ]; then
# Check for first sync
dlock=$(grep "domain $user $domain" $VESTA/data/queue/dns-cluster.pipe)
dlock=$(grep "domain $user $domain" $devit/data/queue/dns-cluster.pipe)
if [ -z "$dlock" ]; then
cmd="$BIN/v-change-remote-dns-domain-ttl $user $domain $ttl"
echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
echo "$cmd" >> $devit/data/queue/dns-cluster.pipe
fi
fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Restarting named

12
bin/v-change-dns-record
View file

@ -19,9 +19,9 @@ priority=$5
restart=$6
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
# Additional argument formatting
format_domain
@ -93,16 +93,16 @@ fi
# Updating dns-cluster queue
if [ ! -z "$DNS_CLUSTER" ]; then
# Check for first sync
dlock=$(grep "domain $user $domain" $VESTA/data/queue/dns-cluster.pipe)
dlock=$(grep "domain $user $domain" $devit/data/queue/dns-cluster.pipe)
if [ -z "$dlock" ]; then
cmd="$BIN/v-add-remote-dns-domain $user $domain records"
echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
echo "$cmd" >> $devit/data/queue/dns-cluster.pipe
fi
fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Restarting named

12
bin/v-change-dns-record-id
View file

@ -18,9 +18,9 @@ newid=$4
restart=$5
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
# Additional argument formatting
format_domain
@ -62,16 +62,16 @@ fi
# Updating dns-cluster queue
if [ ! -z "$DNS_CLUSTER" ]; then
# Check for first sync
dlock=$(grep "domain $user $domain" $VESTA/data/queue/dns-cluster.pipe)
dlock=$(grep "domain $user $domain" $devit/data/queue/dns-cluster.pipe)
if [ -z "$dlock" ]; then
cmd="$BIN/v-add-remote-dns-domain $user $domain records"
echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
echo "$cmd" >> $devit/data/queue/dns-cluster.pipe
fi
fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Restarting named

62
bin/v-change-domain-owner
View file

@ -14,9 +14,9 @@ domain=$1
user=$2
# Includes
source $VESTA/func/ip.sh
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/ip.sh
source $devit/func/main.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -41,7 +41,7 @@ fi
#----------------------------------------------------------#
# WEB domain
web_data=$(grep "DOMAIN='$domain'" $VESTA/data/users/$owner/web.conf)
web_data=$(grep "DOMAIN='$domain'" $devit/data/users/$owner/web.conf)
if [ ! -z "$web_data" ]; then
$BIN/v-suspend-web-domain $owner $domain >> /dev/null 2>&1
eval $web_data
@ -53,14 +53,14 @@ if [ ! -z "$web_data" ]; then
# Check SSL
if [ "$SSL" = 'yes' ]; then
ssl_crt=$VESTA/data/users/$owner/ssl/$domain.crt
ssl_key=$VESTA/data/users/$owner/ssl/$domain.key
ssl_ca=$VESTA/data/users/$owner/ssl/$domain.ca
ssl_pem=$VESTA/data/users/$owner/ssl/$domain.pem
mv $ssl_crt $VESTA/data/users/$user/ssl/
mv $ssl_key $VESTA/data/users/$user/ssl/
mv $ssl_ca $VESTA/data/users/$user/ssl/ >> /dev/null 2>&1
mv $ssl_pem $VESTA/data/users/$user/ssl/ >> /dev/null 2>&1
ssl_crt=$devit/data/users/$owner/ssl/$domain.crt
ssl_key=$devit/data/users/$owner/ssl/$domain.key
ssl_ca=$devit/data/users/$owner/ssl/$domain.ca
ssl_pem=$devit/data/users/$owner/ssl/$domain.pem
mv $ssl_crt $devit/data/users/$user/ssl/
mv $ssl_key $devit/data/users/$user/ssl/
mv $ssl_ca $devit/data/users/$user/ssl/ >> /dev/null 2>&1
mv $ssl_pem $devit/data/users/$user/ssl/ >> /dev/null 2>&1
rm -f $HOMEDIR/$owner/conf/web/ssl.$domain.*
fi
@ -73,8 +73,8 @@ if [ ! -z "$web_data" ]; then
fi
# Move config
sed -i "/DOMAIN='$domain'/d" $VESTA/data/users/$owner/web.conf
echo "$web_data" >> $VESTA/data/users/$user/web.conf
sed -i "/DOMAIN='$domain'/d" $devit/data/users/$owner/web.conf
echo "$web_data" >> $devit/data/users/$user/web.conf
# Move data
mv $HOMEDIR/$owner/web/$domain $HOMEDIR/$user/web/
@ -90,23 +90,23 @@ if [ ! -z "$web_data" ]; then
fi
# DNS domain
dns_data=$(grep "DOMAIN='$domain'" $VESTA/data/users/$owner/dns.conf)
dns_data=$(grep "DOMAIN='$domain'" $devit/data/users/$owner/dns.conf)
if [ ! -z "$dns_data" ]; then
eval $dns_data
# Change IP
if [ ! -z "$ip" ]; then
dns_data=$(echo "$dns_data" | sed "s/IP='$IP'/IP='$ip'/")
sed -i "s/$IP/$ip/g" $VESTA/data/users/$owner/dns/$domain.conf
sed -i "s/$IP/$ip/g" $devit/data/users/$owner/dns/$domain.conf
fi
# Move config
sed -i "/DOMAIN='$domain'/d" $VESTA/data/users/$owner/dns.conf
echo "$dns_data" >> $VESTA/data/users/$user/dns.conf
sed -i "/DOMAIN='$domain'/d" $devit/data/users/$owner/dns.conf
echo "$dns_data" >> $devit/data/users/$user/dns.conf
# Move dns records
mv $VESTA/data/users/$owner/dns/$domain.conf \
$VESTA/data/users/$user/dns/
mv $devit/data/users/$owner/dns/$domain.conf \
$devit/data/users/$user/dns/
# Rebuild config
$BIN/v-unsuspend-dns-domain $user $domain no >> /dev/null 2>&1
@ -120,21 +120,21 @@ if [ ! -z "$dns_data" ]; then
fi
# MAIL domain
mail_data=$(grep "DOMAIN='$domain'" $VESTA/data/users/$owner/mail.conf)
mail_data=$(grep "DOMAIN='$domain'" $devit/data/users/$owner/mail.conf)
if [ ! -z "$mail_data" ]; then
# Move config
sed -i "/DOMAIN='$domain'/d" $VESTA/data/users/$owner/mail.conf
echo "$mail_data" >> $VESTA/data/users/$user/mail.conf
mv -f $VESTA/data/users/$owner/mail/$domain.conf \
$VESTA/data/users/$user/mail/
sed -i "/DOMAIN='$domain'/d" $devit/data/users/$owner/mail.conf
echo "$mail_data" >> $devit/data/users/$user/mail.conf
mv -f $devit/data/users/$owner/mail/$domain.conf \
$devit/data/users/$user/mail/
# Move DKIM
if [ -e "$VESTA/data/users/$owner/mail/$domain.pem" ]; then
mv -f $VESTA/data/users/$owner/mail/$domain.pem \
$VESTA/data/users/$user/mail/
mv -f $VESTA/data/users/$owner/mail/$domain.pub \
$VESTA/data/users/$user/mail/
if [ -e "$devit/data/users/$owner/mail/$domain.pem" ]; then
mv -f $devit/data/users/$owner/mail/$domain.pem \
$devit/data/users/$user/mail/
mv -f $devit/data/users/$owner/mail/$domain.pub \
$devit/data/users/$user/mail/
fi
# Move data
@ -168,7 +168,7 @@ $BIN/v-update-user-counters $user
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

18
bin/v-change-firewall-rule
View file

@ -23,15 +23,15 @@ protocol=$(echo $protocol|tr '[:lower:]' '[:upper:]')
comment=$6
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
# Sort function
sort_fw_rules() {
cat $VESTA/data/firewall/rules.conf |\
sort -n -k 2 -t \' > $VESTA/data/firewall/rules.conf.tmp
mv -f $VESTA/data/firewall/rules.conf.tmp \
$VESTA/data/firewall/rules.conf
cat $devit/data/firewall/rules.conf |\
sort -n -k 2 -t \' > $devit/data/firewall/rules.conf.tmp
mv -f $devit/data/firewall/rules.conf.tmp \
$devit/data/firewall/rules.conf
}
@ -63,10 +63,10 @@ str="$str IP='$ip' COMMENT='$comment' SUSPENDED='no'"
str="$str TIME='$time' DATE='$date'"
# Deleting old rule
sed -i "/RULE='$rule' /d" $VESTA/data/firewall/rules.conf
sed -i "/RULE='$rule' /d" $devit/data/firewall/rules.conf
# Adding new
echo "$str" >> $VESTA/data/firewall/rules.conf
echo "$str" >> $devit/data/firewall/rules.conf
# Sorting firewall rules by id number
sort_fw_rules
@ -76,7 +76,7 @@ $BIN/v-update-firewall
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

6
bin/v-change-fs-file-permission
View file

@ -14,9 +14,9 @@ if [ -z "$permissions" ]; then
exit 1
fi
# Checking vesta user
if [ ! -e "$VESTA/data/users/$user" ]; then
echo "Error: vesta user $user doesn't exist"
# Checking devit user
if [ ! -e "$devit/data/users/$user" ]; then
echo "Error: devit user $user doesn't exist"
exit 3
fi

10
bin/v-change-mail-account-password
View file

@ -17,9 +17,9 @@ account=$3
password=$4; HIDE=4
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
# Additional argument formatting
format_domain
@ -52,7 +52,7 @@ salt=$(generate_password "$PW_MATRIX" "8")
md5="{MD5}$($BIN/v-generate-password-hash md5 $salt <<<$password)"
if [[ "$MAIL_SYSTEM" =~ exim ]]; then
quota=$(grep $account $VESTA/data/users/${user}/mail/${domain}.conf)
quota=$(grep $account $devit/data/users/${user}/mail/${domain}.conf)
quota=$(echo $quota | awk '{ print $7 }' | sed -e "s/'//g" )
quota=$(echo $quota | cut -d "=" -f 2 | sed -e "s/unlimited/0/g")
sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/passwd
@ -62,7 +62,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Update md5

8
bin/v-change-mail-account-quota
View file

@ -17,9 +17,9 @@ account=$3
quota=$4
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
# Additional argument formatting
format_domain
@ -61,7 +61,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
if [[ "$quota" -eq 0 ]]; then

8
bin/v-change-mail-domain-catchall
View file

@ -16,9 +16,9 @@ domain_idn=$2
email=$3
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
# Additional argument formatting
format_domain
@ -50,7 +50,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Change catchall in config

12
bin/v-change-remote-dns-domain-exp
View file

@ -14,9 +14,9 @@ user=$1
domain=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/func/remote.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/remote.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -37,7 +37,7 @@ remote_dns_health_check
#----------------------------------------------------------#
IFS=$'\n'
for cluster in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do
for cluster in $(grep "SUSPENDED='no'" $devit/conf/dns-cluster.conf); do
# Parsing remote host parameters
eval $cluster
@ -51,11 +51,11 @@ done
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Updating pipe
pipe="$VESTA/data/queue/dns-cluster.pipe"
pipe="$devit/data/queue/dns-cluster.pipe"
str=$(grep -n "$SCRIPT $1 $2 $3$" $pipe | cut -f1 -d: | head -n1)
if [ ! -z "$str" ]; then
sed -i "$str d" $pipe

12
bin/v-change-remote-dns-domain-soa
View file

@ -14,9 +14,9 @@ user=$1
domain=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/func/remote.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/remote.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -37,7 +37,7 @@ remote_dns_health_check
#----------------------------------------------------------#
IFS=$'\n'
for cluster in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do
for cluster in $(grep "SUSPENDED='no'" $devit/conf/dns-cluster.conf); do
# Parsing remote host parameters
eval $cluster
@ -55,11 +55,11 @@ done
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Updating pipe
pipe="$VESTA/data/queue/dns-cluster.pipe"
pipe="$devit/data/queue/dns-cluster.pipe"
str=$(grep -n "$SCRIPT $1 $2 $3$" $pipe | cut -f1 -d: | head -n1)
if [ ! -z "$str" ]; then
sed -i "$str d" $pipe

12
bin/v-change-remote-dns-domain-ttl
View file

@ -14,9 +14,9 @@ user=$1
domain=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/func/remote.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/remote.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -37,7 +37,7 @@ remote_dns_health_check
#----------------------------------------------------------#
IFS=$'\n'
for cluster in $(grep "SUSPENDED='no'" $VESTA/conf/dns-cluster.conf); do
for cluster in $(grep "SUSPENDED='no'" $devit/conf/dns-cluster.conf); do
# Parsing remote host parameters
eval $cluster
@ -55,11 +55,11 @@ done
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Updating pipe
pipe="$VESTA/data/queue/dns-cluster.pipe"
pipe="$devit/data/queue/dns-cluster.pipe"
str=$(grep -n "$SCRIPT $1 $2 $3$" $pipe | cut -f1 -d: | head -n1)
if [ ! -z "$str" ]; then
sed -i "$str d" $pipe

12
bin/v-change-sys-config-value
View file

@ -15,8 +15,8 @@ key=$(echo "$1" | tr '[:lower:]' '[:upper:]' )
value=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
PATH="$PATH:/usr/local/sbin:/sbin:/usr/sbin:/root/bin"
@ -35,11 +35,11 @@ format_no_quotes "$value" 'value'
#----------------------------------------------------------#
# Updating conf
check_ckey=$(grep "^$key='" $VESTA/conf/vesta.conf)
check_ckey=$(grep "^$key='" $devit/conf/devit.conf)
if [ -z "$check_ckey" ]; then
echo "$key='$value'" >> $VESTA/conf/vesta.conf
echo "$key='$value'" >> $devit/conf/devit.conf
else
sed -i "s|$key=.*|$key='$value'|g" $VESTA/conf/vesta.conf
sed -i "s|$key=.*|$key='$value'|g" $devit/conf/devit.conf
fi
if [ "$key" = "BACKUP" ] && [ "$value" != '/backup' ]; then
@ -49,7 +49,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

6
bin/v-change-sys-hostname
View file

@ -13,8 +13,8 @@
domain=$1
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -46,7 +46,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

8
bin/v-change-sys-ip-name
View file

@ -14,9 +14,9 @@ ip=$1
ip_name=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/func/ip.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/ip.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -38,7 +38,7 @@ update_ip_value '$NAME' "$ip_name"
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

26
bin/v-change-sys-ip-nat
View file

@ -15,9 +15,9 @@ nat_ip=$2
restart=$3
# Includes
source $VESTA/func/main.sh
source $VESTA/func/ip.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/ip.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -35,14 +35,14 @@ is_ip_valid "$ip"
#----------------------------------------------------------#
# Updating IP
if [ -z "$(grep NAT= $VESTA/data/ips/$ip)" ]; then
sed -i "s/^TIME/NAT='$nat_ip'\nTIME/g" $VESTA/data/ips/$ip
if [ -z "$(grep NAT= $devit/data/ips/$ip)" ]; then
sed -i "s/^TIME/NAT='$nat_ip'\nTIME/g" $devit/data/ips/$ip
old=''
new=$nat_ip
else
old=$(get_ip_value '$NAT')
new=$nat_ip
sed -i "s/NAT=.*/NAT='$new'/" $VESTA/data/ips/$ip
sed -i "s/NAT=.*/NAT='$new'/" $devit/data/ips/$ip
if [ -z "$nat_ip" ]; then
new=$ip
fi
@ -50,8 +50,8 @@ fi
# Updating WEB configs
if [ ! -z "$old" ] && [ ! -z "$WEB_SYSTEM" ]; then
sed -i "s/$old/$new/" $VESTA/data/users/*/web.conf
for user in $(ls $VESTA/data/users/); do
sed -i "s/$old/$new/" $devit/data/users/*/web.conf
for user in $(ls $devit/data/users/); do
$BIN/v-rebuild-web-domains $user no
done
$BIN/v-restart-dns $restart
@ -59,9 +59,9 @@ fi
# Updating DNS configs
if [ ! -z "$old" ] && [ ! -z "$DNS_SYSTEM" ]; then
sed -i "s/$old/$new/" $VESTA/data/users/*/dns.conf
sed -i "s/$old/$new/" $VESTA/data/users/*/dns/*.conf
for user in $(ls $VESTA/data/users/); do
sed -i "s/$old/$new/" $devit/data/users/*/dns.conf
sed -i "s/$old/$new/" $devit/data/users/*/dns/*.conf
for user in $(ls $devit/data/users/); do
$BIN/v-rebuild-dns-domains $user no
done
$BIN/v-restart-dns $restart
@ -90,14 +90,14 @@ fi
# Updating firewall
if [ ! -z "$old" ] && [ ! -z "$FIREWALL_SYSTEM" ]; then
sed -i "s/$old/$new/g" $VESTA/data/firewall/*.conf
sed -i "s/$old/$new/g" $devit/data/firewall/*.conf
$BIN/v-update-firewall
fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

14
bin/v-change-sys-ip-owner
View file

@ -14,9 +14,9 @@ ip=$1
user=$2
# Includes
source $VESTA/func/ip.sh
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/ip.sh
source $devit/func/main.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -43,8 +43,8 @@ if [ "$ip_owner" != "$user" ]; then
decrease_user_value "$ip_owner" '$IP_OWNED'
if [ "$ip_owner" = 'admin' ]; then
if [ "$ip_status" = 'shared' ]; then
for vesta_user in $(ls $VESTA/data/users); do
decrease_user_value "$vesta_user" '$IP_AVAIL'
for devit_user in $(ls $devit/data/users); do
decrease_user_value "$devit_user" '$IP_AVAIL'
done
else
decrease_user_value 'admin' '$IP_AVAIL'
@ -57,7 +57,7 @@ if [ "$ip_owner" != "$user" ]; then
increase_user_value "$user" '$IP_OWNED'
if [ "$user" = 'admin' ]; then
if [ "$ip_status" = 'shared' ]; then
for user in $(ls $VESTA/data/users); do
for user in $(ls $devit/data/users); do
increase_user_value "$user" '$IP_AVAIL'
done
else
@ -71,7 +71,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

8
bin/v-change-sys-ip-status
View file

@ -14,9 +14,9 @@ ip=$1
ip_status=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/func/ip.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/ip.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -46,7 +46,7 @@ update_ip_value '$STATUS' "$ip_status"
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

14
bin/v-change-sys-language
View file

@ -13,12 +13,12 @@
language=$1
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
is_language_valid() {
if [ ! -e "$VESTA/web/inc/i18n/$language.php" ]; then
if [ ! -e "$devit/web/inc/i18n/$language.php" ]; then
echo "Error: language file $language doesn't exist"
log_event "$E_NOTEXIST $ARGUMENTS"
exit $E_NOTEXIST
@ -40,15 +40,15 @@ is_language_valid $language
#----------------------------------------------------------#
# Change language
if [ -z "$(grep LANGUAGE $VESTA/conf/vesta.conf)" ]; then
echo "LANGUAGE='$language'" >> $VESTA/conf/vesta.conf
if [ -z "$(grep LANGUAGE $devit/conf/devit.conf)" ]; then
echo "LANGUAGE='$language'" >> $devit/conf/devit.conf
else
sed -i "s/LANGUAGE=.*/LANGUAGE='$language'/g" $VESTA/conf/vesta.conf
sed -i "s/LANGUAGE=.*/LANGUAGE='$language'/g" $devit/conf/devit.conf
fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

6
bin/v-change-sys-service-config
View file

@ -16,8 +16,8 @@ restart=$3
echo "$0 $*" >/tmp/t.log
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -122,7 +122,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

6
bin/v-change-sys-timezone
View file

@ -13,8 +13,8 @@
timezone=$1
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
is_timezone_valid() {
if [ ! -e "/usr/share/zoneinfo/$timezone" ]; then
@ -63,7 +63,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

22
bin/v-change-sys-vesta-ssl
View file

@ -1,8 +1,8 @@
#!/bin/bash
# info: change vesta ssl certificate
# info: change devit ssl certificate
# options: SSL_DIR [RESTART]
#
# The function changes vesta SSL certificate and the key.
# The function changes devit SSL certificate and the key.
#----------------------------------------------------------#
@ -15,9 +15,9 @@ ssl_dir=$1
restart=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -50,21 +50,21 @@ else
fi
# Moving old certificate
mv $VESTA/ssl/certificate.crt $VESTA/ssl/certificate.crt.back
mv $VESTA/ssl/certificate.key $VESTA/ssl/certificate.key.back
mv $devit/ssl/certificate.crt $devit/ssl/certificate.crt.back
mv $devit/ssl/certificate.key $devit/ssl/certificate.key.back
# Adding new certificate
cp -f $ssl_dir/certificate.crt $VESTA/ssl/certificate.crt
cp -f $ssl_dir/certificate.key $VESTA/ssl/certificate.key
cp -f $ssl_dir/certificate.crt $devit/ssl/certificate.crt
cp -f $ssl_dir/certificate.key $devit/ssl/certificate.key
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Restarting web server
if [ "$restart" != 'no' ]; then
kill -HUP $(cat /var/run/vesta-nginx.pid)
kill -HUP $(cat /var/run/devit-nginx.pid)
$BIN/v-restart-mail
if [ ! -z "$IMAP_SYSTEM" ]; then
v-restart-service "$IMAP_SYSTEM"

6
bin/v-change-user-contact
View file

@ -14,8 +14,8 @@ user=$1
email=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -44,7 +44,7 @@ $BIN/v-rebuild-cron-jobs $user > /dev/null 2>&1
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

8
bin/v-change-user-language
View file

@ -14,8 +14,8 @@ user=$1
language=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
is_language_valid() {
@ -24,7 +24,7 @@ is_language_valid() {
log_event "$E_INVALID" "$ARGUMENTS"
exit $E_INVALID
fi
if [ ! -e "$VESTA/web/inc/i18n/$1.php" ]; then
if [ ! -e "$devit/web/inc/i18n/$1.php" ]; then
echo "Error: language $1 doesn't exist"
log_event "$E_NOTEXIST" "$ARGUMENTS"
exit $E_NOTEXIST
@ -56,7 +56,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

6
bin/v-change-user-name
View file

@ -15,8 +15,8 @@ fname=$2
lname=$3
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -43,7 +43,7 @@ update_user_value "$user" '$LNAME' "$lname"
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

6
bin/v-change-user-ns
View file

@ -21,8 +21,8 @@ ns7=$(echo $8 | sed -e 's/\.*$//g' -e 's/^\.*//g')
ns8=$(echo $9 | sed -e 's/\.*$//g' -e 's/^\.*//g')
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -75,7 +75,7 @@ update_user_value "$user" '$NS' "$ns"
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

18
bin/v-change-user-package
View file

@ -15,9 +15,9 @@ package=$2
force=$3
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
is_package_avalable() {
@ -29,7 +29,7 @@ is_package_avalable() {
DISK_QUOTA='0'
BANDWIDTH='0'
pkg_data=$(cat $VESTA/data/packages/$package.pkg| egrep -v "TIME|DATE")
pkg_data=$(cat $devit/data/packages/$package.pkg| egrep -v "TIME|DATE")
IFS=$'\n'
for str in $pkg_data; do
key=$(echo $str |cut -f 1 -d =)
@ -82,7 +82,7 @@ is_package_avalable() {
change_user_package() {
source $USER_DATA/user.conf
pkg_data=$(cat $VESTA/data/packages/$package.pkg| egrep -v "TIME|DATE")
pkg_data=$(cat $devit/data/packages/$package.pkg| egrep -v "TIME|DATE")
IFS=$'\n'
for str in $pkg_data; do
key=$(echo $str |cut -f 1 -d =)
@ -172,19 +172,19 @@ shell=$(grep -w "$shell_conf" /etc/shells |head -n1)
/usr/bin/chsh -s "$shell" "$user" &>/dev/null
# Run template trigger
if [ -x "$VESTA/data/packages/$package.sh" ]; then
$VESTA/data/packages/$package.sh "$user" "$CONTACT" "$FNAME" "$LNAME"
if [ -x "$devit/data/packages/$package.sh" ]; then
$devit/data/packages/$package.sh "$user" "$CONTACT" "$FNAME" "$LNAME"
fi
# Update disk quota
source $VESTA/conf/vesta.conf
source $devit/conf/devit.conf
if [ "$DISK_QUOTA" = 'yes' ]; then
$BIN/v-update-user-quota $user
fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

10
bin/v-change-user-password
View file

@ -18,8 +18,8 @@ password=$2; HIDE=2
source /etc/profile
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -44,13 +44,13 @@ is_password_valid
echo "$user:$password" | /usr/sbin/chpasswd
md5=$(awk -v user=$user -F : 'user == $1 {print $2}' /etc/shadow)
if [ "$user" = 'admin' ] && [ -e "$VESTA/web/reset.admin" ]; then
rm -f $VESTA/web/reset.admin
if [ "$user" = 'admin' ] && [ -e "$devit/web/reset.admin" ]; then
rm -f $devit/web/reset.admin
fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Changing RKEY value

6
bin/v-change-user-shell
View file

@ -14,8 +14,8 @@ user=$1
shell=$2
# Includes
source $VESTA/func/main.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -50,7 +50,7 @@ fi
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Changing user shell

8
bin/v-change-user-template
View file

@ -15,9 +15,9 @@ type=$(echo "$2" | tr '[:lower:]' '[:upper:]')
template=$3
# Includes
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/conf/vesta.conf
source $devit/func/main.sh
source $devit/func/domain.sh
source $devit/conf/devit.conf
#----------------------------------------------------------#
@ -46,7 +46,7 @@ esac
#----------------------------------------------------------#
# Vesta #
# devit #
#----------------------------------------------------------#
# Logging

Some files were not shown because too many files have changed in this diff Show more