X-Git-Url: http://git.cyclocoop.org/%22%20url%20%22?a=blobdiff_plain;f=creation_nouveau_site.yml;fp=creation_nouveau_site.yml;h=083f23c6cda2cf27765b8dd2ce28493ed6245ad9;hb=d2ef9c4c99e81dc58f3d4346c362eae2c4d7915b;hp=9923ad6d81824e78473f15f47ce67fe41f535f61;hpb=058c0e0c1ce6fc1fb225fceb18cc8898f9a2a063;p=lhc%2Fansible.git

diff --git a/creation_nouveau_site.yml b/creation_nouveau_site.yml
index 9923ad6..083f23c 100644
--- a/creation_nouveau_site.yml
+++ b/creation_nouveau_site.yml
@@ -13,7 +13,7 @@
   vars_prompt:
 
     - name: SITE
-      prompt: 'quel type de site?(ex: nuage, www, wiki, paheko ou gestion)'
+      prompt: 'quel type de site?(ex: nuage, www, paheko ou WP)'
       private: false
       default: "nuage"
 
@@ -32,55 +32,38 @@
       private: false
       default: "lhc"
 
-    - name: config_php
-      prompt: 'Faut-il configurer un pool PHP?(ex: oui/non)'
-      private: false
-      default: "non"
-
     - name: besoin_https
       prompt: 'Faut-il configurer un certificat ssl pour le HTTPS?(ex: oui/non)'
       private: false
       default: "non"
 
-    - name: sftp
-      prompt: 'besoin de configurer un accès SFTP pour ce compte (ex: oui/non)'
-      private: false
-      default: "non"
-
-    - name: sftp_key
-      prompt: "Entrer la clé publique à autoriser pour l'acces SFTP (si nécessaire)"
-      private: false
-      default: "non"
-
-  pre_tasks:
+  # pre_tasks:
 
-    - name: Vérifier le sigle n'est pas déjà utilisé
-      ansible.builtin.lineinfile:
-        dest: /etc/passwd
-        search_string: "site_{{ SIGLE }}_{{ SITE }}"
-        state: absent
-      check_mode: true
-      changed_when: false
-      register: presence_sigle
-      failed_when: presence_sigle.changed
+  #   - name: Vérifier le sigle n'est pas déjà utilisé
+  #     ansible.builtin.lineinfile:
+  #       dest: /etc/passwd
+  #       search_string: "site_{{ SIGLE }}_{{ SITE }}"
+  #       state: absent
+  #     check_mode: true
+  #     changed_when: false
+  #     register: presence_sigle
+  #     failed_when: presence_sigle.changed
 
   tasks:
 
     - name: Inclure la configuration d'un site web basique
       ansible.builtin.include_tasks: tasks/config_www.yml
 
+    - name: Inclure les configurations optionnelles d'un site www
+      ansible.builtin.include_tasks: tasks/config_options_www.yml
+      when: SITE != 'nuage'
+
     - name: Inclure la configuration nginx
       ansible.builtin.include_tasks: tasks/config_nginx.yml
       vars:
         template_site: "{{ SITE }}"
       when: besoin_https == 'non'
 
-# scenario pre-install nginx sans ssl
-# test installed=false or needupgrade:true
-# test installed=true et needupgrade:false
-# puis certbot à la fin
-# puis template nginx ssl pour test manuel
-
     - name: Bloc permettant de générer les certificats SSL
       when: besoin_https == 'oui'
       block:
@@ -113,7 +96,15 @@
 
     - name: Inclure la configuration d'un pool PHP
       ansible.builtin.include_tasks: tasks/config_pool_php.yml
-      when: config_php == 'oui' or SITE == 'paheko' or SITE == 'gestion' or SITE == 'nuage'
+      when: config_php == 'oui' or SITE == 'paheko' or SITE == 'WP' or SITE == 'nuage'
+
+    - name: Inclure la configuration d'une bdd postgres
+      ansible.builtin.include_tasks: tasks/config_bdd_postgres.yml
+      when: config_bdd == 'postgres' or SITE == 'nuage'
+
+    - name: Inclure la configuration d'une bdd mariadb
+      ansible.builtin.include_tasks: tasks/config_bdd_mariadb.yml
+      when: config_bdd == 'mariadb' or SITE == 'WP'
 
     - name: Inclure la configuration nextcloud si besoin
       ansible.builtin.include_tasks: tasks/config_nuage.yml
@@ -121,7 +112,11 @@
 
     - name: Inclure la configuration paheko si besoin
       ansible.builtin.include_tasks: tasks/config_paheko.yml
-      when: SITE == 'paheko' or SITE == 'gestion'
+      when: SITE == 'paheko'
+
+    - name: Inclure la configuration WP si besoin
+      ansible.builtin.include_tasks: tasks/config_wp.yml
+      when: SITE == 'WP'
 
     - name: Inclure le configuration du backup
       ansible.builtin.include_tasks: tasks/config_backup.yml