X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=tasks%2Fconfig_www.yml;h=c1a4b20f67422ecba915af21e3f8d75b6e60f672;hb=HEAD;hp=d01c9bf1d42fe8b7ecb15e7d9565e145394bbb47;hpb=127e62e0da098421ca5cfa85e73648419c9ea17b;p=lhc%2Fansible.git

diff --git a/tasks/config_www.yml b/tasks/config_www.yml
index d01c9bf..b5ac3f4 100644
--- a/tasks/config_www.yml
+++ b/tasks/config_www.yml
@@ -1,7 +1,7 @@
 - name: Ajout de l'utilisateur site_SIGLE_SITE
   ansible.builtin.user:
-    name: "site_{{ SIGLE }}_{{ SITE }}"
-    home: "/home/sites/data/{{ TLD }}/{{ DOMAIN }}/{{ SITE }}"
+    name: "site_{{ SIGLE }}_{{ config_ss_domain }}"
+    home: "/home/sites/data/{{ TLD }}/{{ DOMAIN }}/{{ config_ss_domain }}"
     shell: /bin/false
     groups: www-data
     system: true
@@ -12,7 +12,7 @@
 - name: Boucle d'ajout d'user dans le groupe site_SIGLE_SITE
   ansible.builtin.user:
     name: "{{ item }}"
-    groups: "site_{{ SIGLE }}_{{ SITE }}"
+    groups: "site_{{ SIGLE }}_{{ config_ss_domain }}"
     append: true
   loop:
     - 'www-data'
@@ -25,6 +25,8 @@
     owner: "{{ item.owner }}"
     group: "{{ item.group }}"
     mode: "{{ item.mode }}"
+  vars:
+    concat: "site_{{ SIGLE }}_{{ config_ss_domain }}"
   loop_control:
     label: "{{ item.path }}"
   loop:
@@ -38,8 +40,8 @@
       owner: 'root'
       group: 'www-data'
       mode: '2751'
-    - path: "/home/sites/data/{{ TLD }}/{{ DOMAIN }}/{{ SITE }}"
+    - path: "/home/sites/data/{{ TLD }}/{{ DOMAIN }}/{{ config_ss_domain }}"
       state: directory
-      owner: 'root'
-      group: "site_{{ SIGLE }}_{{ SITE }}"
+      owner: "{{ ( SITE in ['www','WP'] ) | ternary ( concat , 'root' ) }}"
+      group: "site_{{ SIGLE }}_{{ config_ss_domain }}"
       mode: '2750'