Merge branch '8-jar-file-should-include-version-number-in-its-name' into 'master'

Resolve "Jar file should include version number in its name"

Closes #8

See merge request directmairie/puppet-directmairie!8

manifests/init.pp

@@ -69,17 +69,17 @@ class directmairie (
   $_directmairie_jar_url = join(
     [
       "https://${_directmairie_gitlab_full_url}",
-      "/-/jobs/artifacts/${refspec}/raw/backend/build/libs/amies.jar", # TODO rename once renamed in upstream
+      "/-/jobs/artifacts/${refspec}/raw/backend/build/libs/amies.jar", # TODO change name once renamed in upstream
       "?job=${ci_job_name}",
     ]
   )
   # Filename of DirectMairie jar file (build artefact)
-  $_jar_name = 'directmairie.jar'
+  $jar_name = "directmairie-${refspec}.jar"
 
   # Postgres role for DirectMairie
   $_directmairie_db_role = 'directmairie'
   # JDBC URL string
-  $_directmairie_jdbc_url = "jdbc:postgresql://${db_host}:${db_port}/${db_name}"
+  $directmairie_jdbc_url = "jdbc:postgresql://${db_host}:${db_port}/${db_name}"
 
   # #############################################################################
   # PREREQUISITES packages
@@ -147,7 +147,7 @@ class directmairie (
   # Get DirectMairie jar file
   archive { 'download-directmairie-jar':
     ensure => 'present',
-    path   => "${directmairie::app_dir}/${directmairie::_jar_name}",
+    path   => "${directmairie::app_dir}/${directmairie::jar_name}",
     source => $_directmairie_jar_url,
   }
 

templates/directmairie.service.epp

@@ -4,7 +4,7 @@ After=syslog.target
 
 [Service]
 User=<%= $directmairie::system_username %>
-ExecStart=/usr/bin/java -jar "<%= $directmairie::app_dir %>/<%= $directmairie::_jar_name %>" \
+ExecStart=/usr/bin/java -jar "<%= $directmairie::app_dir %>/<%= $directmairie::jar_name %>" \
   --amies.security.secret-key="<%= $directmairie::security_key %>" \
   --amies.pictures.root-directory="<%= $directmairie::picture_dir %>" \
   --spring.mail.host=<%= $directmairie::smtp_host %> \
@@ -13,7 +13,7 @@ ExecStart=/usr/bin/java -jar "<%= $directmairie::app_dir %>/<%= $directmairie::_
   --spring.mail.password="<%= $directmairie::smtp_user_passwd %>" \
   --spring.mail.properties.mail.smtp.auth=true \
   --spring.mail.properties.mail.smtp.starttls.enable=true \
-  --spring.datasource.url="<%= $directmairie::_directmairie_jdbc_url %>" \
+  --spring.datasource.url="<%= $directmairie::directmairie_jdbc_url %>" \
   --spring.datasource.username="<%= $directmairie::db_user_name %>" \
   --spring.datasource.password="<%= $directmairie::db_user_password %>"
 SuccessExitStatus=143