From abc6086318f9b08ad30939fc95ef831d2eecca85 Mon Sep 17 00:00:00 2001 From: shirenn Date: Tue, 8 Nov 2022 15:26:35 +0100 Subject: [PATCH] [root & more] Little overall --- plays/proxmox.yml | 1 - plays/root.yml | 19 ++--- plays/users.yml | 14 ++++ plays/utilities.yml | 6 -- plays/vm_setup.yml | 11 --- roles/common-tools/tasks/main.yml | 2 - roles/network-interfaces/tasks/main.yml | 9 +-- roles/prometheus-node-exporter/tasks/main.yml | 3 +- roles/root-config/templates/nanorc.j2 | 69 +------------------ 9 files changed, 26 insertions(+), 108 deletions(-) create mode 100755 plays/users.yml diff --git a/plays/proxmox.yml b/plays/proxmox.yml index 88b3557a..fb7ab11b 100755 --- a/plays/proxmox.yml +++ b/plays/proxmox.yml @@ -5,6 +5,5 @@ debian_images: "{{ glob_debian_images | default({}) | combine(loc_debian_images | default({})) }}" service: "{{ glob_service_proxmox_user | default({}) | combine(loc_service_proxmox_user | default({})) }}" roles: - - proxmox-apt-sources - proxmox-debian-images - service diff --git a/plays/root.yml b/plays/root.yml index c00ed336..48b558c2 100755 --- a/plays/root.yml +++ b/plays/root.yml @@ -12,22 +12,9 @@ - import_playbook: baie.yml - import_playbook: utilities.yml -- import_playbook: slapd.yml +- import_playbook: users.yml - import_playbook: proxmox.yml -- hosts: server,!sssd - vars: - ldap: "{{ glob_ldap | combine(loc_ldap | default({})) }}" - roles: - - ldap-client - -- hosts: server,!ovh_physical,!tealc.adm.crans.org,!sam.adm.crans.org,!routeur-sam.adm.crans.org,!ft.adm.crans.org,!thot.adm.crans.org - vars: - nfs_mount: "{{ glob_home_nounou | default({}) | combine(loc_home_nounou | default({})) }}" - roles: - - nfs-common - - nfs-mount - - hosts: server, !rsyslog_server vars: rsyslog_client: "{{ glob_rsyslog_client | default({}) | combine(loc_rsyslog_client | default({})) }}" @@ -45,3 +32,7 @@ - import_playbook: borgbackup_client.yml - import_playbook: network_interfaces.yml - import_playbook: nullmailer.yml + +- hosts: server,!virtu + roles: + - openssh diff --git a/plays/users.yml b/plays/users.yml new file mode 100755 index 00000000..a6522ad1 --- /dev/null +++ b/plays/users.yml @@ -0,0 +1,14 @@ +#!/usr/bin/env ansible-playbook +--- +- hosts: server,!sssd + vars: + ldap: "{{ glob_ldap | combine(loc_ldap | default({})) }}" + roles: + - ldap-client + +- hosts: server,!ovh_physical,!tealc.adm.crans.org,!sam.adm.crans.org,!routeur-sam.adm.crans.org,!ft.adm.crans.org,!thot.adm.crans.org + vars: + nfs_mount: "{{ glob_home_nounou | default({}) | combine(loc_home_nounou | default({})) }}" + roles: + - nfs-common + - nfs-mount diff --git a/plays/utilities.yml b/plays/utilities.yml index 9d14aeb9..8c62ee10 100755 --- a/plays/utilities.yml +++ b/plays/utilities.yml @@ -1,7 +1,5 @@ #!/usr/bin/env ansible-playbook --- -- import_playbook: ssh_known_hosts.yml - - hosts: server vars: root: "{{ glob_root | default({}) | combine(loc_root | default({})) }}" @@ -12,7 +10,3 @@ - sudo - ntp-client - root-config - -- hosts: server,!virtu - roles: - - openssh diff --git a/plays/vm_setup.yml b/plays/vm_setup.yml index 13cd8c9c..7105fa6f 100755 --- a/plays/vm_setup.yml +++ b/plays/vm_setup.yml @@ -4,14 +4,3 @@ roles: - qemu-guest-agent - serial-tty - -- hosts: crans_vm - tasks: - - name: Remove cloud-init - apt: - name: cloud-init - state: absent - purge: true - register: apt_result - retries: 3 - until: apt_result is succeeded diff --git a/roles/common-tools/tasks/main.yml b/roles/common-tools/tasks/main.yml index 178d6cb8..1d5d0cc5 100644 --- a/roles/common-tools/tasks/main.yml +++ b/roles/common-tools/tasks/main.yml @@ -14,14 +14,12 @@ - emacs-nox # for maman - git # code versioning - htop # better than top - - iotop # monitor i/o - less # i like cats - lsb-release # needed to autodetect Debian version - lsscsi # to list SCSI devices - molly-guard # prevent reboot - nano # for vulcain - needrestart # ask to restart services after upgrade - - resolvconf # for dns configuration in network interfaces - screen # Vulcain asked for this - sudo - tmux # better than screen diff --git a/roles/network-interfaces/tasks/main.yml b/roles/network-interfaces/tasks/main.yml index ac71ba7c..503a9c42 100644 --- a/roles/network-interfaces/tasks/main.yml +++ b/roles/network-interfaces/tasks/main.yml @@ -2,7 +2,9 @@ - name: Install vlan support apt: update_cache: true - name: vlan + name: + - vlan + - resolvconf state: present register: apt_result retries: 3 @@ -14,11 +16,6 @@ dest: /etc/network/interfaces mode: 0644 -- name: Remove cloud-init interface configuration - file: - path: /etc/network/interfaces.d/50-cloud-init - state: absent - - name: Deploy interfaces config template: src: network/interfaces.d/ifalias.j2 diff --git a/roles/prometheus-node-exporter/tasks/main.yml b/roles/prometheus-node-exporter/tasks/main.yml index 5f44f637..b19400c9 100644 --- a/roles/prometheus-node-exporter/tasks/main.yml +++ b/roles/prometheus-node-exporter/tasks/main.yml @@ -16,8 +16,7 @@ register: apt_result retries: 3 until: apt_result is succeeded - when: - - ansible_lsb.codename == 'bullseye' + when: ansible_distribution_release == 'bullseye' - name: Make Prometheus node-exporter listen on adm only lineinfile: diff --git a/roles/root-config/templates/nanorc.j2 b/roles/root-config/templates/nanorc.j2 index af141755..cb70fa4c 100644 --- a/roles/root-config/templates/nanorc.j2 +++ b/roles/root-config/templates/nanorc.j2 @@ -18,7 +18,7 @@ ## ", ', ), >, ], and }. ## Use auto-indentation. - set autoindent +set autoindent ## Backup files to filename~. # set backup @@ -242,68 +242,5 @@ set keycolor white # bind kdel backspace all -## Nanorc files -include "/usr/share/nano/nanorc.nanorc" - -## C/C++ -include "/usr/share/nano/c.nanorc" - -## Cascading Style Sheets -include "/usr/share/nano/css.nanorc" - -## Debian files -include "/usr/share/nano/debian.nanorc" - -## Gentoo files -include "/usr/share/nano/gentoo.nanorc" - -## HTML -include "/usr/share/nano/html.nanorc" - -## PHP -include "/usr/share/nano/php.nanorc" - -## TCL -include "/usr/share/nano/tcl.nanorc" - -## TeX -include "/usr/share/nano/tex.nanorc" - -## Quoted emails (under e.g. mutt) -include "/usr/share/nano/mutt.nanorc" - -## Patch files -include "/usr/share/nano/patch.nanorc" - -## Manpages -include "/usr/share/nano/man.nanorc" - -## Groff -include "/usr/share/nano/groff.nanorc" - -## Perl -include "/usr/share/nano/perl.nanorc" - -## Python -include "/usr/share/nano/python.nanorc" - -## Ruby -include "/usr/share/nano/ruby.nanorc" - -## Java -include "/usr/share/nano/java.nanorc" - -## AWK -include "/usr/share/nano/awk.nanorc" - -## Assembler -include "/usr/share/nano/asm.nanorc" - -## Bourne shell scripts -include "/usr/share/nano/sh.nanorc" - -## POV-Ray -include "/usr/share/nano/pov.nanorc" - -## XML-type files -include "/usr/share/nano/xml.nanorc" +## Color highlighting files +include "/usr/share/nano/*.nanorc"