From 1837a8a90da025fbd700f985795f0111b0d3f917 Mon Sep 17 00:00:00 2001
From: shirenn <shirenn@crans.org>
Date: Wed, 19 May 2021 17:59:55 +0200
Subject: [PATCH] [crans-scripts] move the scripts to /usr/local/src/scripts
---
group_vars/server/crans_scripts.yml | 2 ++
host_vars/zamok.adm.crans.org.yml | 5 +++++
roles/crans-scripts/tasks/main.yml | 10 +++++-----
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/group_vars/server/crans_scripts.yml b/group_vars/server/crans_scripts.yml
index d8ac50d3..73ec7766 100644
--- a/group_vars/server/crans_scripts.yml
+++ b/group_vars/server/crans_scripts.yml
@@ -1,4 +1,6 @@
---
glob_crans_scripts:
remote: https://gitlab.adm.crans.org/nounous/scripts.git
+ group: _nounou
version: master
+ dest: /usr/local/src/scripts
diff --git a/host_vars/zamok.adm.crans.org.yml b/host_vars/zamok.adm.crans.org.yml
index 8949c4df..fba9ef88 100644
--- a/host_vars/zamok.adm.crans.org.yml
+++ b/host_vars/zamok.adm.crans.org.yml
@@ -14,3 +14,8 @@ loc_thelounge:
oidentd: "\"/usr/local/lib/thelounge/.oidentd.conf\""
reverseProxy: "true"
ldap_enable: "true"
+
+loc_crans_scripts:
+ group: nounou
+ dests:
+ - /usr/scripts
diff --git a/roles/crans-scripts/tasks/main.yml b/roles/crans-scripts/tasks/main.yml
index 432d9d99..cd0d0210 100644
--- a/roles/crans-scripts/tasks/main.yml
+++ b/roles/crans-scripts/tasks/main.yml
@@ -1,17 +1,17 @@
---
- name: Create scripts directory
file:
- path: /usr/scripts
+ path: "{{ crans_scripts.dest }}"
state: directory
mode: "2775"
owner: root
- group: _nounou
+ group: "{{ crans_scripts.group }}"
- name: Set ACL for scripts directory
acl:
- path: /usr/scripts
+ path: "{{ crans_scripts.dest }}"
default: true
- entity: _nounou
+ entity: "{{ crans_scripts.group }}"
etype: group
permissions: rwx
state: query
@@ -21,7 +21,7 @@
- name: Clone scripts repository
git:
repo: "{{ crans_scripts.remote }}"
- dest: /usr/scripts
+ dest: "{{ crans_scripts.dest }}"
version: "{{ crans_scripts.version }}"
umask: "002"
register: git_result
--
GitLab