From 2eb57a975df317c2add599cb1b0c9b8a4ca6f5a8 Mon Sep 17 00:00:00 2001
From: shirenn <shirenn@crans.org>
Date: Wed, 12 May 2021 18:00:38 +0200
Subject: [PATCH] moved nounou homes
---
group_vars/all/home_nounou.yml | 4 ++++
group_vars/all/vars.yaml | 3 ---
plays/root.yml | 6 ++++--
roles/{home-nounous => home-nounou}/README.md | 0
roles/{home-nounous => home-nounou}/tasks/main.yml | 14 +++++++++++---
.../templates/systemd/system/home_nounou.mount.j2} | 4 ++--
roles/sudo/templates/sudoers.d/group_privilege.j2 | 2 +-
7 files changed, 22 insertions(+), 11 deletions(-)
create mode 100644 group_vars/all/home_nounou.yml
rename roles/{home-nounous => home-nounou}/README.md (100%)
rename roles/{home-nounous => home-nounou}/tasks/main.yml (57%)
rename roles/{home-nounous/templates/systemd/system/home.mount.j2 => home-nounou/templates/systemd/system/home_nounou.mount.j2} (72%)
diff --git a/group_vars/all/home_nounou.yml b/group_vars/all/home_nounou.yml
new file mode 100644
index 00000000..c31e4508
--- /dev/null
+++ b/group_vars/all/home_nounou.yml
@@ -0,0 +1,4 @@
+---
+glob_home_nounou:
+ ip: 172.16.10.1
+ mountpoint: /pool/home
diff --git a/group_vars/all/vars.yaml b/group_vars/all/vars.yaml
index 8acc7ad3..ec368d89 100644
--- a/group_vars/all/vars.yaml
+++ b/group_vars/all/vars.yaml
@@ -59,6 +59,3 @@ glob_ldap:
- 172.16.10.12
- 172.16.10.13
base: 'dc=crans,dc=org'
-
-home_nounous:
- ip: 172.16.10.1
diff --git a/plays/root.yml b/plays/root.yml
index c73b87ed..0df02eee 100755
--- a/plays/root.yml
+++ b/plays/root.yml
@@ -38,9 +38,11 @@
roles:
- ldap-client
-- hosts: server,!ovh_physical,!tealc.adm.crans.org,!zamok.adm.crans.org
+- hosts: server,!ovh_physical,!tealc.adm.crans.org,!zamok.adm.crans.org,!gulp.cachan-adm.crans.org
+ vars:
+ home_nounou: "{{ glob_home_nounou | default({}) | combine(loc_home_nounou | default({})) }}"
roles:
- - home-nounous
+ - home-nounou
- import_playbook: scripts.yml
- import_playbook: vm_setup.yml
diff --git a/roles/home-nounous/README.md b/roles/home-nounou/README.md
similarity index 100%
rename from roles/home-nounous/README.md
rename to roles/home-nounou/README.md
diff --git a/roles/home-nounous/tasks/main.yml b/roles/home-nounou/tasks/main.yml
similarity index 57%
rename from roles/home-nounous/tasks/main.yml
rename to roles/home-nounou/tasks/main.yml
index b3ea1062..915b294e 100644
--- a/roles/home-nounous/tasks/main.yml
+++ b/roles/home-nounou/tasks/main.yml
@@ -9,15 +9,23 @@
retries: 3
until: apt_result is succeeded
+- name: Create directory home_nounou
+ file:
+ path: /home_nounou
+ state: directory
+ owner: root
+ group: _user
+ mode: 0750
+
- name: Deploy nfs systemd mount
template:
- src: systemd/system/home.mount.j2
- dest: /etc/systemd/system/home.mount
+ src: systemd/system/home_nounou.mount.j2
+ dest: /etc/systemd/system/home_nounou.mount
mode: 0644
- name: Load and activate nfs systemd mount
systemd:
- name: home.mount
+ name: home_nounou.mount
daemon_reload: true
enabled: true
state: started
diff --git a/roles/home-nounous/templates/systemd/system/home.mount.j2 b/roles/home-nounou/templates/systemd/system/home_nounou.mount.j2
similarity index 72%
rename from roles/home-nounous/templates/systemd/system/home.mount.j2
rename to roles/home-nounou/templates/systemd/system/home_nounou.mount.j2
index b144343d..835e16ca 100644
--- a/roles/home-nounous/templates/systemd/system/home.mount.j2
+++ b/roles/home-nounou/templates/systemd/system/home_nounou.mount.j2
@@ -5,8 +5,8 @@ Wants=network-online.target
After=network-online.target
[Mount]
-What={{ home_nounous.ip }}:/pool/home
-Where=/home
+What={{ home_nounou.ip }}:{{ home_nounou.mountpoint }}
+Where=/home_nounou
Type=nfs
Options=rw,nosuid
diff --git a/roles/sudo/templates/sudoers.d/group_privilege.j2 b/roles/sudo/templates/sudoers.d/group_privilege.j2
index 7d0fe1d7..2b7e31fd 100644
--- a/roles/sudo/templates/sudoers.d/group_privilege.j2
+++ b/roles/sudo/templates/sudoers.d/group_privilege.j2
@@ -1,3 +1,3 @@
{{ ansible_header | comment }}
# Group privilege specification
-NOUNOU ALL=(ALL:ALL) ALL
+NOUNOUS ALL=(ALL:ALL) ALL
--
GitLab