New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backup filename changed #1289

Merged
merged 6 commits into from Nov 13, 2017

Conversation

Projects
None yet
5 participants
@robindirksen1
Contributor

robindirksen1 commented Oct 3, 2017

Changed the backup filename for running more backup each day - for example every 4 hours

Backup filename changed
Changed the backup filename for running more backup each day - for example every 4 hours
@robindirksen1

This comment has been minimized.

Show comment
Hide comment
@robindirksen1

robindirksen1 Oct 3, 2017

Contributor

Also for the end user it's more clear to see when the backup is created

Contributor

robindirksen1 commented Oct 3, 2017

Also for the end user it's more clear to see when the backup is created

@anton-reutov anton-reutov requested review from anton-reutov and dpeca Oct 3, 2017

@anton-reutov

This comment has been minimized.

Show comment
Hide comment
@anton-reutov

anton-reutov Oct 3, 2017

Collaborator

I will ckeck it tommorow
Thank you

Collaborator

anton-reutov commented Oct 3, 2017

I will ckeck it tommorow
Thank you

@madeITBelgium

This comment has been minimized.

Show comment
Hide comment
@madeITBelgium

madeITBelgium Oct 3, 2017

Collaborator

I think the restore script needs also a change.
https://github.com/serghey-rodin/vesta/blob/master/bin/v-restore-user#L41

Collaborator

madeITBelgium commented Oct 3, 2017

I think the restore script needs also a change.
https://github.com/serghey-rodin/vesta/blob/master/bin/v-restore-user#L41

@robindirksen1

This comment has been minimized.

Show comment
Hide comment
@robindirksen1

robindirksen1 Oct 3, 2017

Contributor

@madeITBelgium I will update it, one moment please!

Contributor

robindirksen1 commented Oct 3, 2017

@madeITBelgium I will update it, one moment please!

@robindirksen1

This comment has been minimized.

Show comment
Hide comment
@robindirksen1

robindirksen1 Oct 4, 2017

Contributor

tested the backup on centos 7 - centos-release-7-3.1611.el7.centos.x86_64

restore in progress...

Contributor

robindirksen1 commented Oct 4, 2017

tested the backup on centos 7 - centos-release-7-3.1611.el7.centos.x86_64

restore in progress...

@Skamasle

This comment has been minimized.

Show comment
Hide comment
@Skamasle

Skamasle Oct 5, 2017

Collaborator

In debian 8 works fine backup rotation, I will test FTP and SFPT options

Collaborator

Skamasle commented Oct 5, 2017

In debian 8 works fine backup rotation, I will test FTP and SFPT options

@anton-reutov

This comment has been minimized.

Show comment
Hide comment
@anton-reutov

anton-reutov Oct 5, 2017

Collaborator

@Skamasle, local mode also working fine ?
What about restore backups?

Collaborator

anton-reutov commented Oct 5, 2017

@Skamasle, local mode also working fine ?
What about restore backups?

@Skamasle

This comment has been minimized.

Show comment
Hide comment
@Skamasle

Skamasle Oct 5, 2017

Collaborator

For now I only test local mode, and rotation working, restore working fine also in test server / debian 8

:/backup# ls -1
admin.2017-10-05_03-28-38.tar
admin.2017-10-05_03-29-02.tar
admin.2017-10-05_16-51-13.tar

v-restore-user detect new backup format fine

# v-restore-user admin admin.2017-10-05_16-53-27.tar

-- WEB --
2017-10-05 16:57:31 vesta1.skamasle.com

I test it in FTP and SFTP in this weekend

Collaborator

Skamasle commented Oct 5, 2017

For now I only test local mode, and rotation working, restore working fine also in test server / debian 8

:/backup# ls -1
admin.2017-10-05_03-28-38.tar
admin.2017-10-05_03-29-02.tar
admin.2017-10-05_16-51-13.tar

v-restore-user detect new backup format fine

# v-restore-user admin admin.2017-10-05_16-53-27.tar

-- WEB --
2017-10-05 16:57:31 vesta1.skamasle.com

I test it in FTP and SFTP in this weekend

@madeITBelgium

This comment has been minimized.

Show comment
Hide comment
@madeITBelgium

madeITBelgium Oct 9, 2017

Collaborator

Restoring an old backup will not work I think.

Collaborator

madeITBelgium commented Oct 9, 2017

Restoring an old backup will not work I think.

@anton-reutov

This comment has been minimized.

Show comment
Hide comment
@anton-reutov

anton-reutov Oct 9, 2017

Collaborator

@madeITBelgium , are you tested it?

Collaborator

anton-reutov commented Oct 9, 2017

@madeITBelgium , are you tested it?

@robindirksen1

This comment has been minimized.

Show comment
Hide comment
@robindirksen1

robindirksen1 Oct 9, 2017

Contributor

@madeITBelgium @anton-reutov I changed the permission check, hope this works with the old backup notation.

@Skamasle can you test this?

Contributor

robindirksen1 commented Oct 9, 2017

@madeITBelgium @anton-reutov I changed the permission check, hope this works with the old backup notation.

@Skamasle can you test this?

@Skamasle

This comment has been minimized.

Show comment
Hide comment
@Skamasle

Skamasle Oct 9, 2017

Collaborator

@madeITBelgium I can confirm this not works, also with your last changes

If the "if" not print noting you get an unexpected error.

1: line 4: syntax error near unexpected token else'
1: line 4: else'

In any way you forget add [[ $2 =~ ^$1.[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9].tar$ ]]

So you do doble check to [[ $2 =~ ^$1.[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]_[0-9][0-9]-[0-9][0-9]-[0-9][0-9].tar$ ]]

Collaborator

Skamasle commented Oct 9, 2017

@madeITBelgium I can confirm this not works, also with your last changes

If the "if" not print noting you get an unexpected error.

1: line 4: syntax error near unexpected token else'
1: line 4: else'

In any way you forget add [[ $2 =~ ^$1.[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9].tar$ ]]

So you do doble check to [[ $2 =~ ^$1.[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]_[0-9][0-9]-[0-9][0-9]-[0-9][0-9].tar$ ]]

@robindirksen1

This comment has been minimized.

Show comment
Hide comment
@robindirksen1

robindirksen1 Oct 9, 2017

Contributor

So the way it's now should work, right?

Contributor

robindirksen1 commented Oct 9, 2017

So the way it's now should work, right?

Show outdated Hide outdated bin/v-restore-user Outdated
@Skamasle

This comment has been minimized.

Show comment
Hide comment
@Skamasle

Skamasle Oct 9, 2017

Collaborator

Now working fine, but i think this code need to be improved

if [ $passed = false ]; then echo "not permissions"; #check_result $E_FORBIDEN "permission denied" fi
This generate dual errors, when backup not exists, you get a permisions denied

v-restore-user admin admin.2017-10-09-0.tar
not permissions
Error: backup admin.2017-10-09-0.tar doesn't exist

EDITED, BAD CODE DELETED FROM THIS COMMENT

Collaborator

Skamasle commented Oct 9, 2017

Now working fine, but i think this code need to be improved

if [ $passed = false ]; then echo "not permissions"; #check_result $E_FORBIDEN "permission denied" fi
This generate dual errors, when backup not exists, you get a permisions denied

v-restore-user admin admin.2017-10-09-0.tar
not permissions
Error: backup admin.2017-10-09-0.tar doesn't exist

EDITED, BAD CODE DELETED FROM THIS COMMENT

Show outdated Hide outdated bin/v-restore-user Outdated
@robindirksen1

This comment has been minimized.

Show comment
Hide comment
@robindirksen1

robindirksen1 Oct 13, 2017

Contributor

So @madeITBelgium this is correct?

Contributor

robindirksen1 commented Oct 13, 2017

So @madeITBelgium this is correct?

@anton-reutov

This comment has been minimized.

Show comment
Hide comment
@anton-reutov

anton-reutov Oct 13, 2017

Collaborator

i'm checking now and everything works fine so far

Collaborator

anton-reutov commented Oct 13, 2017

i'm checking now and everything works fine so far

@anton-reutov anton-reutov merged commit f836822 into serghey-rodin:master Nov 13, 2017

@dpeca

This comment has been minimized.

Show comment
Hide comment
@dpeca

dpeca Nov 13, 2017

Collaborator

I will put this on production machine, in next few days we will know if it needs corrections.

Collaborator

dpeca commented Nov 13, 2017

I will put this on production machine, in next few days we will know if it needs corrections.

@dpeca

This comment has been minimized.

Show comment
Hide comment
@dpeca

dpeca Dec 8, 2017

Collaborator

Works fine with FTPS remote backup too.

Collaborator

dpeca commented Dec 8, 2017

Works fine with FTPS remote backup too.

cdnmall added a commit to cdnmall/vesta that referenced this pull request Dec 27, 2017

a (#2)
* Fixed correct dutch sentences

* serghey-rodin#1311

* ur.php

translation of vesta eng file to urdu language.

* pt-Br translation corrections

Corrected words:
Email => E-mail (https://www.dicio.com.br/e-mail/)
Dominio => Domínio
Extenções  => Extensões
Mes => Mês

+ Added translation for "Email Credentials".

* Added Odoo web template, see Odoo's deployment at https://www.odoo.com/documentation/10.0/setup/deploy.html

* ur.ph update

added 'Email Credentials' => 'ای میل کی سند',

* Update v-extract-fs-archive

* Update ur.php

* Create v-update-host-certificate

Add a file that's setting the hostname certificate for exim, dovecot & vesta-web so the email is always with a valid LE certificate.

# Todo:
- add to cronjobs (default every month) of adds to lets encrypt renewall/request when updating system hostname certificate

* Securing v-update-host-certificate and few small fixes

* v-update-host-certificate fix: restarting vesta instead of web-backend

* Permissions for web files

* Backup filename changed (serghey-rodin#1289)

* Backup filename changed

Changed the backup filename for running more backup each day - for example every 4 hours

* Restore user fix with new backup date

* Check if the backup name has an old notation

* Fix backup permission check

* fixed regex

* fix

* Better permissions for web files

* Fix in v-update-host-certificate: added restart for dovecot

* Update nginx.conf

Added 
timer_resolution         50ms; 
In order to free some CPU cycles

Updated Cloudflare's IP addresses

* blank space indent fix

* New template for OpenCart CMS

* New template for OpenCart CMS

* New template for OpenCart CMS

* New template for OpenCart CMS

* New template for OpenCart CMS

* New template for OpenCart CMS

* New template for OpenCart CMS

* New template for OpenCart CMS

* New template for OpenCart CMS

* New template for OpenCart CMS

* New template for OpenCart CMS

* New template for OpenCart CMS

* New template for OpenCart CMS

* New template for OpenCart CMS

* New template for OpenCart CMS

* New template for OpenCart CMS

* New template for OpenCart CMS

* New template for OpenCart CMS

* New template for OpenCart CMS

* New template for OpenCart CMS

* New template for OpenCart CMS

* New template for OpenCart CMS

* New template for OpenCart CMS

* New template for OpenCart CMS

* New template for OpenCart CMS

* New template for OpenCart CMS

* New template for OpenCart CMS

* New template for OpenCart CMS

* New template for OpenCart CMS

* New template for OpenCart CMS

* security fix / thanks to Christopher Tarquini

* Latest CF IPs update

Latest CF IPs update

* CloudFlare IPs update

* Latest CF IPs update

* Latest CF IPs update

* CF IPs update

* CF IPs update

* CF IPs update

* CF IPs update

* CF IPs Update

* CF IPs update

* CF IPs update

* CF IPs update

* CF IPs update

* fixed checkbox issue

checkbox to an array allowing it to pass all three Vesta packages instead of just one.

* LetsEncrypt support for IDN domains

* Fix for leading dot domains

* Fix for LE domain restore

* changing web server includes back to %domain% for better readability

* Probably good idea to not to rebuild web domains if Apache is frontend web server

* New style for web configs / separate conf per domain

* v-list-mail-account-autoreply: JSON export function fix for quotes and backslash

* /web/edit/mail/index.php: fix for new lines in autoreply

Because JSON is properly escaped now, see serghey-rodin@a8d857f

* fix for new domain deletetion

* improved ioncube package specs

* PROXY_YSTEM => PROXY_SYSTEM

* fixed typo: PROXY_YSTEM instead of PROXY_SYSTEM

* Softaculous spec for RPM based systems

* Improved softaculous.spec

* Deb package for softaculous

* Apps panel

* enable/disable softaculous plugin

* removed post install routine for softaculous

* changed default action name from install to add

* added dependency for ioncube package

* Softaculous enable/disable scripts

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* fix for multiple init scripts

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* Minor fix for location vstats

* added trailing ;

* removed double ;
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment