Add and order new env vars to support backup on s3-compatible provider

inventory/host_vars/_example.com/secrets.example.yml

@@ -26,23 +26,29 @@ smtp_password:
 # mails_from: from_address@example.com
 # mail_bcc: bcc_me@example.com
 
-# Set these if using Amazon S3 for images or backups
+# Set these if using Amazon S3 for images
 #s3_access_key:
 #s3_secret:
-# Set this if using Amazon S3 for images:
+# Set this if using Amazon S3 for images
 #s3_images_bucket:
-# Set this if using Amazon S3 for backups:
-#s3_backups_bucket:
-# Optional settings for Amazon S3 for images:
+# Optional settings for Amazon S3 for images
 #s3_headers:
 #s3_protocol:
-# Optional settings for Amazon S3 for backups:
-#s3_backups_region:
-# Optional settings for S3-compatible alternative endpoint:
+# Mandatory for S3-compatible alternative, optional for specific AWS S3 case
 #s3_endpoint:
 # Optional settings for specific CORS Policy domain
 #s3_cors_policy_domain:
 
+# Mandatory if using any S3-compatible provider for backups:
+#s3_backups_access_key:
+#s3_backups_secret:
+#s3_backups_bucket:
+# Mandatory for specific AWS S3 case, optional for S3-compatible alternative
+#s3_backups_region:
+# Mandatory for S3-compatible alternative, optional for specific AWS S3 case
+#s3_backups_host:
+#s3_backups_scheme:
+
 # Stripe Connect API keys, set these if you are using Stripe
 # Find these under 'API keys' and 'Connect' in your Stripe account dashboard -> Account Settings
 # Under 'Connect', the Redirect URI should be set to https://YOUR_SERVER_URL/stripe/callbacks (e.g. https://openfoodnetwork.org.uk/stripe/callbacks)

roles/app/templates/env.j2

@@ -37,12 +37,6 @@ S3_ACCESS_KEY="{{ s3_access_key }}"
 {% if s3_secret is defined %}
 S3_SECRET="{{ s3_secret }}"
 {% endif %}
-{% if s3_backups_region is defined %}
-S3_BACKUPS_REGION="{{ s3_backups_region }}"
-{% endif %}
-{% if s3_backups_bucket is defined %}
-S3_BACKUPS_BUCKET="{{ s3_backups_bucket }}"
-{% endif %}
 {% if s3_images_bucket is defined %}
 S3_BUCKET="{{ s3_images_bucket }}"
 {% endif %}
@@ -52,10 +46,28 @@ S3_ENDPOINT="{{ s3_endpoint }}"
 {% if s3_cors_policy_domain is defined %}
 S3_CORS_POLICY_DOMAIN="{{ s3_cors_policy_domain }}"
 {% endif %}
-
 S3_HEADERS="{{ s3_headers }}"
 S3_PROTOCOL="{{ s3_protocol }}"
 
+{% if s3_backups_access_key is defined %}
+S3_BACKUPS_ACCESS_KEY="{{ s3_backups_access_key }}"
+{% endif %}
+{% if s3_backups_secret is defined %}
+S3_BACKUPS_SECRET="{{ s3_backups_secret }}"
+{% endif %}
+{% if s3_backups_host is defined %}
+S3_BACKUPS_HOST="{{ s3_backups_host }}"
+{% endif %}
+{% if s3_backups_bucket is defined %}
+S3_BACKUPS_BUCKET="{{ s3_backups_bucket }}"
+{% endif %}
+{% if s3_backups_scheme is defined %}
+S3_BACKUPS_SCHEME="{{ s3_backups_scheme }}"
+{% endif %}
+{% if s3_backups_region is defined %}
+S3_BACKUPS_REGION="{{ s3_backups_region }}"
+{% endif %}
+
 ATTACHMENT_URL="{{ attachment_url }}"
 ATTACHMENT_PATH="{{ attachment_path }}"