From 6bb927ffca9888f2905b7c6386c8813adad8c031 Mon Sep 17 00:00:00 2001
From: Alexandre Iooss <erdnaxe@crans.org>
Date: Sun, 29 Nov 2020 17:24:50 +0100
Subject: [PATCH] all.yml is back
---
all.yml | 3 ++-
hosts | 2 +-
plays/backup.yml | 14 +++++++-------
roles/common-tools/tasks/main.yml | 1 -
roles/moinmoin-gendoc/library/dmidecode.py | 2 +-
roles/moinmoin-gendoc/library/moinmoin_page.py | 2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/all.yml b/all.yml
index 87ea3658..83d22b72 100755
--- a/all.yml
+++ b/all.yml
@@ -8,7 +8,7 @@
- import_playbook: plays/mail.yml
- import_playbook: plays/nfs.yml
-- import_playbook: plays/logs.yml
+#- import_playbook: plays/logs.yml
- import_playbook: plays/backup.yml
- import_playbook: plays/network-interfaces.yml
- import_playbook: plays/monitoring.yml
@@ -29,6 +29,7 @@
- import_playbook: plays/mirror.yml
- import_playbook: plays/moinmoin.yml
- import_playbook: plays/nginx_rtmp.yml
+- import_playbook: plays/ntp.yml
- import_playbook: plays/owncloud.yml
- import_playbook: plays/postgresql.yml
- import_playbook: plays/re2o.yml
diff --git a/hosts b/hosts
index 64d78e9b..09ffad9e 100644
--- a/hosts
+++ b/hosts
@@ -145,4 +145,4 @@ ovh
[all:vars]
# Force remote to use Python 3
-ansible_python_interpreter=/usr/bin/python3
+ansible_python_interpreter=/usr/bin/env python3
diff --git a/plays/backup.yml b/plays/backup.yml
index eaf09d01..b39bb870 100755
--- a/plays/backup.yml
+++ b/plays/backup.yml
@@ -6,12 +6,12 @@
- import_playbook: get_adm_iface.yml
# Rsync client on all server to allow backup
-- hosts: server
- vars:
- # Backup password
- backuppc_rsyncd_passwd: "{{ vault_backuppc_rsyncd_passwd }}"
- roles: ["rsync-client"]
+#- hosts: server
+# vars:
+# # Backup password
+# backuppc_rsyncd_passwd: "{{ vault_backuppc_rsyncd_passwd }}"
+# roles: ["rsync-client"]
# Backuppc backup software
-- hosts: zephir.adm.crans.org,omnomnom.adm.crans.org
- roles: ["backuppc"]
+#- hosts: zephir.adm.crans.org,omnomnom.adm.crans.org
+# roles: ["backuppc"]
diff --git a/roles/common-tools/tasks/main.yml b/roles/common-tools/tasks/main.yml
index 3b9c40ce..e29dee4c 100644
--- a/roles/common-tools/tasks/main.yml
+++ b/roles/common-tools/tasks/main.yml
@@ -8,7 +8,6 @@
- sudo
- molly-guard # prevent reboot
- debsums
- - ntp # network time sync
- apt # better than apt-get
- nano # for vulcain
- vim # better than nano
diff --git a/roles/moinmoin-gendoc/library/dmidecode.py b/roles/moinmoin-gendoc/library/dmidecode.py
index 2ffc403a..6e01acc3 100644
--- a/roles/moinmoin-gendoc/library/dmidecode.py
+++ b/roles/moinmoin-gendoc/library/dmidecode.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
# Written By - Rishabh Das <rishabh5290@gmail.com>
# Modified By - Alexandre Iooss <erdnaxe@crans.org>
diff --git a/roles/moinmoin-gendoc/library/moinmoin_page.py b/roles/moinmoin-gendoc/library/moinmoin_page.py
index 87b3899b..b6f6ee91 100644
--- a/roles/moinmoin-gendoc/library/moinmoin_page.py
+++ b/roles/moinmoin-gendoc/library/moinmoin_page.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
# Copyright: (c) 2019, Alexandre Iooss <erdnaxe@crans.org>
# GNU General Public License v3.0+
--
GitLab