celoman/abril
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix http_proxy service dir in k3s_agent role (#400)

Browse Source 
* Fix http_proxy service dir in k3s_agent role

* Fix http_proxy reset: rm conf files before dirs

* Fix http_proxy reset rm order

---------

Co-authored-by: Techno Tim <timothystewart6@gmail.com>
This commit is contained in:
Balázs Hasprai 2024-01-25 18:34:46 +01:00 committed by GitHub
parent 5ae8fd1223
commit df9c6f3014
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
roles/k3s_agent/tasks/http_proxy.yml
View File

@ -1,8 +1,8 @@
--- ---
- name: Create k3s.service.d directory - name: Create k3s-node.service.d directory
file: file:
path: '{{ systemd_dir }}/k3s.service.d' path: '{{ systemd_dir }}/k3s-node.service.d'
state: directory state: directory
owner: root owner: root
group: root group: root
@ -12,7 +12,7 @@
- name: Copy K3s http_proxy conf file - name: Copy K3s http_proxy conf file
template: template:
src: "http_proxy.conf.j2" src: "http_proxy.conf.j2"
dest: "{{ systemd_dir }}/k3s.service.d/http_proxy.conf" dest: "{{ systemd_dir }}/k3s-node.service.d/http_proxy.conf"
owner: root owner: root
group: root group: root
mode: '0755' mode: '0755'

2
roles/reset/tasks/main.yml
View File

@ -51,7 +51,9 @@
name: "{{ item }}" name: "{{ item }}"
state: absent state: absent
with_items: with_items:
- "{{ systemd_dir }}/k3s.service.d/http_proxy.conf"
- "{{ systemd_dir }}/k3s.service.d" - "{{ systemd_dir }}/k3s.service.d"
- "{{ systemd_dir }}/k3s-node.service.d/http_proxy.conf"
- "{{ systemd_dir }}/k3s-node.service.d" - "{{ systemd_dir }}/k3s-node.service.d"
when: proxy_env is defined when: proxy_env is defined