From b275794ca694d861d77c4a1710374ed695a17a04 Mon Sep 17 00:00:00 2001 From: Michel Memeteau Date: Sun, 22 Mar 2020 17:56:16 +0100 Subject: [PATCH] Update utils/provision, install.linux.sh files --- install.linux.sh | 4 ++-- utils/provision | 12 +++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/install.linux.sh b/install.linux.sh index 24cce8a..21fb324 100755 --- a/install.linux.sh +++ b/install.linux.sh @@ -6,9 +6,9 @@ LIBRE_VERSION=1.1 ## domain handling -### TODO : Specify you template repo ROOT +### TODO : Specify you template repo ROOT without training slash -TEMPLATES_ROOT=lab.libreho.st/libre.sh/compose/ +APP_REPO_URL=lab.libreho.st/libre.sh/compose ### TODO : change to your domain vendor ( ovh , online, ) DOMAIN_SERVER=namecheap diff --git a/utils/provision b/utils/provision index eb9d772..deee495 100755 --- a/utils/provision +++ b/utils/provision @@ -103,7 +103,17 @@ function buy_domain_name () { } function application () { - git clone https://${arg_a}.git /data/domains/${arg_u} + #We check if a APP_REPO_URL was specified + + if[ -z ${APP_REPO_URL:-} ]; then + warning "NO repo URL specified, using argument as full URL" + git_url=https://${arg_a}.git + else + warning "REPO specified, using argument as app name" + git_url=https://${APP_REPO_URL}/${arg_a}.git + fi + + git clone ${git_url} /data/domains/${arg_u} cd /data/domains/${arg_u} if [ -f ./scripts/install ]; then export URL=${arg_u} -- GitLab