revert to keep the older variables rather than new jdbc ones

Author: gionn

.secrets.baseline

@@ -188,5 +188,5 @@
       }
     ]
   },
-  "generated_at": "2025-05-06T13:08:52Z"
+  "generated_at": "2025-05-08T15:00:54Z"
 }

docs/deployment-guide.md

@@ -711,7 +711,7 @@ An example custom database url is shown below:
 
 ```yaml
 acs_play_repo_db_url: jdbc:mysql://54.164.117.56:3306/alfresco?useUnicode=yes&characterEncoding=UTF-8
-acs_play_repository_jdbc_driver_class: com.mysql.jdbc.Driver
+acs_play_repo_db_driver: com.mysql.jdbc.Driver
 ```
 
 Along with the url the database driver binaries need to be provided for one or both services in the `configuration_files/db_connector_repo` and/or `configuration_files/db_connector_sync` folders.

playbooks/acs.yml

@@ -341,7 +341,7 @@
         repository_acs_artifact_name: "{{ acs_play_repository_acs_artifact_name }}"
         repository_acs_archive_url: "{{ acs_play_repository_acs_archive_url }}"
         repository_acs_archive_checksum: "{{ acs_play_repository_acs_archive_checksum }}"
-        repository_jdbc_driver_class: "{{ acs_play_repository_jdbc_driver_class }}"
+        repository_jdbc_driver_class: "{{ acs_play_repo_db_driver }}"
         repository_jdbc_driver_version: "{{ acs_play_repository_jdbc_driver_version }}"
         repository_jdbc_driver_url: "{{ acs_play_repository_jdbc_driver_url }}"
         repository_jdbc_driver_checksum: "{{ acs_play_repository_jdbc_driver_checksum }}"
@@ -668,11 +668,11 @@
         sync_zip_checksum: "{{ acs_play_sync_zip_checksum }}"
         sync_zip_username: "{{ nexus_user }}"
         sync_zip_password: "{{ nexus_password }}"
-        sync_jdbc_driver_class: "{{ acs_play_sync_jdbc_driver_class }}"
         sync_jdbc_driver_version: "{{ acs_play_sync_jdbc_driver_version }}"
         sync_jdbc_driver_url: "{{ acs_play_sync_jdbc_driver_url }}"
         sync_jdbc_driver_checksum: "{{ acs_play_sync_jdbc_driver_checksum }}"
         sync_db_url: "{{ acs_play_sync_db_url }}"
+        sync_db_driver: "{{ acs_play_sync_db_driver }}"
         sync_db_name: "{{ acs_play_sync_db_name }}"
         sync_db_username: "{{ acs_play_sync_db_username }}"
       when: acs_is_enterprise

playbooks/group_vars/all.yml

@@ -39,9 +39,11 @@ default_jdbc_pg_driver_url: >-
 default_jdbc_pg_driver_class: org.postgresql.Driver
 
 acs_play_repo_db_url: ""
+acs_play_repo_db_driver: "{{ default_jdbc_pg_driver_class }}"
 acs_play_repo_db_name: "alfresco"
 acs_play_repo_db_username: "alfresco"
 acs_play_sync_db_url: ""
+acs_play_sync_db_driver: "{{ default_jdbc_pg_driver_class }}"
 acs_play_sync_db_name: "alfresco-sync"
 acs_play_sync_db_username: "alfresco-sync"
 

playbooks/group_vars/repository.yml

@@ -3,7 +3,6 @@ acs_play_repository_acs_repository: "{{ nexus_repository.enterprise_releases }}"
 acs_play_repository_acs_archive_url: "{{ acs_play_repository_acs_repository }}/{{ acs_play_repository_acs_artifact_name }}/{{ acs_play_repository_acs_version }}/{{ acs_play_repository_acs_artifact_name }}-{{ acs_play_repository_acs_version }}.zip"
 acs_play_repository_acs_archive_checksum: "sha1:{{ acs_play_repository_acs_archive_url }}.sha1"
 
-acs_play_repository_jdbc_driver_class: "{{ default_jdbc_pg_driver_class }}"
 acs_play_repository_jdbc_driver_version: "{{ acs_play_jdbc_pg_driver_version }}"
 acs_play_repository_jdbc_driver_url: >-
   {{ '{0}/{1}/postgresql-{1}.jar'.format(default_jdbc_pg_driver_base_url, acs_play_repository_jdbc_driver_version) }}
@@ -65,7 +64,7 @@ global_properties:
   db:
     url: >-
       {{ acs_play_repo_db_url if acs_play_repo_db_url else 'jdbc:postgresql://' + db_host + ':' + ports_cfg.postgres.sql | string + '/' + acs_play_repo_db_name }}
-    driver: "{{ acs_play_repository_jdbc_driver_class }}"
+    driver: "{{ acs_play_repo_db_driver }}"
     username: "{{ acs_play_repo_db_username }}"
     password: "{{ repo_db_password }}"
   alfresco:

playbooks/group_vars/syncservice.yml

@@ -2,7 +2,6 @@ acs_play_sync_artifact_name: sync-dist-6.x
 acs_play_sync_repository: "{{ nexus_repository.enterprise_releases }}/services/sync"
 acs_play_sync_zip_url: "{{ acs_play_sync_repository }}/{{ acs_play_sync_artifact_name }}/{{ acs_play_sync_version }}/{{ acs_play_sync_artifact_name }}-{{ acs_play_sync_version }}.zip"
 acs_play_sync_zip_checksum: "sha1:{{ acs_play_sync_zip_url }}.sha1"
-acs_play_sync_jdbc_driver_class: "{{ default_jdbc_pg_driver_class }}"
 acs_play_sync_jdbc_driver_version: "{{ acs_play_jdbc_pg_driver_version }}"
 acs_play_sync_jdbc_driver_url: >-
   {{ '{0}/{1}/postgresql-{1}.jar'.format(default_jdbc_pg_driver_base_url, acs_play_sync_jdbc_driver_version) }}

roles/sync/defaults/main.yml

@@ -18,13 +18,13 @@ sync_jmx_config_remote_enabled: false
 sync_jmx_config_remote_port: 50800
 sync_jmx_config_remote_rmi_port: 50801
 
-sync_jdbc_driver_class: org.postgresql.Driver
 sync_jdbc_driver_version: 42.7.3
 sync_jdbc_driver_base_url: https://repo.maven.apache.org/maven2/org/postgresql/postgresql
 sync_jdbc_driver_url: >-
   {{ '{0}/{1}/postgresql-{1}.jar'.format(sync_jdbc_driver_base_url, sync_jdbc_driver_version) }}
 sync_jdbc_driver_checksum: "sha1:{{ sync_jdbc_driver_url }}.sha1"
 
 sync_db_url: ""
+sync_db_driver: org.postgresql.Driver
 sync_db_name: "alfresco-sync"
 sync_db_username: "alfresco-sync"

roles/sync/meta/argument_specs.yml

@@ -41,12 +41,6 @@ argument_specs:
         required: false
         description: |
           The version of the PostgreSQL JDBC driver to download
-      sync_jdbc_driver_class:
-        type: str
-        required: false
-        default: org.postgresql.Driver
-        description: |
-          The class name of the JDBC driver to use
       sync_jdbc_driver_url:
         type: str
         required: false
@@ -62,6 +56,12 @@ argument_specs:
         required: false
         description: |
           The JDBC URL to connect to the database
+      sync_db_driver:
+        type: str
+        required: false
+        default: org.postgresql.Driver
+        description: |
+          The class name of the JDBC driver to use
       sync_db_name:
         type: str
         required: false

roles/sync/tasks/configure.yml

@@ -20,7 +20,7 @@
       sql:
         db:
           url: "{{ local_db_url }}"
-          driver: "{{ sync_jdbc_driver_class }}"
+          driver: "{{ sync_db_driver }}"
           username: "{{ sync_db_username }}"
           password: "{{ sync_db_password }}"
       server:

roles/sync/tasks/main.yml

@@ -59,7 +59,7 @@
         mode: "0644"
         owner: "{{ username }}"
         group: "{{ group_name }}"
-      when: sync_jdbc_driver_class == 'org.postgresql.Driver'
+      when: sync_db_driver == 'org.postgresql.Driver'
 
     - name: Copy db_connector to {{ sync_home }}/service-sync/connectors folder
       ansible.builtin.copy:
@@ -68,7 +68,7 @@
         owner: "{{ username }}"
         group: "{{ group_name }}"
         mode: "0644"
-      when: sync_jdbc_driver_class != 'org.postgresql.Driver'
+      when: sync_db_driver != 'org.postgresql.Driver'
 
     - name: Add paths to setenv file
       ansible.builtin.blockinfile: