From d25387666b51ee3b602cc5a85701209b01152e57 Mon Sep 17 00:00:00 2001
From: Pavel Valach <pavel.valach@cesnet.cz>
Date: Fri, 3 May 2024 10:04:26 +0200
Subject: [PATCH 1/3] Change repository path for ansible roles to CESNET Gitlab
---
contrib/ansible/warden-filer-receiver/tasks/main.yml | 2 +-
contrib/ansible/warden-server/tasks/main.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/ansible/warden-filer-receiver/tasks/main.yml b/contrib/ansible/warden-filer-receiver/tasks/main.yml
index 727e74d..317ef88 100644
--- a/contrib/ansible/warden-filer-receiver/tasks/main.yml
+++ b/contrib/ansible/warden-filer-receiver/tasks/main.yml
@@ -1,7 +1,7 @@
---
- name: Checkout Warden repository
git:
- repo: https://homeproj.cesnet.cz/git/warden.git/
+ repo: https://gitlab.cesnet.cz/713/warden/warden.git
version: warden-client-3.0-beta3
dest: /tmp/warden_client_repository
diff --git a/contrib/ansible/warden-server/tasks/main.yml b/contrib/ansible/warden-server/tasks/main.yml
index bf6b3ee..8c13dc3 100644
--- a/contrib/ansible/warden-server/tasks/main.yml
+++ b/contrib/ansible/warden-server/tasks/main.yml
@@ -1,7 +1,7 @@
---
- name: Checkout Warden repository
git:
- repo: https://homeproj.cesnet.cz/git/warden.git/
+ repo: https://gitlab.cesnet.cz/713/warden/warden.git
version: warden-server-3.0-beta3
dest: /tmp/warden_server_repository
--
GitLab
From bb9f5f62a0a0b60f8d2349aa729cd08de291ff34 Mon Sep 17 00:00:00 2001
From: Pavel Valach <pavel.valach@cesnet.cz>
Date: Fri, 3 May 2024 10:20:50 +0200
Subject: [PATCH 2/3] Ansible/Warden-Filer-Receiver: fix installation
The main task file now:
- creates the bin directory (default /opt/warden-filer)
- copies the binaries properly
- applies executable permission to the init.d script
- creates main binary symlink at /usr/local/bin/warden_filer.py
- creates /etc/default/warden_filer_receiver file in the correct path
---
.../warden-filer-receiver/tasks/main.yml | 27 ++++++++++++++++---
.../warden_filer_receiver | 0
2 files changed, 24 insertions(+), 3 deletions(-)
rename contrib/ansible/warden-filer-receiver/templates/etc/{defaults => default}/warden_filer_receiver (100%)
diff --git a/contrib/ansible/warden-filer-receiver/tasks/main.yml b/contrib/ansible/warden-filer-receiver/tasks/main.yml
index 317ef88..9887885 100644
--- a/contrib/ansible/warden-filer-receiver/tasks/main.yml
+++ b/contrib/ansible/warden-filer-receiver/tasks/main.yml
@@ -5,10 +5,20 @@
version: warden-client-3.0-beta3
dest: /tmp/warden_client_repository
+- name: Create bin dir for warden_filer
+ file:
+ path: "{{ warden_filer_bin_path }}"
+ state: directory
+ owner: root
+ group: root
+ mode: "755"
+
- name: Install Filer binaries
copy:
- src: "/tmp/warden_client_repository/{{ src }}"
- dest: "{{ warden_filer_bin_path }}/{{ dest }}"
+ remote_src: true
+ src: "/tmp/warden_client_repository/{{ item.src }}"
+ dest: "{{ warden_filer_bin_path }}/{{ item.dest }}"
+ mode: "755"
with_items:
- src: warden_client/warden_client.py
dest: warden_client.py
@@ -17,15 +27,26 @@
- src: warden_filer/check_file_count
dest: check_file_count
+- name: Link Filer binary to /usr/local/bin
+ file:
+ src: "{{ warden_filer_bin_path }}/warden_filer.py"
+ dest: "/usr/local/bin/warden_filer.py"
+ state: link
+ owner: root
+ group: root
+ mode: "755"
+
- name: Install Warden Filer config
template:
src: "{{ item }}"
dest: "/{{ item }}"
with_items:
- etc/warden_filer.cfg
- - etc/defaults/warden_filer_receiver
+ - etc/default/warden_filer_receiver
- name: Install Warden Filer init script
copy:
+ remote_src: true
src: /tmp/warden_client_repository/warden_filer/warden_filer_receiver
dest: /etc/init.d/warden_filer_receiver
+ mode: "755"
diff --git a/contrib/ansible/warden-filer-receiver/templates/etc/defaults/warden_filer_receiver b/contrib/ansible/warden-filer-receiver/templates/etc/default/warden_filer_receiver
similarity index 100%
rename from contrib/ansible/warden-filer-receiver/templates/etc/defaults/warden_filer_receiver
rename to contrib/ansible/warden-filer-receiver/templates/etc/default/warden_filer_receiver
--
GitLab
From 22f52cecbe1f5de5b54a9ef3bcf6732f0eaba74c Mon Sep 17 00:00:00 2001
From: Pavel Valach <pavel.valach@cesnet.cz>
Date: Fri, 3 May 2024 10:22:24 +0200
Subject: [PATCH 3/3] Ansible/Warden-Filer-Receiver: create directories in
/var/lib and /run
---
.../ansible/warden-filer-receiver/defaults/main.yml | 2 ++
contrib/ansible/warden-filer-receiver/tasks/main.yml | 11 +++++++++++
2 files changed, 13 insertions(+)
diff --git a/contrib/ansible/warden-filer-receiver/defaults/main.yml b/contrib/ansible/warden-filer-receiver/defaults/main.yml
index e2bbd78..97c552c 100644
--- a/contrib/ansible/warden-filer-receiver/defaults/main.yml
+++ b/contrib/ansible/warden-filer-receiver/defaults/main.yml
@@ -1,6 +1,8 @@
---
server_admin: "{{ root@inventory_hostname }}"
warden_filer_bin_path: /opt/warden-filer
+warden_filer_lib_path: /var/lib/warden_filer
+warden_filer_run_path: /run/warden_filer
warden_client_cert_path: /etc/ssl/certs/warden.cert.pem
warden_client_key_path: /etc/ssl/private/warden.key.pem
warden_client_id_store: /var/lib/warden_filer/warden_filer.id
diff --git a/contrib/ansible/warden-filer-receiver/tasks/main.yml b/contrib/ansible/warden-filer-receiver/tasks/main.yml
index 9887885..2ed9aaf 100644
--- a/contrib/ansible/warden-filer-receiver/tasks/main.yml
+++ b/contrib/ansible/warden-filer-receiver/tasks/main.yml
@@ -13,6 +13,17 @@
group: root
mode: "755"
+- name: Create lib and run dir for warden_filer
+ file:
+ path: "{{ item }}"
+ state: directory
+ owner: "{{ warden_filer_uid }}"
+ group: "{{ warden_filer_gid }}"
+ mode: "755"
+ with_items:
+ - "{{ warden_filer_lib_path }}"
+ - "{{ warden_filer_run_path }}"
+
- name: Install Filer binaries
copy:
remote_src: true
--
GitLab