From c7b6f93205e23ebeb9093719e73c45f78dbd0317 Mon Sep 17 00:00:00 2001 From: rick Date: Sat, 11 Jun 2022 16:29:18 +0200 Subject: [PATCH] change name for cgit's role --- README.md | 7 +++---- main.yml | 6 +++++- .../{installations => cgit}/handlers/main.yml | 0 .../tasks/cgit.yml => cgit/tasks/main.yml} | 0 .../templates/cgit-nginx | 0 .../{installations => cgit}/templates/cgitrc | 0 .../templates/config-cgit.conf | 0 roles/installations/tasks/main.yml | 20 ------------------- 8 files changed, 8 insertions(+), 25 deletions(-) rename roles/{installations => cgit}/handlers/main.yml (100%) rename roles/{installations/tasks/cgit.yml => cgit/tasks/main.yml} (100%) rename roles/{installations => cgit}/templates/cgit-nginx (100%) rename roles/{installations => cgit}/templates/cgitrc (100%) rename roles/{installations => cgit}/templates/config-cgit.conf (100%) delete mode 100644 roles/installations/tasks/main.yml diff --git a/README.md b/README.md index 035f2fe..c93848e 100644 --- a/README.md +++ b/README.md @@ -15,13 +15,12 @@ de test. ## vars -### sites - -Contient les différents noms de domains à utiliser. +* sites : Contient les différents noms de domains à utiliser. +* cgit : variables pour cgit ## cgit -Ces fichiers se trouvent dans `roles/installations/` dans les dossiers `tasks` +Ces fichiers se trouvent dans `roles/cgit/` dans les dossiers `tasks` et `templates`. - cgit.yml : script ansible d'installation diff --git a/main.yml b/main.yml index d63108f..9a5d963 100644 --- a/main.yml +++ b/main.yml @@ -25,6 +25,10 @@ - vars/sites.yml - vars/cgit.yml vars: + pounce_user: "pounce" + pounce_home: "/home/{{ pounce_user }}" + pounce_build: "{{ pounce_home }}/pounce_build" + litterbox_build: "{{ pounce_home}}/litterbox" pre_tasks: - name: update de la machine @@ -44,7 +48,7 @@ - python3-pip roles: - - installations + - cgit post_tasks: - name: démarrage par défaut de nginx diff --git a/roles/installations/handlers/main.yml b/roles/cgit/handlers/main.yml similarity index 100% rename from roles/installations/handlers/main.yml rename to roles/cgit/handlers/main.yml diff --git a/roles/installations/tasks/cgit.yml b/roles/cgit/tasks/main.yml similarity index 100% rename from roles/installations/tasks/cgit.yml rename to roles/cgit/tasks/main.yml diff --git a/roles/installations/templates/cgit-nginx b/roles/cgit/templates/cgit-nginx similarity index 100% rename from roles/installations/templates/cgit-nginx rename to roles/cgit/templates/cgit-nginx diff --git a/roles/installations/templates/cgitrc b/roles/cgit/templates/cgitrc similarity index 100% rename from roles/installations/templates/cgitrc rename to roles/cgit/templates/cgitrc diff --git a/roles/installations/templates/config-cgit.conf b/roles/cgit/templates/config-cgit.conf similarity index 100% rename from roles/installations/templates/config-cgit.conf rename to roles/cgit/templates/config-cgit.conf diff --git a/roles/installations/tasks/main.yml b/roles/installations/tasks/main.yml deleted file mode 100644 index 3279fef..0000000 --- a/roles/installations/tasks/main.yml +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# installation et configuration des services de l'infra -# -# Copyright (C) 2022 rick G. -# -# This program is free software: you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation, either version 3 of the License, or (at your option) any later -# version. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# this program. If not, see . -################################################################################ - ---- -- include_tasks: cgit.yml