From 29222acf56bf5e48f4f88770cd1a53ec5bb88d93 Mon Sep 17 00:00:00 2001
From: shirenn <shirenn@crans.org>
Date: Sun, 17 Jan 2021 21:39:06 +0100
Subject: [PATCH] [crans_scripts] PEPCRANSIFICATION
---
group_vars/server/crans_scripts.yml | 4 ++++
plays/root.yml | 3 ++-
roles/crans-scripts/tasks/main.yml | 4 ++--
3 files changed, 8 insertions(+), 3 deletions(-)
create mode 100644 group_vars/server/crans_scripts.yml
diff --git a/group_vars/server/crans_scripts.yml b/group_vars/server/crans_scripts.yml
new file mode 100644
index 00000000..4b905177
--- /dev/null
+++ b/group_vars/server/crans_scripts.yml
@@ -0,0 +1,4 @@
+---
+glob_crans_scripts:
+ remote: http://gitlab.adm.crans.org/nounous/scripts.git
+ version: master
diff --git a/plays/root.yml b/plays/root.yml
index a2b968d9..7a42fb29 100755
--- a/plays/root.yml
+++ b/plays/root.yml
@@ -34,12 +34,13 @@
# crans_scripts_git: "http://gitlab.adm.crans.org/nounous/scripts.git"
ntp_client: '{{ glob_ntp_client | combine(loc_ntp_client | default({})) }}'
+ crans_scripts: '{{ glob_crans_scripts | combine(loc_crans_scripts | default({})) }}'
roles:
- debian-apt-sources
- common-tools
- sudo
- ntp-client
- # - crans-scripts
+ - crans-scripts
- root-config
- hosts: crans_vm
diff --git a/roles/crans-scripts/tasks/main.yml b/roles/crans-scripts/tasks/main.yml
index 73c00d72..bed7bb5d 100644
--- a/roles/crans-scripts/tasks/main.yml
+++ b/roles/crans-scripts/tasks/main.yml
@@ -20,9 +20,9 @@
- name: Clone scripts repository
git:
- repo: "{{ crans_scripts_git }}"
+ repo: "{{ crans_scripts.remote }}"
dest: /usr/scripts
- version: master
+ version: "{{ crans_scripts.version }}"
umask: "002"
environment:
GIT_SSL_NO_VERIFY: 1
--
GitLab