From 38c4fe0246827056c54b437719a9e36838700f98 Mon Sep 17 00:00:00 2001
From: 3wc <3wc.git@doesthisthing.work>
Date: Mon, 8 Feb 2021 16:02:53 +0200
Subject: [PATCH] Move config to abra.sh

Ref coop-cloud/abra#43
---
 .env.sample                 | 5 -----
 abra-commands.sh => abra.sh | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename abra-commands.sh => abra.sh (92%)

diff --git a/.env.sample b/.env.sample
index 4a60fd5..71ddaff 100644
--- a/.env.sample
+++ b/.env.sample
@@ -10,8 +10,6 @@ LETS_ENCRYPT_ENV=production
 
 SECRET_DB_ROOT_PASSWORD_VERSION=v1
 SECRET_DB_PASSWORD_VERSION=v1
-PHP_UPLOADS_CONF_VERSION=v1
-ENTRYPOINT_CONF_VERSION=v1
 
 # Multisite
 #WORDPRESS_CONFIG_EXTRA="\
@@ -38,6 +36,3 @@ ENTRYPOINT_CONF_VERSION=v1
 #COMPOSE_FILE="compose.yml:compose.mailrelay.yml"
 #SMTP_HOST="postfix_relay_app"
 #MAIL_FROM="wordpress@example.com"
-#
-#MSMTP_CONF_VERSION=v1
-#ENTRYPOINT_MAILRELAY_CONF_VERSION=v1
diff --git a/abra-commands.sh b/abra.sh
similarity index 92%
rename from abra-commands.sh
rename to abra.sh
index d0c3d01..98c57e2 100644
--- a/abra-commands.sh
+++ b/abra.sh
@@ -1,3 +1,8 @@
+export PHP_UPLOADS_CONF_VERSION=v3
+export ENTRYPOINT_CONF_VERSION=v2
+export ENTRYPOINT_MAILRELAY_CONF_VERSION=v1
+export MSMTP_CONF_VERSION=v1
+
 sub_wp() {
   load_instance
   load_instance_env