From d9fd5a1fc9e0664668eb7ee665a841e577266ae7 Mon Sep 17 00:00:00 2001 From: southerntofu Date: Wed, 15 Apr 2020 19:25:36 +0000 Subject: [PATCH] =?UTF-8?q?Les=20paquets=20pour=20les=20SSG=20sont=20insta?= =?UTF-8?q?ll=C3=A9s=20par=20un=20gestionnaire=20de=20paquets=20"custom"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.yml | 2 +- roles/{.ssg => .custom}/files/zola/zola | Bin roles/{.ssg => .custom}/tasks/main.yml | 12 ++++++------ roles/{.ssg => .custom}/tasks/ttbp/main.yml | 0 roles/{.ssg => .custom}/tasks/zola/main.yml | 0 roles/README.md | 1 + 6 files changed, 8 insertions(+), 7 deletions(-) rename roles/{.ssg => .custom}/files/zola/zola (100%) rename roles/{.ssg => .custom}/tasks/main.yml (58%) rename roles/{.ssg => .custom}/tasks/ttbp/main.yml (100%) rename roles/{.ssg => .custom}/tasks/zola/main.yml (100%) create mode 100644 roles/README.md diff --git a/config.yml b/config.yml index c8c772c..8d5bd68 100644 --- a/config.yml +++ b/config.yml @@ -7,7 +7,7 @@ peers: packages: debian: [ subversion, mercurial, htop, tmux, vim, emacs, mutt, weechat, elinks, rsync, dnsutils, make, g++, libssl-dev, mosh, gopher, sl ] rust: [ lsd ] - ssg: [ zola, ttbp ] + custom: [ zola, ttbp ] users: - name: tofu sudo: true diff --git a/roles/.ssg/files/zola/zola b/roles/.custom/files/zola/zola similarity index 100% rename from roles/.ssg/files/zola/zola rename to roles/.custom/files/zola/zola diff --git a/roles/.ssg/tasks/main.yml b/roles/.custom/tasks/main.yml similarity index 58% rename from roles/.ssg/tasks/main.yml rename to roles/.custom/tasks/main.yml index 3cae4f8..a0e159c 100644 --- a/roles/.ssg/tasks/main.yml +++ b/roles/.custom/tasks/main.yml @@ -2,13 +2,13 @@ # parce qu'on vérifie que le binaire est installé # A terme, ça sera à chaque paquet de vérifier lui-même s'il est installé -- name: Vérifier quels SSG sont installés - stat: +# Vérifier quels paquets custom sont installés +- stat: path: "/usr/local/bin/{{ item }}" - loop: "{{ packages.ssg }}" - register: ssg_exists + loop: "{{ packages.custom }}" + register: custom_exists -- name: "Installer les générateurs de sites statiques activés dans la config" +- name: "Installer les paquets custom activés dans la config" include: "{{ item.item }}/main.yml" - loop: "{{ ssg_exists.results | default([]) }}" + loop: "{{ custom_exists.results | default([]) }}" when: not item.stat.exists diff --git a/roles/.ssg/tasks/ttbp/main.yml b/roles/.custom/tasks/ttbp/main.yml similarity index 100% rename from roles/.ssg/tasks/ttbp/main.yml rename to roles/.custom/tasks/ttbp/main.yml diff --git a/roles/.ssg/tasks/zola/main.yml b/roles/.custom/tasks/zola/main.yml similarity index 100% rename from roles/.ssg/tasks/zola/main.yml rename to roles/.custom/tasks/zola/main.yml diff --git a/roles/README.md b/roles/README.md new file mode 100644 index 0000000..b498238 --- /dev/null +++ b/roles/README.md @@ -0,0 +1 @@ +Les rôles qui commencent par . (.debian, .rust, .custom) sont des gestionnaires de paquets. Il suffit de rajouter une clé dans packages dans la configuration du serveur pour créer un nouveau gestionnaire de paquet qui sera appelé ici.