Fixup last ipsilon commit
Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
This commit is contained in:
parent
4ffa70b0e0
commit
9e17fd1f37
2 changed files with 12 additions and 6 deletions
|
@ -84,16 +84,16 @@
|
||||||
tags:
|
tags:
|
||||||
- ipsilon
|
- ipsilon
|
||||||
|
|
||||||
- include_tasks: patches.yml
|
|
||||||
tags:
|
|
||||||
- ipsilon
|
|
||||||
- patches
|
|
||||||
|
|
||||||
- name: Destroy admin ticket
|
- name: Destroy admin ticket
|
||||||
command: kdestroy -A
|
command: kdestroy -A
|
||||||
tags:
|
tags:
|
||||||
- ipsilon
|
- ipsilon
|
||||||
|
|
||||||
|
- import_tasks: patches.yml
|
||||||
|
tags:
|
||||||
|
- ipsilon
|
||||||
|
- patches
|
||||||
|
|
||||||
- name: make sure /etc/ipsilon/root is owned correctly
|
- name: make sure /etc/ipsilon/root is owned correctly
|
||||||
file:
|
file:
|
||||||
path: "/etc/ipsilon/root"
|
path: "/etc/ipsilon/root"
|
||||||
|
|
|
@ -18,7 +18,13 @@
|
||||||
- name: apply patches
|
- name: apply patches
|
||||||
ansible.builtin.shell:
|
ansible.builtin.shell:
|
||||||
chdir: "{{ ansible_facts['python3']['sitelib'] }}"
|
chdir: "{{ ansible_facts['python3']['sitelib'] }}"
|
||||||
cmd: filterdiff --include '?/ipsilon/' /opt/ipsilon-patches/{{item}}.patch | patch -p1 --forward --batch
|
cmd: filterdiff --include '?/ipsilon/*' /opt/ipsilon-patches/{{item}}.patch | patch -p1 --forward --fuzz=0 --reject-file=- --batch
|
||||||
loop: "{{ ipsilon_patches }}"
|
loop: "{{ ipsilon_patches }}"
|
||||||
|
register: result
|
||||||
|
ignore_errors: true
|
||||||
|
changed_when:
|
||||||
|
- "'Reversed (or previously applied) patch detected!' not in result.stdout"
|
||||||
|
- result.rc = 0
|
||||||
|
failed_when: "'FAILED' in result.stdout"
|
||||||
notify:
|
notify:
|
||||||
- restart apache
|
- restart apache
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue