From 0c86196af41791414ac2180c786fedcaf8ee1558 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Fran=C3=A7ois?= Date: Tue, 1 Oct 2024 09:32:37 +0200 Subject: [PATCH 1/2] feat(adminer): switch to AdminerEvo, filename customization --- README.md | 1 + config/steps/adminer.yml | 15 +++++++++++---- defaults/main.yml | 1 + 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 2ee0d30..59420af 100644 --- a/README.md +++ b/README.md @@ -88,6 +88,7 @@ The defaults vars declared in this module: lephare_install_adminer_path: "{{ lephare_document_root_path }}" lephare_permission_set: false + lephare_install_adminer_filename: "adminer.php" lephare_permission_paths: [ "{{ ansistrano_release_path.stdout }}/var/cache", "{{ ansistrano_shared_path }}/var/logs" ] lephare_permission_users: [ "www-data", "{{ ansible_user }}" ] diff --git a/config/steps/adminer.yml b/config/steps/adminer.yml index 5f6d423..9be74d9 100644 --- a/config/steps/adminer.yml +++ b/config/steps/adminer.yml @@ -1,5 +1,12 @@ -- name: LEPHARE - install latest Adminer - get_url: - url: https://www.adminer.org/latest.php - dest: "{{ lephare_install_adminer_path }}/adminer.php" +- name: LEPHARE - install latest AdminerEvo + unarchive: + src: https://download.adminerevo.org/latest/adminer/adminer-fr.zip + dest: "{{ lephare_install_adminer_path }}" + remote_src: yes ignore_errors: True +- name: LEPHARE - rename AdminerEvo file + command: mv "{{ lephare_install_adminer_path }}/adminer-fr.php" "{{ lephare_install_adminer_path }}/{{lephare_install_adminer_filename}}" + args: + removes: "{{ lephare_install_adminer_path }}/adminer-fr.php" + creates: "{{ lephare_install_adminer_path }}/{{lephare_install_adminer_filename}}" + ignore_errors: True \ No newline at end of file diff --git a/defaults/main.yml b/defaults/main.yml index 7c7cad3..c92aa58 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -62,6 +62,7 @@ lephare_cloudfront_invalidate: false lephare_cloudfront_path: ["/*"] lephare_install_adminer: false +lephare_install_adminer_filename: "adminer.php" lephare_install_adminer_path: "{{ lephare_document_root_path }}" lephare_permission_set: false From bdedb356dd885fa923947f2527a5dd039d70d00a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Fran=C3=A7ois?= <68734185+afrancois-lephare@users.noreply.github.com> Date: Thu, 3 Oct 2024 09:58:00 +0200 Subject: [PATCH 2/2] Update README.md Co-authored-by: Lucas Mirloup <97196064+lucasmirloup@users.noreply.github.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 59420af..de654c2 100644 --- a/README.md +++ b/README.md @@ -85,10 +85,10 @@ The defaults vars declared in this module: lephare_cloudfront_path: [ '/*' ] lephare_install_adminer: false + lephare_install_adminer_filename: "adminer.php" lephare_install_adminer_path: "{{ lephare_document_root_path }}" lephare_permission_set: false - lephare_install_adminer_filename: "adminer.php" lephare_permission_paths: [ "{{ ansistrano_release_path.stdout }}/var/cache", "{{ ansistrano_shared_path }}/var/logs" ] lephare_permission_users: [ "www-data", "{{ ansible_user }}" ]