Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[ADD] saas_server_backup_ftp field port for ssh #849

Open
wants to merge 1 commit into
base: 12.0
Choose a base branch
from
Open

[ADD] saas_server_backup_ftp field port for ssh #849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions saas_server_backup_ftp/models/res_config.py
View file
Open in desktop
Expand Up @@ -24,6 +24,10 @@ class SaasPortalConfigWizard(models.TransientModel):
string='Username on SFTP Server',
help='''The username where the SFTP connection should be made with.
This is the user on the external server.''')
sftp_port = fields.Integer(
string='Port on SFTP Server', default="22",
help='''The port where the SFTP connection should be made with.
This is the port on the external server.''')
sftp_password = fields.Char(
string='Password User SFTP Server',
help='''The password from the user where the SFTP connection should be
Expand Down Expand Up @@ -51,6 +55,7 @@ def set_values(self):
ICPSudo = self.env['ir.config_parameter'].sudo()
ICPSudo.set_param("saas_server.sftp_server", self.sftp_server)
ICPSudo.set_param("saas_server.sftp_username", self.sftp_username)
ICPSudo.set_param("saas_server.sftp_port", self.sftp_port)
ICPSudo.set_param("saas_server.sftp_password", self.sftp_password)
ICPSudo.set_param("saas_server.sftp_path", self.sftp_path)
ICPSudo.set_param("saas_server.rsa_key_path", self.rsa_key_path)
Expand All @@ -64,6 +69,7 @@ def get_values(self):
res.update(
sftp_server=ICPSudo.get_param('saas_server.sftp_server'),
sftp_username=ICPSudo.get_param('saas_server.sftp_username'),
sftp_port=int(ICPSudo.get_param('saas_server.sftp_port')),
sftp_password=ICPSudo.get_param('saas_server.sftp_password'),
sftp_path=ICPSudo.get_param('saas_server.sftp_path'),
rsa_key_path=ICPSudo.get_param('saas_server.rsa_key_path'),
Expand All @@ -76,6 +82,7 @@ def test_sftp_connection(self):
params = {
"host": self.sftp_server,
"username": self.sftp_username,
"port": int(self.sftp_port),
}

try:
Expand Down
2 changes: 2 additions & 0 deletions saas_server_backup_ftp/models/saas_server.py
View file
Open in desktop
Expand Up @@ -22,6 +22,7 @@ def _transport_backup(self, dump_db, filename=None):
server = ICPSudo.get_param('saas_server.sftp_server', None)
username = ICPSudo.get_param('saas_server.sftp_username', None)
password = ICPSudo.get_param('saas_server.sftp_password', None)
port = int(ICPSudo.get_param('saas_server.sftp_port', 22))
path = ICPSudo.get_param('saas_server.sftp_path', None)
rsa_key_path = ICPSudo.get_param('saas_server.rsa_key_path', None)
rsa_key_passphrase=ICPSudo.get_param('saas_server.rsa_key_passphrase')
Expand All @@ -30,6 +31,7 @@ def _transport_backup(self, dump_db, filename=None):
params = {
"host": server,
"username": username,
"port": port,
}
if rsa_key_path:
params["private_key"] = self.rsa_key_path
Expand Down
7 changes: 7 additions & 0 deletions saas_server_backup_ftp/views/res_config.xml
View file
Open in desktop
Expand Up @@ -23,6 +23,13 @@
<field name="sftp_username" placeholder="username"/>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box">
<div>
<label for="sftp_port"/>
<div class="text-muted">The port where the SFTP connection should be made with. This is the port on the external server.</div>
<field name="sftp_port" placeholder="22"/>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box">
<div>
<label for="sftp_password"/>
Expand Down