From 89eb7c37bf6b2692d14de1fc995d284e83500b79 Mon Sep 17 00:00:00 2001
From: shirenn <shirenn@crans.org>
Date: Sun, 10 Jan 2021 17:09:10 +0100
Subject: [PATCH 1/3] Au revoir zbee :(
---
roles/zbee-mount/tasks/main.yml | 71 -------------------
.../templates/systemd/system/home.mount.j2 | 13 ----
2 files changed, 84 deletions(-)
delete mode 100644 roles/zbee-mount/tasks/main.yml
delete mode 100644 roles/zbee-mount/templates/systemd/system/home.mount.j2
diff --git a/roles/zbee-mount/tasks/main.yml b/roles/zbee-mount/tasks/main.yml
deleted file mode 100644
index dc04aca4..00000000
--- a/roles/zbee-mount/tasks/main.yml
+++ /dev/null
@@ -1,71 +0,0 @@
----
-- name: Deploy /home systemd mounts
- template:
- src: "systemd/system/home.mount.j2"
- dest: "/etc/systemd/system/home\x2dadh-{{ item }}.mount"
- mode: 0644
- loop:
- - a
- - b
- - c
- - d
- - e
- - f
- - g
- - h
- - i
- - j
- - k
- - l
- - m
- - n
- - o
- - p
- - q
- - r
- - s
- - t
- - u
- - v
- - w
- - x
- - y
- - z
- - mail
- - logs
-
-- name: Load and activate /home systemd mounts
- systemd:
- name: "home\x2dadh-{{ item }}.mount"
- daemon_reload: true
- enabled: true
- state: started
- loop:
- - a
- - b
- - c
- - d
- - e
- - f
- - g
- - h
- - i
- - j
- - k
- - l
- - m
- - n
- - o
- - p
- - q
- - r
- - s
- - t
- - u
- - v
- - w
- - x
- - y
- - z
- - mail
- - logs
diff --git a/roles/zbee-mount/templates/systemd/system/home.mount.j2 b/roles/zbee-mount/templates/systemd/system/home.mount.j2
deleted file mode 100644
index 27272946..00000000
--- a/roles/zbee-mount/templates/systemd/system/home.mount.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-{{ ansible_header | comment }}
-[Unit]
-Description=Mount /home-adh/{{ item }}
-After=iscsi.service iscsid.service lvm2-activation-early.service multipathd.service
-
-[Mount]
-What=/dev/mapper/mpath-home-{{ item }}-part1
-Where=/home-adh/{{ item }}
-Type=ext4
-Options=rw,usrjquota=aquota.user,jqfmt=vfsv1,nosuid,nodev,nofail
-
-[Install]
-WantedBy=multi-user.target
--
GitLab
From caeb454401b4bfdb77fd9d837aff29533e25c7fc Mon Sep 17 00:00:00 2001
From: shirenn <shirenn@crans.org>
Date: Sun, 10 Jan 2021 15:41:25 +0100
Subject: [PATCH 2/3] =?UTF-8?q?Au=20revoir=20otis,=20tu=20vas=20manquer=20?=
=?UTF-8?q?=C3=A0=20Pollion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
roles/ansible/tasks/main.yml | 52 -------------------
.../templates/update-motd.d/05-service.j2 | 3 --
2 files changed, 55 deletions(-)
delete mode 100644 roles/ansible/tasks/main.yml
delete mode 100755 roles/ansible/templates/update-motd.d/05-service.j2
diff --git a/roles/ansible/tasks/main.yml b/roles/ansible/tasks/main.yml
deleted file mode 100644
index 5413589f..00000000
--- a/roles/ansible/tasks/main.yml
+++ /dev/null
@@ -1,52 +0,0 @@
----
-- name: Install ansible
- apt:
- update_cache: true
- name:
- - ansible
- register: apt_result
- retries: 3
- until: apt_result is succeeded
-
-- name: Create ansible directory
- file:
- path: /var/local/ansible
- state: directory
- mode: '2775'
- owner: root
- group: nounou
-
-- name: Set ACL for ansible directory
- acl:
- path: /var/local/ansible
- default: true
- entity: nounou
- etype: group
- permissions: rwx
- state: query
-
-- name: Clone Ansible project
- git:
- repo: 'http://gitlab.adm.crans.org/nounous/ansible.git'
- dest: /var/local/ansible
- umask: '002'
- version: 'master'
-
-- name: Indicate Ansible in motd
- template:
- src: update-motd.d/05-service.j2
- dest: /etc/update-motd.d/05-ansible
- mode: 0755
-
-- name: Enable automatic removal of stale sockets
- lineinfile:
- dest: /etc/ssh/sshd_config
- regexp: ^StreamLocalBindUnlink
- line: "StreamLocalBindUnlink yes # Enable automatic removal of stale sockets"
- state: absent
-
-- name: Restart sshd
- systemd:
- enabled: true
- state: restarted
- name: sshd
diff --git a/roles/ansible/templates/update-motd.d/05-service.j2 b/roles/ansible/templates/update-motd.d/05-service.j2
deleted file mode 100755
index 3c1935f2..00000000
--- a/roles/ansible/templates/update-motd.d/05-service.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/tail +14
-{{ ansible_header | comment }}
-[0m> [38;5;82mAnsible[0m a été déployé sur cette machine. Voir [38;5;6m/var/local/ansible/[0m.
--
GitLab
From b75c926ebb77dded68fb74f989fde1412258f20e Mon Sep 17 00:00:00 2001
From: shirenn <shirenn@crans.org>
Date: Sun, 10 Jan 2021 15:43:59 +0100
Subject: [PATCH 3/3] Merci pour tes bons et loyaux services backuppc
---
roles/backuppc/tasks/main.yml | 20 -------------------
.../templates/update-motd.d/05-service.j2 | 3 ---
2 files changed, 23 deletions(-)
delete mode 100644 roles/backuppc/tasks/main.yml
delete mode 100755 roles/backuppc/templates/update-motd.d/05-service.j2
diff --git a/roles/backuppc/tasks/main.yml b/roles/backuppc/tasks/main.yml
deleted file mode 100644
index bb1e89b2..00000000
--- a/roles/backuppc/tasks/main.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-- name: Install backuppc
- apt:
- update_cache: true
- name: backuppc
- register: apt_result
- retries: 3
- until: apt_result is succeeded
-
-- name: Disable mlocate indexation of backup files
- lineinfile:
- path: /etc/updatedb.conf
- regexp: '^PRUNEPATHS'
- line: PRUNEPATHS="/tmp /var/spool /media /var/lib/os-prober /var/lib/ceph /var/lib/backuppc /backup"
-
-- name: Indicate role in motd
- template:
- src: update-motd.d/05-service.j2
- dest: /etc/update-motd.d/05-backuppc
- mode: 0755
diff --git a/roles/backuppc/templates/update-motd.d/05-service.j2 b/roles/backuppc/templates/update-motd.d/05-service.j2
deleted file mode 100755
index e0e1810d..00000000
--- a/roles/backuppc/templates/update-motd.d/05-service.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/tail +14
-{{ ansible_header | comment }}
-[0m> [38;5;82mBackupPC[0m a été déployé sur cette machine. Voir [38;5;6m/etc/backuppc/[0m et [38;5;6m/var/lib/backuppc/[0m.
--
GitLab