Merge ef8fe53062 into cddbfc8e40

Fix http_proxy reset rm order
Fix http_proxy reset: rm conf files before dirs
2025-12-25 18:23:05 +01:00 · 2024-01-18 10:15:04 +01:00 · 2023-11-07 18:04:37 +01:00 · 2023-11-07 18:03:28 +01:00 · 2023-11-07 15:20:41 +01:00
2 changed files with 5 additions and 3 deletions
--- a/roles/k3s_agent/tasks/http_proxy.yml
+++ b/roles/k3s_agent/tasks/http_proxy.yml
@@ -1,8 +1,8 @@
 ---

- name: Create k3s.service.d directory
+- name: Create k3s-node.service.d directory
  file:
-    path: '{{ systemd_dir }}/k3s.service.d'
+    path: '{{ systemd_dir }}/k3s-node.service.d'
    state: directory
    owner: root
    group: root
@@ -12,7 +12,7 @@
 - name: Copy K3s http_proxy conf file
  template:
    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
    group: root
    mode: '0755'
--- a/roles/reset/tasks/main.yml
+++ b/roles/reset/tasks/main.yml
@@ -51,7 +51,9 @@
    name: "{{ item }}"
    state: absent
  with_items:
+    - "{{ systemd_dir }}/k3s.service.d/http_proxy.conf"
    - "{{ systemd_dir }}/k3s.service.d"
+    - "{{ systemd_dir }}/k3s-node.service.d/http_proxy.conf"
    - "{{ systemd_dir }}/k3s-node.service.d"
  when: proxy_env is defined
Author	SHA1	Message	Date
Balázs Hasprai	b709bf12e7	Merge `ef8fe53062` into `cddbfc8e40`	2024-01-18 10:15:04 +01:00
Balázs Hasprai	ef8fe53062	Fix http_proxy reset rm order	2023-11-07 18:04:37 +01:00
Balázs Hasprai	83d4ee27fd	Fix http_proxy reset: rm conf files before dirs	2023-11-07 18:03:28 +01:00
Balázs Hasprai	a2bfc6c0b1	Fix http_proxy service dir in k3s_agent role	2023-11-07 15:20:41 +01:00