From e35ed6c67399115d58aab8fc6307823221386e36 Mon Sep 17 00:00:00 2001
From: 3wc <3wc.git@doesthisthing.work>
Date: Wed, 30 Dec 2020 13:19:33 +0200
Subject: [PATCH] =?UTF-8?q?Switch=20from=20envrc=20=E2=86=92=20env=20forma?=
 =?UTF-8?q?t?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ref coop-cloud/abra#40
---
 .env.sample   | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 .envrc.sample | 50 --------------------------------------------------
 2 files changed, 50 insertions(+), 50 deletions(-)
 create mode 100644 .env.sample
 delete mode 100644 .envrc.sample

diff --git a/.env.sample b/.env.sample
new file mode 100644
index 0000000..7b43173
--- /dev/null
+++ b/.env.sample
@@ -0,0 +1,50 @@
+
+DOMAIN=wiki.example.com
+## Domain aliases
+#EXTRA_DOMAINS=', `www.wiki.example.com`'
+LETS_ENCRYPT_ENV=production
+
+MEDIAWIKI_SITENAME="Example Wiki"
+MEDIAWIKI_SITENAMESPACE="Example_Wiki"
+MEDIAWIKI_EMAIL_CONTACT="info@wiki.example.com"
+MEDIAWIKI_EMAIL_FROM="wiki@wiki.example.com"
+MEDIAWIKI_LOGO_FILE='$wgResourceBasePath/resources/assets/wiki.png'
+
+## SMTP
+#SMTP_HOST=postfix_relay_app
+#SMTP_HOST=mailu_front
+
+SECRET_DB_ROOT_PASSWORD_VERSION=v1
+SECRET_DB_PASSWORD_VERSION=v1
+SECRET_MEDIAWIKI_SECRET_KEY_VERSION=v1 # length=64
+
+LOCAL_SETTINGS_CONF_VERSION=v1
+HTACCESS_CONF_VERSION=v1
+ENTRYPOINT_CONF_VERSION=v1
+COMPOSER_LOCAL_CONF_VERSION=v1
+PHP_INI_VERSION=v1
+
+# SAML
+
+#COMPOSE_FILE="compose.yml:compose.simplesaml.yml"
+
+#SAML_ENABLED=1
+#SAML_CONTACT_NAME="Sam Ell"
+#SAML_CONTACT_EMAIL="saml@example.com"
+
+#SAML_EMAIL_ATTRIBUTE=mail
+#SAML_REAL_NAME_ATTRIBUTE=realname
+#SAML_AUTH_SOURCE_ID=default-sp
+#SAML_USERNAME_ATTRIBUTE=user
+
+#SECRET_SAML_ADMIN_PASSWORD_VERSION=v1
+#SECRET_SAML_SECRET_SALT_VERSION=v1 # length=64
+
+#SAML_ENTRYPOINT_CONF_VERSION=v1
+
+## OpenID Connect
+# OPENID_ENABLED=1
+# COMPOSE_FILE="compose.yml:compose.openid.yml"
+# OPENID_KEYCLOAK_URL="https://keycloak.local:8080/auth/realms/acme/"
+# OPENID_CLIENT_ID="mediawiki"
+# SECRET_OPENID_CLIENT_SECRET_VERSION=v1
diff --git a/.envrc.sample b/.envrc.sample
deleted file mode 100644
index 1dc78f7..0000000
--- a/.envrc.sample
+++ /dev/null
@@ -1,50 +0,0 @@
-
-export DOMAIN=wiki.example.com
-## Domain aliases
-#export EXTRA_DOMAINS=', `www.wiki.example.com`'
-export LETS_ENCRYPT_ENV=production
-
-export MEDIAWIKI_SITENAME="Example Wiki"
-export MEDIAWIKI_SITENAMESPACE="Example_Wiki"
-export MEDIAWIKI_EMAIL_CONTACT="info@wiki.example.com"
-export MEDIAWIKI_EMAIL_FROM="wiki@wiki.example.com"
-export MEDIAWIKI_LOGO_FILE='$wgResourceBasePath/resources/assets/wiki.png'
-
-## SMTP
-#export SMTP_HOST=postfix_relay_app
-#export SMTP_HOST=mailu_front
-
-export SECRET_DB_ROOT_PASSWORD_VERSION=v1
-export SECRET_DB_PASSWORD_VERSION=v1
-export SECRET_MEDIAWIKI_SECRET_KEY_VERSION=v1 # length=64
-
-export LOCAL_SETTINGS_CONF_VERSION=v1
-export HTACCESS_CONF_VERSION=v1
-export ENTRYPOINT_CONF_VERSION=v1
-export COMPOSER_LOCAL_CONF_VERSION=v1
-export PHP_INI_VERSION=v1
-
-# SAML
-
-#export COMPOSE_FILE="compose.yml:compose.simplesaml.yml"
-
-#export SAML_ENABLED=1
-#export SAML_CONTACT_NAME="Sam Ell"
-#export SAML_CONTACT_EMAIL="saml@example.com"
-
-#export SAML_EMAIL_ATTRIBUTE=mail
-#export SAML_REAL_NAME_ATTRIBUTE=realname
-#export SAML_AUTH_SOURCE_ID=default-sp
-#export SAML_USERNAME_ATTRIBUTE=user
-
-#export SECRET_SAML_ADMIN_PASSWORD_VERSION=v1
-#export SECRET_SAML_SECRET_SALT_VERSION=v1 # length=64
-
-#export SAML_ENTRYPOINT_CONF_VERSION=v1
-
-## OpenID Connect
-# export OPENID_ENABLED=1
-# export COMPOSE_FILE="compose.yml:compose.openid.yml"
-# export OPENID_KEYCLOAK_URL="https://keycloak.local:8080/auth/realms/acme/"
-# export OPENID_CLIENT_ID="mediawiki"
-# export SECRET_OPENID_CLIENT_SECRET_VERSION=v1