From c6bdf9cb61acaaafdb8109cb3418545940e5dffd Mon Sep 17 00:00:00 2001 From: freezed <git-expect-noreply@freezed.me> Date: Thu, 5 Jan 2023 09:30:58 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=20Reduce=20templates=20header?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tasks/files/sshd_config | 2 +- tasks/system_cfg/templates/ntpd.conf.j2 | 2 +- tasks/user_cfg/files/dotfiles/gitconfig | 7 +--- tasks/user_cfg/files/dotfiles/vimrc | 8 +---- tasks/user_cfg/files/dotfiles/zlogin | 7 +--- tasks/user_cfg/files/dotfiles/zlogout | 7 +--- tasks/user_cfg/files/dotfiles/zshenv | 7 +--- tasks/user_cfg/files/dotfiles/zshrc | 8 +---- tasks/user_cfg/templates/pruneconfig.j2 | 8 +---- tasks/user_cfg/templates/ssh-config.j2 | 44 ------------------------- tasks/user_cfg/templates/ssh_config.j2 | 8 +---- 11 files changed, 10 insertions(+), 98 deletions(-) delete mode 100644 tasks/user_cfg/templates/ssh-config.j2 diff --git a/tasks/files/sshd_config b/tasks/files/sshd_config index 5bacb89..be1872d 100644 --- a/tasks/files/sshd_config +++ b/tasks/files/sshd_config @@ -4,7 +4,7 @@ # This file is managed by Ansible # # Manual edition will be overridden # # # -# https://lab.frogg.it/fcode/ansible/debian # +# https://lab.frogg.it/freezed/ansible-debian # # # # ############################################# # diff --git a/tasks/system_cfg/templates/ntpd.conf.j2 b/tasks/system_cfg/templates/ntpd.conf.j2 index f9c6a26..37c2f70 100644 --- a/tasks/system_cfg/templates/ntpd.conf.j2 +++ b/tasks/system_cfg/templates/ntpd.conf.j2 @@ -5,7 +5,7 @@ # This file is managed by Ansible # # Manual edition will be overridden # # # -# https://lab.frogg.it/fcode/ansible/debian # +# https://lab.frogg.it/freezed/ansible-debian # # # # ############################################# # diff --git a/tasks/user_cfg/files/dotfiles/gitconfig b/tasks/user_cfg/files/dotfiles/gitconfig index 4a2e4cf..cae03f7 100644 --- a/tasks/user_cfg/files/dotfiles/gitconfig +++ b/tasks/user_cfg/files/dotfiles/gitconfig @@ -1,11 +1,6 @@ # ############################################# # -# ~/.gitconfig # -# # # This file is managed by Ansible # -# Manual edition will be overridden # -# # -# https://lab.frogg.it/fcode/ansible/debian # -# # +# https://lab.frogg.it/freezed/ansible-debian # # ############################################# # [color] diff --git a/tasks/user_cfg/files/dotfiles/vimrc b/tasks/user_cfg/files/dotfiles/vimrc index a65bfe1..7e87d1e 100644 --- a/tasks/user_cfg/files/dotfiles/vimrc +++ b/tasks/user_cfg/files/dotfiles/vimrc @@ -1,12 +1,6 @@ " """"""""""""""""""""""""""""""""""""""""""""" " -" ~/.vimrc " -" " " This file is managed by Ansible " -" Manual edition will be overridden " -" " -" https://lab.frogg.it/fcode/ansible/debian " -" http://formation-debian.via.ecp.fr/ " -" " +" https://lab.frogg.it/freezed/ansible-debian " " """"""""""""""""""""""""""""""""""""""""""""" " " ':help options.txt' ou ':help nom_du_paramètre' dans Vim diff --git a/tasks/user_cfg/files/dotfiles/zlogin b/tasks/user_cfg/files/dotfiles/zlogin index 7131f70..960bb83 100644 --- a/tasks/user_cfg/files/dotfiles/zlogin +++ b/tasks/user_cfg/files/dotfiles/zlogin @@ -1,11 +1,6 @@ # ############################################# # -# ~/.zlogin # -# # # This file is managed by Ansible # -# Manual edition will be overridden # -# # -# https://lab.frogg.it/fcode/ansible/debian # -# # +# https://lab.frogg.it/freezed/ansible-debian # # ############################################# # USAGE_FILE=/var/.usage diff --git a/tasks/user_cfg/files/dotfiles/zlogout b/tasks/user_cfg/files/dotfiles/zlogout index b2b9439..0b9f893 100644 --- a/tasks/user_cfg/files/dotfiles/zlogout +++ b/tasks/user_cfg/files/dotfiles/zlogout @@ -1,11 +1,6 @@ # ############################################# # -# ~/.zlogout # -# # # This file is managed by Ansible # -# Manual edition will be overridden # -# # -# https://lab.frogg.it/fcode/ansible/debian # -# # +# https://lab.frogg.it/freezed/ansible-debian # # ############################################# # echo "Exiting ${HOSTNAME}…" diff --git a/tasks/user_cfg/files/dotfiles/zshenv b/tasks/user_cfg/files/dotfiles/zshenv index 2bc3fe0..4226710 100644 --- a/tasks/user_cfg/files/dotfiles/zshenv +++ b/tasks/user_cfg/files/dotfiles/zshenv @@ -1,11 +1,6 @@ # ############################################# # -# ~/.zshenv # -# # # This file is managed by Ansible # -# Manual edition will be overridden # -# # -# https://lab.frogg.it/fcode/ansible/debian # -# # +# https://lab.frogg.it/freezed/ansible-debian # # ############################################# # export PATH="/usr/local/bin:/usr/local/sbin:/bin:/usr/bin:/usr/sbin:/usr/bin/X11:/usr/X11R6/bin:/usr/games:/sbin:$HOME/bin:$HOME/.local/bin" diff --git a/tasks/user_cfg/files/dotfiles/zshrc b/tasks/user_cfg/files/dotfiles/zshrc index 3b71aaf..2040376 100644 --- a/tasks/user_cfg/files/dotfiles/zshrc +++ b/tasks/user_cfg/files/dotfiles/zshrc @@ -1,12 +1,6 @@ # ############################################# # -# ~/.zshrc # -# # # This file is managed by Ansible # -# Manual edition will be overridden # -# # -# https://lab.frogg.it/fcode/ansible/debian # -# from http://formation-debian.via.ecp.fr # -# # +# https://lab.frogg.it/freezed/ansible-debian # # ############################################# # diff --git a/tasks/user_cfg/templates/pruneconfig.j2 b/tasks/user_cfg/templates/pruneconfig.j2 index bea383e..ebe9855 100644 --- a/tasks/user_cfg/templates/pruneconfig.j2 +++ b/tasks/user_cfg/templates/pruneconfig.j2 @@ -1,12 +1,6 @@ # ############################################# # -# GpsPrune config file # -# ~/.pruneconfig # -# # # This file is managed by Ansible # -# Manual edition will be overridden # -# # -# https://lab.frogg.it/fcode/ansible/debian # -# # +# https://lab.frogg.it/freezed/ansible-debian # # ############################################# # prune.unitsetkey=unitset.kilometres diff --git a/tasks/user_cfg/templates/ssh-config.j2 b/tasks/user_cfg/templates/ssh-config.j2 deleted file mode 100644 index 6e42c09..0000000 --- a/tasks/user_cfg/templates/ssh-config.j2 +++ /dev/null @@ -1,44 +0,0 @@ -#jinja2:lstrip_blocks: True -# ############################################# # -# This file is managed by Ansible # -# Manual edition will be overridden # -# https://lab.frogg.it/freezed/ansible-debian # -# ############################################# # - -{% if inventory_hostname in groups['station'] or inventory_hostname in groups['backup'] %} -# WAN - {% for host in groups['production'] %} -Host {{ host }} - User {{ hostvars[host]['my_user'] }} - Hostname {{ hostvars[host]['ansible_host'] }} - Port {{ hostvars[host]['ansible_port'] }} - {% endfor %} -{% endif %} - -{% if inventory_hostname in groups['station'] or inventory_hostname in groups['production'] %} -# BKP - {% for host in groups['backup'] %} -Host {{ host }} - User {{ hostvars[host]['my_user'] }} - Hostname {{ hostvars[host]['ansible_host'] }} - Port {{ hostvars[host]['ansible_port'] }} - {% endfor %} -{% endif %} - -{% if inventory_hostname in groups['station'] %} -# DEV - {% for host in groups['devel'] %} -Host {{ host }} - User {{ hostvars[host]['my_user'] }} - Hostname {{ hostvars[host]['ansible_host'] }} - Port {{ hostvars[host]['ansible_port'] }} - {% endfor %} - -# LOCAL - {% for host in groups['station'] %} -Host {{ host }} - User {{ hostvars[host]['my_user'] }} - Hostname {{ hostvars[host]['ansible_host'] }} - Port {{ hostvars[host]['ansible_port'] }} - {% endfor %} -{% endif %} diff --git a/tasks/user_cfg/templates/ssh_config.j2 b/tasks/user_cfg/templates/ssh_config.j2 index 12a8ffd..331ab2a 100644 --- a/tasks/user_cfg/templates/ssh_config.j2 +++ b/tasks/user_cfg/templates/ssh_config.j2 @@ -1,13 +1,7 @@ #jinja2:lstrip_blocks: True # ############################################# # -# SSH config file # -# ~/.ssh/config # -# # # This file is managed by Ansible # -# Manual edition will be overridden # -# # -# https://lab.frogg.it/fcode/ansible/debian # -# # +# https://lab.frogg.it/freezed/ansible-debian # # ############################################# # {% for host in groups['all'] %} -- GitLab