From e34a7480d080f6aef2de8610c9d7b635cd9ee95d Mon Sep 17 00:00:00 2001
From: Chef Projet Prodige <adullact@alkante.com>
Date: Wed, 25 Sep 2019 18:26:58 +0200
Subject: [PATCH] remove imports for editables_parameters.yml
---
install_PRODIGEV4.1.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/install_PRODIGEV4.1.sh b/install_PRODIGEV4.1.sh
index 63caf68..9a2eebf 100644
--- a/install_PRODIGEV4.1.sh
+++ b/install_PRODIGEV4.1.sh
@@ -718,8 +718,8 @@ cp ${SCRIPTDIR}/dist/logo-client.png /home/sites/
sed '
/cas_proxy_chain/ s/telecarto)-)/telecarto)/
/cas_proxy_chain/ s/(www/www/' ${SCRIPTDIR}/dist/editables_parameters.yml > /home/sites/editables_parameters.yml
-sed '/\.DNS/ s/\.\"$/\"/
-s/CAS.PORT.*$/CAS.PORT : 443/' ${SCRIPTDIR}/dist/dns_config_prod.yml > /home/sites/dns_config.yml
+# sed '/\.DNS/ s/\.\"$/\"/
+# s/CAS.PORT.*$/CAS.PORT : 443/' ${SCRIPTDIR}/dist/dns_config_prod.yml > /home/sites/dns_config.yml
cd /home/sites
for conffile in \
editables_parameters.yml \
@@ -743,6 +743,8 @@ s/#PHPCLI_DEFAULT_PWD#/${PHPCLI_DEFAULT_PWD}/g
s/#LDAP_PWD#/$LDAP_PWD/g
s/#PATH_CACERT_PEM#/\/etc\/apache2\/ssl-cert\/CA_intermediate.pem/g" $conffile
done
+sed -i -f ${SCRIPTDIR}/files/vars /home/sites/editables_parameters.yml
+sed -i "s/%MAIN_DNS%/$DNS_SUFFIX/g" /home/sites/editables_parameters.yml
sed -i "s/dns_url_prefix_sep.*$/dns_url_prefix_sep: \"$DNS_PREFIX_SEP\"/" /home/sites/prodigeadmincarto/carmenwsback/app/config/parameters.yml
echo
--
GitLab