From 86bc883a7a9be4a6d7a1fd2a6786b31e849267e4 Mon Sep 17 00:00:00 2001 From: Cengis K Date: Tue, 11 Feb 2020 11:30:44 +0100 Subject: [PATCH] Fix default maven repository https error * Enable driver permission personalization * Fix default maven repository https error default maven repository require https now and it's not compatible with maven_artifact module default value --- defaults/main.yml | 1 + tasks/setup_drivers.yml | 3 ++- tasks/setup_install.yml | 2 +- vars/main.yml | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 9ef5ff5..58ca38c 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -41,6 +41,7 @@ flyway_remove_default_drivers: false # repo_user: None, # (optionnal) repository username. Default: flyway_repo_username # repo_password: None, # (optionnal) repository password. Default: flyway_repo_password # repo_validate_certs: yes, # (optionnal) repository certificate validation. Default: yes +# mode: 0644 # (optionnal) file permissions. Default: 0644 # } # - ... flyway_additional_mvn_drivers: [] diff --git a/tasks/setup_drivers.yml b/tasks/setup_drivers.yml index c813276..01f231c 100644 --- a/tasks/setup_drivers.yml +++ b/tasks/setup_drivers.yml @@ -24,9 +24,10 @@ extension: "{{ item.extension | default(omit) }}" classifier: "{{ item.classifier | default(omit) }}" state: "{{ item.state | default(omit) }}" - repository_url: "{{ item.repo_url | default(omit) }}" + repository_url: "{{ item.repo_url | default(__flyway_default_maven_repository,True) }}" username: "{{ item.repo_user | default(omit) }}" password: "{{ item.repo_password | default(omit) }}" validate_certs: "{{ item.repo_validate_certs | default(omit) }}" timeout: "{{ __flyway_maven_artifact_timeout }}" + mode: "{{ item.mode | default('0644', True) }}" with_items: "{{ flyway_additional_mvn_drivers }}" diff --git a/tasks/setup_install.yml b/tasks/setup_install.yml index 8f1d9c9..f466f78 100644 --- a/tasks/setup_install.yml +++ b/tasks/setup_install.yml @@ -17,7 +17,7 @@ artifact_id: "{{ __flyway_artifact_id }}" version: "{{ flyway_version }}" extension: "{{ __flyway_artifact_extension }}" - repository_url: "{{ flyway_repo_url | default(omit) }}" + repository_url: "{{ flyway_repo_url | default(__flyway_default_maven_repository,True) }}" state: present username: "{{ flyway_repo_username | default(omit) }}" password: "{{ flyway_repo_password | default(omit) }}" diff --git a/vars/main.yml b/vars/main.yml index 6ce6ed5..4d059b8 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,5 +1,7 @@ --- # vars file for ansible-role-flyway +__flyway_default_maven_repository: "https://repo1.maven.org/maven2" + __flyway_install_version_path: "{{ flyway_install_root }}/flyway-{{ flyway_version}}" __flyway_core_jar: "{{ __flyway_install_version_path }}/lib/{{ flyway_edition }}/flyway-core-{{ flyway_version }}.jar"