From 41d64fb51339089b3f2ab15b16fc9f7a6e696bf0 Mon Sep 17 00:00:00 2001
From: Michel Memeteau <mm@ekimia.fr>
Date: Wed, 25 Mar 2020 17:10:53 +0100
Subject: [PATCH] sourcing values.env file

---
 install.linux.sh | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/install.linux.sh b/install.linux.sh
index f2ba021..8b5051d 100755
--- a/install.linux.sh
+++ b/install.linux.sh
@@ -2,15 +2,16 @@
 
 #Current version of libre.sh to be installed 
 LIBRE_VERSION=187-repo-mode-to-retrieve-application-recipe
-# System env vars 
+# System env vars  : can be overrided by a values.env file next to this install file
 
-## domain handling 
 
-### TODO : Specify you template repo ROOT without training slash
+### CONFIG : Specify you template repo ROOT without training slash (Optional) or comment if you want to supply full url for apps
 
 APP_REPO_URL="lab.libreho.st/libre.sh/compose"
 
-### TODO : change to your domain vendor ( ovh , online, )
+## domain handling 
+
+### CONFIG : change to your domain vendor ( namecheap, ovh , scaleway, )
 DOMAIN_SERVER=namecheap
 
 ###  Namecheap specific
@@ -18,11 +19,18 @@ NAMECHEAP_URL="namecheap.com"
 NAMECHEAP_API_USER="pierreo"
 NAMECHEAP_API_KEY=
 
-### ovh specific 
+### ovh specific (WIP) 
 OVH_URL="eu.api.ovh.com"
 OVH_API_USER=""
 OVH_API_KEY=
 
+
+### Scaleway specific (WIP) 
+SCALEWAY_URL=""
+SCALEWAY_API_USER=""
+SCALEWAY_API_KEY=
+
+
 ### TODO :  change your settings 
 IP="curl -s http://icanhazip.com/"
 FirstName="Pierre"
@@ -37,7 +45,7 @@ CountryCode="PT"
 ## Backup
 BACKUP_DESTINATION=root@xxxxx:port
 
-### TODO : Change your mail settings.
+### CONFIG  : Change your mail settings.
 ## SMTP
 MAIL_USER=
 MAIL_PASS=
@@ -48,6 +56,10 @@ MAIL_PORT=587
 
 echo "-------- Welcome to libre.sh $LIBRE_VERSION installer"
 
+echo "----  sourcing local values.env file if present"
+
+source values.env
+
 
 # STEP add kernel parameter
 
-- 
GitLab