Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

Commit

Permalink
Fix default maven repository https error
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
lrk authored Feb 11, 2020
1 parent 35f1f55 commit 86bc883
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 2 deletions.
1 change: 1 addition & 0 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
Expand Down
3 changes: 2 additions & 1 deletion tasks/setup_drivers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
2 changes: 1 addition & 1 deletion tasks/setup_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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) }}"
Expand Down
2 changes: 2 additions & 0 deletions vars/main.yml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down

0 comments on commit 86bc883

Please sign in to comment.