Fix cipher_public_key and cipher_private_key not allowed in config file

orgrim · orgrim · commit b7cf5aaf86eb · 2024-05-31T17:16:05.000+02:00
diff --git a/config.go b/config.go
@@ -496,9 +496,9 @@ func validateConfigurationFile(cfg *ini.File) error {
 		"dbname", "exclude_dbs", "include_dbs", "with_templates", "format",
 		"parallel_backup_jobs", "compress_level", "jobs", "pause_timeout",
 		"purge_older_than", "purge_min_keep", "checksum_algorithm", "pre_backup_hook",
-		"post_backup_hook", "encrypt", "cipher_pass", "encrypt_keep_source",
-		"upload", "purge_remote", "s3_region", "s3_bucket", "s3_endpoint", "s3_profile",
-		"s3_key_id", "s3_secret", "s3_force_path", "s3_tls", "sftp_host",
+		"post_backup_hook", "encrypt", "cipher_pass", "cipher_public_key", "cipher_private_key",
+		"encrypt_keep_source", "upload", "purge_remote", "s3_region", "s3_bucket", "s3_endpoint",
+		"s3_profile", "s3_key_id", "s3_secret", "s3_force_path", "s3_tls", "sftp_host",
 		"sftp_port", "sftp_user", "sftp_password", "sftp_directory", "sftp_identity",
 		"sftp_ignore_hostkey", "gcs_bucket", "gcs_endpoint", "gcs_keyfile",
 		"azure_container", "azure_account", "azure_key", "azure_endpoint", "pg_dump_options",
diff --git a/main.go b/main.go
@@ -37,7 +37,7 @@ import (
 	"time"
 )
 
-var version = "2.3.0"
+var version = "2.3.1"
 var binDir string
 
 type dump struct {
diff --git a/pg_back.conf b/pg_back.conf
@@ -67,6 +67,12 @@ encrypt = false
 # environment variable can be used alternatively.
 cipher_pass =
 
+# AGE public key for encryption; in Bech32 encoding starting with 'age1'
+cipher_public_key =
+
+# AGE private key for decryption; in Bech32 encoding starting with 'AGE-SECRET-KEY-1'
+cipher_private_key =
+
 # Keep original files after encrypting them.
 encrypt_keep_source = false
 

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ import (`
`37`	`37`	`"time"`
`38`	`38`	`)`
`39`	`39`
`40`		`-var version = "2.3.0"`
	`40`	`+var version = "2.3.1"`
`41`	`41`	`var binDir string`
`42`	`42`
`43`	`43`	`type dump struct {`