From 9b8e6d87e1ac9e21e9541b8a8280a2ab5da6c5a6 Mon Sep 17 00:00:00 2001 From: Pierre Boissinot Date: Mon, 31 Jul 2023 12:03:18 +0200 Subject: [PATCH] Fix composer home (#42) * fix(composer): COMPOSER_HOME setup * chore(composer): set default lephare_composer_home to ~/.config/composer Co-authored-by: Thibaut Selingue * doc(readme): set default composer 2 config path * doc(readme): set default Composer 2 config path Co-authored-by: Thibaut Selingue --------- Co-authored-by: Thibaut Selingue --- README.md | 2 ++ config/steps/composer/private_registry.yml | 15 +++++++-------- config/steps/gather_facts.yml | 2 -- defaults/main.yml | 1 + 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 812acea..869348b 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,8 @@ The defaults vars declared in this module: lephare_cachetool_apcu_clear: true lephare_cachetool_scheme: https + lephare_composer_home: '~/.config/composer' + lephare_rollbar_notify: true lephare_rollbar_environment: production diff --git a/config/steps/composer/private_registry.yml b/config/steps/composer/private_registry.yml index ed6fd84..d50e565 100644 --- a/config/steps/composer/private_registry.yml +++ b/config/steps/composer/private_registry.yml @@ -1,14 +1,13 @@ -- name: LEPHARE | COMPOSER | Ensure configuration directory exists - file: - path: "{{ composer_facts.home }}" - state: directory - recurse: yes - mode: 0755 - register: composer_home_directory +- name: Add lephare_composer_home directory to current user $PATH. + ansible.builtin.lineinfile: + path: ~/.profile + line: 'export COMPOSER_HOME={{ lephare_composer_home }}' + create: true + backup: true - name: LEPHARE | COMPOSER | Setup private registry template: src: composer/auth.json.j2 - dest: "{{ composer_home_directory.path }}/auth.json" + dest: "{{ lephare_composer_home }}/auth.json" mode: 0600 when: lephare_packagist_com_token is defined diff --git a/config/steps/gather_facts.yml b/config/steps/gather_facts.yml index da509d0..3054757 100644 --- a/config/steps/gather_facts.yml +++ b/config/steps/gather_facts.yml @@ -11,5 +11,3 @@ php_facts: version: "{{ php_version.stdout }}" extensions: "{{ php_extensions.stdout_lines }}" - composer_facts: - home: "{{ lookup('env', 'COMPOSER_HOME') | default('~/.composer', true) }}" diff --git a/defaults/main.yml b/defaults/main.yml index 2c6c675..a9ca81e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -51,6 +51,7 @@ lephare_run_doctrine_migrations: true lephare_console_path: bin/console lephare_composer_options: "--no-dev --optimize-autoloader --apcu-autoloader --no-interaction" lephare_composer_dump_environment: true +lephare_composer_home: '~/.config/composer' lephare_cloudfront_invalidate: false lephare_cloudfront_path: ["/*"]