diff --git a/pkg/backup.go b/pkg/backup.go index 32d1c26..9bbd9e5 100644 --- a/pkg/backup.go +++ b/pkg/backup.go @@ -162,7 +162,7 @@ func localBackup(db *dbConfig, config *BackupConfig) { BackupDatabase(db, config.backupFileName, disableCompression) finalFileName := config.backupFileName if config.encryption { - encryptBackup(config.backupFileName) + encryptBackup(config.backupFileName, config.passphrase) finalFileName = fmt.Sprintf("%s.%s", config.backupFileName, gpgExtension) } utils.Info("Backup name is %s", finalFileName) @@ -185,7 +185,7 @@ func s3Backup(db *dbConfig, config *BackupConfig) { BackupDatabase(db, config.backupFileName, disableCompression) finalFileName := config.backupFileName if config.encryption { - encryptBackup(config.backupFileName) + encryptBackup(config.backupFileName, config.passphrase) finalFileName = fmt.Sprintf("%s.%s", config.backupFileName, "gpg") } utils.Info("Uploading backup archive to remote storage S3 ... ") @@ -223,7 +223,7 @@ func sshBackup(db *dbConfig, config *BackupConfig) { BackupDatabase(db, config.backupFileName, disableCompression) finalFileName := config.backupFileName if config.encryption { - encryptBackup(config.backupFileName) + encryptBackup(config.backupFileName, config.passphrase) finalFileName = fmt.Sprintf("%s.%s", config.backupFileName, "gpg") } utils.Info("Uploading backup archive to remote storage ... ") @@ -254,9 +254,8 @@ func sshBackup(db *dbConfig, config *BackupConfig) { } // encryptBackup encrypt backup -func encryptBackup(backupFileName string) { - gpgPassphrase := os.Getenv("GPG_PASSPHRASE") - err := Encrypt(filepath.Join(tmpPath, backupFileName), gpgPassphrase) +func encryptBackup(backupFileName, passphrase string) { + err := Encrypt(filepath.Join(tmpPath, backupFileName), passphrase) if err != nil { utils.Fatal("Error during encrypting backup %s", err) } diff --git a/pkg/config.go b/pkg/config.go index 6c1f6b2..715b955 100644 --- a/pkg/config.go +++ b/pkg/config.go @@ -37,7 +37,7 @@ type BackupConfig struct { prune bool encryption bool remotePath string - gpqPassphrase string + passphrase string storage string cronExpression string } @@ -79,11 +79,11 @@ func initBackupConfig(cmd *cobra.Command) *BackupConfig { prune, _ := cmd.Flags().GetBool("prune") disableCompression, _ = cmd.Flags().GetBool("disable-compression") _, _ = cmd.Flags().GetString("mode") - gpqPassphrase := os.Getenv("GPG_PASSPHRASE") + passphrase := os.Getenv("GPG_PASSPHRASE") _ = utils.GetEnv(cmd, "path", "AWS_S3_PATH") cronExpression := os.Getenv("BACKUP_CRON_EXPRESSION") - if gpqPassphrase != "" { + if passphrase != "" { encryption = true } //Initialize backup configs @@ -94,7 +94,7 @@ func initBackupConfig(cmd *cobra.Command) *BackupConfig { config.storage = storage config.encryption = encryption config.remotePath = remotePath - config.gpqPassphrase = gpqPassphrase + config.passphrase = passphrase config.cronExpression = cronExpression return &config }