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

Update / Clean up EFT SFTP config #1683

Merged
merged 2 commits into from
Aug 14, 2024
Merged

Update / Clean up EFT SFTP config #1683

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1021371
Update / Clean up EFT SFTP config
ochiu Aug 14, 2024
583634b
Fix EFT key location
ochiu Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions jobs/ftp-poller/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,17 @@ class _Config(object): # pylint: disable=too-few-public-methods
CGI_SFTP_DIRECTORY = os.getenv('CGI_SFTP_DIRECTORY', '/data')

# EFT FTP CONFIG
BCREG_EFT_FTP_PRIVATE_KEY_LOCATION = os.getenv('BCREG_EFT_FTP_PRIVATE_KEY_LOCATION',
'/ftp-poller/key/eft_sftp_priv_key')
EFT_SFTP_HOST = os.getenv('EFT_SFTP_HOST', 'localhost')
EFT_SFTP_USER_NAME = os.getenv('EFT_SFTP_USER_NAME', 'foo')
EFT_SFTP_PASSWORD = os.getenv('EFT_SFTP_PASSWORD', '')
EFT_SFTP_DIRECTORY = os.getenv('EFT_SFTP_DIRECTORY', '/eft')
EFT_SFTP_BACKUP_DIRECTORY = os.getenv('EFT_SFTP_BACKUP_DIRECTORY', '/backup')
EFT_SFTP_DIRECTORY = os.getenv('EFT_SFTP_DIRECTORY', '/outgoing')
EFT_SFTP_BACKUP_DIRECTORY = os.getenv('EFT_SFTP_BACKUP_DIRECTORY', '/outgoing-backup')
EFT_SFTP_VERIFY_HOST = os.getenv('EFT_SFTP_VERIFY_HOST', 'True')
EFT_SFTP_PORT = os.getenv('EFT_SFTP_PORT', 22)
EFT_SFTP_HOST_KEY = os.getenv('EFT_SFTP_HOST_KEY', '')
BCREG_EFT_FTP_PRIVATE_KEY_PASSPHRASE = os.getenv('BCREG_EFT_FTP_PRIVATE_KEY_PASSPHRASE', '')

# CGI File specific configs
CGI_TRIGGER_FILE_SUFFIX = os.getenv('CGI_TRIGGER_FILE_SUFFIX', '.TRG')
Expand Down Expand Up @@ -111,16 +114,15 @@ class _Config(object): # pylint: disable=too-few-public-methods
'FTP_PRIVATE_KEY_LOCATION': BCREG_CGI_FTP_PRIVATE_KEY_LOCATION, # different user.so not same as CAS
'BCREG_FTP_PRIVATE_KEY_PASSPHRASE': BCREG_CGI_FTP_PRIVATE_KEY_PASSPHRASE
},
# FUTURE - specific configuration values TBD - initial set up code
'EFT': {
'SFTP_HOST': EFT_SFTP_HOST,
'SFTP_USERNAME': EFT_SFTP_USER_NAME,
'SFTP_PASSWORD': EFT_SFTP_PASSWORD,
'SFTP_VERIFY_HOST': EFT_SFTP_VERIFY_HOST,
'SFTP_HOST_KEY': EFT_SFTP_HOST_KEY,
'SFTP_PORT': EFT_SFTP_PORT,
'FTP_PRIVATE_KEY_LOCATION': BCREG_FTP_PRIVATE_KEY_LOCATION,
'BCREG_FTP_PRIVATE_KEY_PASSPHRASE': BCREG_FTP_PRIVATE_KEY_PASSPHRASE
'FTP_PRIVATE_KEY_LOCATION': BCREG_EFT_FTP_PRIVATE_KEY_LOCATION,
'BCREG_FTP_PRIVATE_KEY_PASSPHRASE': BCREG_EFT_FTP_PRIVATE_KEY_PASSPHRASE
}
}

Expand Down
Loading