Perfezionata installazione jenkins

link-it · Sep 15, 2019 · 0b6f77f · 0b6f77f
1 parent cfa7819
commit 0b6f77f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/main/resources/scripts/abilitaAuth.sh b/src/main/resources/scripts/abilitaAuth.sh
@@ -16,7 +16,7 @@ PENDENZE=basic,ssl
 RAGIONERIA=basic,ssl
 PAGOPA=ssl
 GOVPAY_SRC_DIR="ear/target/"
-GOVPAY_VERSION=x
+GOVPAY_VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
 POSITIONAL=()
 while [[ $# -gt 0 ]]
 do
@@ -98,8 +98,6 @@ RAGIONERIA_SSL=true
 
 [[ $PAGOPA == *"basic"* ]] && PAGOPA_BASIC=true || PAGOPA_BASIC=false
 
-[[ $GOVPAY_VERSION == "x" ]] && GOVPAY_VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
-
 GOVPAY_WORK_DIR="govpay_ear_tmp"
 GOVPAY_EAR_NAME="govpay.ear"
 GOVPAY_TMP_DIR="GOVPAY_EAR"

diff --git a/src/main/resources/scripts/jenkins.install.sh b/src/main/resources/scripts/jenkins.install.sh
@@ -54,10 +54,10 @@ psql govpay govpay < dist/sql/gov_pay.sql
 ## SETUP API SECURITY SETTINGS
 #####
 
-echo "Abilitazione delle modalita di autenticazione header e basic..."
+echo "Abilitazione delle modalita di autenticazione..."
 
 sh ../../../scripts/abilitaAuth.sh -v ${GOVPAY_VERSION} -bo spid,header,ssl,basic -pag public,spid,header,ssl,basic -rag spid,header,ssl,basic -pen spid,header,ssl,basic -pp basic -src dist/archivi/
 
 echo "Deploy govpay in wildfly...";
-sudo cp govpay_ear_tmp/govpay.ear /opt/wildfly-11.0.0.Final/standalone_govpay/deployments/
+sudo cp dist/archivi/govpay.ear /opt/wildfly-11.0.0.Final/standalone_govpay/deployments/
 rm -rf govpay_ear_tmp