diff --git a/all.yml b/all.yml index 87ea36586207a30700c241eab101c35761e7e9ac..83d22b72b0a66cb889b81bd7c1a3e9f4c801c430 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 64d78e9bc2a1131379fd712f219fbbc62d3b9c64..09ffad9e20b63832ceacc1ac163717e610200fd3 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 eaf09d01c289def975eb3ad4b451e36a5d013bce..b39bb870f26ec7e9f2d2084cc9c5c9f9048b32e9 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 3b9c40ce1aeb34a1eb064bcb86c131f02c40a26c..e29dee4cbe3599d2420508af5e9a1110703e85d3 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 2ffc403ae82f8ed5a4367b8f84610c04fd08c176..6e01acc36f5a78424bdb93a610dc48bf86913054 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 87b3899b82dcec609d3d7bf25590f221b05a4d44..b6f6ee91a23af165afd08f7ac01099d4f59c3563 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+