From 80aa37af9ce76d98bfbdc7a957bd5c12d8244c7d Mon Sep 17 00:00:00 2001 From: Philippe MILINK Date: Thu, 21 Mar 2024 22:21:06 +0100 Subject: [PATCH] Remplace /opt/zds par {{ workdir }} --- roles/app/tasks/fixtures.yml | 8 ++++---- roles/latex/handlers/main.yml | 2 +- roles/latex/tasks/main.yml | 2 +- roles/latex/tasks/packages.yml | 12 ++++++------ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/roles/app/tasks/fixtures.yml b/roles/app/tasks/fixtures.yml index 13e330e..359c34b 100644 --- a/roles/app/tasks/fixtures.yml +++ b/roles/app/tasks/fixtures.yml @@ -11,9 +11,9 @@ become_user: "{{ appuser }}" ansible.builtin.shell: > if [ ! -e {{ appdir }}/.loaded_fixtures ]; then \ - /opt/zds/wrapper loaddata {{ appdir }}/fixtures/*.yaml && - /opt/zds/wrapper load_factory_data {{ appdir }}/fixtures/advanced/aide_tuto_media.yaml && - /opt/zds/wrapper load_fixtures --size=low --all && + {{ workdir }}/wrapper loaddata {{ appdir }}/fixtures/*.yaml && + {{ workdir }}/wrapper load_factory_data {{ appdir }}/fixtures/advanced/aide_tuto_media.yaml && + {{ workdir }}/wrapper load_fixtures --size=low --all && touch {{ appdir }}/.loaded_fixtures && - /opt/zds/wrapper es_manager index_all; \ + {{ workdir }}/wrapper es_manager index_all; \ fi diff --git a/roles/latex/handlers/main.yml b/roles/latex/handlers/main.yml index 9b757f4..fc18daf 100644 --- a/roles/latex/handlers/main.yml +++ b/roles/latex/handlers/main.yml @@ -1,7 +1,7 @@ - name: run texhash # noqa no-changed-when become: true become_user: "{{ appuser }}" - ansible.builtin.shell: texhash $HOME/texmf + ansible.builtin.command: texhash {{ workdir }}/texmf - name: refresh font-config cache # noqa no-changed-when ansible.builtin.command: fc-cache -f diff --git a/roles/latex/tasks/main.yml b/roles/latex/tasks/main.yml index d8f1c67..7edec39 100644 --- a/roles/latex/tasks/main.yml +++ b/roles/latex/tasks/main.yml @@ -25,7 +25,7 @@ become_user: "{{ appuser }}" ansible.builtin.git: repo: "https://github.com/zestedesavoir/latex-template/" - dest: /opt/zds/texmf/tex/generic/latex-template + dest: "{{ workdir }}/texmf/tex/generic/latex-template" notify: run texhash tags: - bootstrap diff --git a/roles/latex/tasks/packages.yml b/roles/latex/tasks/packages.yml index 95da2db..8f20e18 100644 --- a/roles/latex/tasks/packages.yml +++ b/roles/latex/tasks/packages.yml @@ -3,13 +3,13 @@ become_user: "{{ appuser }}" ansible.builtin.command: tlmgr init-usertree args: - creates: $HOME/texmf + creates: "{{ workdir }}/texmf" tags: - bootstrap - name: create ansible state if non-existant ansible.builtin.file: - path: /opt/zds/texmf/ansible-state + path: "{{ workdir }}/texmf/ansible-state" state: touch mode: u=rw,g=r,o=r tags: @@ -17,7 +17,7 @@ - name: check ansible state ansible.builtin.slurp: - src: /opt/zds/texmf/ansible-state + src: "{{ workdir }}/texmf/ansible-state" register: installed_packages - name: install packages # noqa risky-shell-pipe no-changed-when @@ -33,7 +33,7 @@ # we update and install tlmgr update --list && tlmgr install {{ ' '.join(latex_packages) }} && - echo {{ ' '.join(latex_packages) }} > $HOME/texmf/ansible-state + echo {{ ' '.join(latex_packages) }} > {{ workdir }}/texmf/ansible-state when: installed_packages.content|b64decode|trim != latex_packages|join(" ") tags: - bootstrap @@ -42,7 +42,7 @@ become: true become_user: "{{ appuser }}" ansible.builtin.file: - path: /opt/zds/texmf/tex/latex/tabu/ + path: "{{ workdir }}/texmf/tex/latex/tabu/" state: directory mode: u=rwx,g=r,o=r tags: @@ -53,7 +53,7 @@ become_user: "{{ appuser }}" ansible.builtin.get_url: url: https://raw.githubusercontent.com/tabu-issues-for-future-maintainer/tabu/master/tabu.sty - dest: /opt/zds/texmf/tex/latex/tabu/tabu.sty + dest: "{{ workdir }}/texmf/tex/latex/tabu/tabu.sty" mode: u=rw,g=r,o=r tags: - bootstrap