Skip to content

Commit f8be208

Browse files
author
Serghey Rodin
committed
Merge branch 'master' of github.com:serghey-rodin/vesta
2 parents 4053f9a + 22d0fa1 commit f8be208

File tree

790 files changed

+808
-805
lines changed

Some content is hidden

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

790 files changed

+808
-805
lines changed

‎bin/v-backup-user‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,6 @@ local_backup(){
508508
backups_count=$(echo "$backup_list" |wc -l)
509509
if [ "$BACKUPS" -le "$backups_count" ]; then
510510
backups_rm_number=$((backups_count - BACKUPS))
511-
(( ++backups_rm_number))
512511

513512
# Removing old backup
514513
for backup in $(echo "$backup_list" |head -n $backups_rm_number); do
@@ -624,7 +623,7 @@ ftp_backup() {
624623
fi
625624
backups_count=$(echo "$backup_list" |wc -l)
626625
if [ "$backups_count" -ge "$BACKUPS" ]; then
627-
backups_rm_number=$((backups_count - BACKUPS + 1))
626+
backups_rm_number=$((backups_count - BACKUPS))
628627
for backup in $(echo "$backup_list" |head -n $backups_rm_number); do
629628
backup_date=$(echo $backup |sed -e "s/$user.//" -e "s/.tar$//")
630629
echo -e "$(date "+%F %T") Rotated ftp backup: $backup_date" |\
@@ -779,7 +778,7 @@ sftp_backup() {
779778
fi
780779
backups_count=$(echo "$backup_list" |wc -l)
781780
if [ "$backups_count" -ge "$BACKUPS" ]; then
782-
backups_rm_number=$((backups_count - BACKUPS + 1))
781+
backups_rm_number=$((backups_count - BACKUPS))
783782
for backup in $(echo "$backup_list" |head -n $backups_rm_number); do
784783
backup_date=$(echo $backup |sed -e "s/$user.//" -e "s/.tar.*$//")
785784
echo -e "$(date "+%F %T") Rotated sftp backup: $backup_date" |\
@@ -828,7 +827,7 @@ google_backup() {
828827
backup_list=$(${gsutil} ls gs://$BUCKET/$BPATH/$user.* 2>/dev/null)
829828
backups_count=$(echo "$backup_list" |wc -l)
830829
if [ "$backups_count" -ge "$BACKUPS" ]; then
831-
backups_rm_number=$((backups_count - BACKUPS + 1))
830+
backups_rm_number=$((backups_count - BACKUPS))
832831
for backup in $(echo "$backup_list" |head -n $backups_rm_number); do
833832
echo -e "$(date "+%F %T") Roated gcp backup: $backup"
834833
$gsutil rm $backup > /dev/null 2>&1

‎install/debian/7/templates/web/apache2/basedir.stpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
AssignUserID %user% %group%
3939
</IfModule>
4040

41-
Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
41+
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
4242

4343
</VirtualHost>
4444

‎install/debian/7/templates/web/apache2/basedir.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
AssignUserID %user% %group%
3333
</IfModule>
3434

35-
Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
35+
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
3636

3737
</VirtualHost>
3838

‎install/debian/7/templates/web/apache2/default.stpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
AssignUserID %user% %group%
3838
</IfModule>
3939

40-
Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
40+
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
4141

4242
</VirtualHost>
4343

‎install/debian/7/templates/web/apache2/default.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
AssignUserID %user% %group%
3232
</IfModule>
3333

34-
Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
34+
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
3535

3636
</VirtualHost>
3737

‎install/debian/7/templates/web/apache2/hosting.stpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
AssignUserID %user% %group%
4444
</IfModule>
4545

46-
Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
46+
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
4747

4848
</VirtualHost>
4949

‎install/debian/7/templates/web/apache2/hosting.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
AssignUserID %user% %group%
3939
</IfModule>
4040

41-
Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
41+
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
4242

4343
</VirtualHost>
4444

‎install/debian/7/templates/web/apache2/phpcgi.stpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
SSLCertificateKeyFile %ssl_key%
3333
%ssl_ca_str%SSLCertificateChainFile %ssl_ca%
3434

35-
Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
35+
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
3636

3737
</VirtualHost>
3838

‎install/debian/7/templates/web/apache2/phpcgi.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<Directory %home%/%user%/web/%domain%/stats>
2626
AllowOverride All
2727
</Directory>
28-
Include %home%/%user%/conf/web/%web_system%.%domain_idn%.conf*
28+
Include %home%/%user%/conf/web/%web_system%.%domain%.conf*
2929

3030
</VirtualHost>
3131

‎install/debian/7/templates/web/apache2/phpfcgid.stpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
SSLCertificateKeyFile %ssl_key%
3434
%ssl_ca_str%SSLCertificateChainFile %ssl_ca%
3535

36-
Include %home%/%user%/conf/web/s%web_system%.%domain_idn%.conf*
36+
Include %home%/%user%/conf/web/s%web_system%.%domain%.conf*
3737

3838
</VirtualHost>
3939

0 commit comments

Comments
 (0)