decorrelation SITE et sous domain

[lhc/ansible.git] / tasks / config_paheko.yml

diff --git a/tasks/config_paheko.yml b/tasks/config_paheko.yml
index 904aff5..2c5748d 100644 (file)
--- a/tasks/config_paheko.yml
+++ b/tasks/config_paheko.yml
@@ -1,3 +1,6 @@
+- name: Etckeeper commit if necessary
+  ansible.builtin.command: etckeeper commit "commit by ansible because installing {{ DOMAIN }}/{{ SITE }}"
+
 - name: Install required packages
   ansible.builtin.apt:
     name:
@@ -5,8 +8,10 @@
       - php-sqlite3
       - php-intl
       - php-cli
+      - imagemagick
       - php-imagick
       - php-mbstring
+      - php-gnupg
     state: present
   register: php_install
 
@@ -14,23 +19,12 @@
   ansible.builtin.command: phpenmod sqlite3 imagick intl
   when: php_install.changed
 
-- name: Ajout de l'utilisateur php_SIGLE_SITE
-  ansible.builtin.user:
-    name: "php_{{ SIGLE }}_{{ SITE }}"
-    home: "/etc/php/{{ php_version }}/fpm/{{ TLD }}/{{ DOMAIN }}/{{ SITE }}"
-    shell: /bin/false
-    system: true
-    append: true
-    create_home: false
-    password: '!'
-#    group: "php_{{ SIGLE }}_{{ SITE }}"
-
 - name: Bloc paheko_version
   when: paheko_version is undefined
   block:
-    - name: Demande la version de nextcloud à installer
+    - name: Demande la version de paheko à installer
       ansible.builtin.pause:
-        prompt: "Quelle version de nextcloud doit être utilisé"
+        prompt: "Quelle version de paheko doit être utilisé"
         echo: true
       register: paheko_version_prompt
 
@@ -72,7 +66,7 @@
         dest: "/home/sites/data/paheko/{{ paheko_version }}.tar.gz"
         mode: '755' # or u=rwx,g=rx,o=rx
 
-    - name: Extract downloaded nextcloud source
+    - name: Extract downloaded paheko source
       become: true
       become_user: www-data
       ansible.builtin.unarchive:
@@ -87,10 +81,10 @@
       ansible.builtin.copy:
         src: "/home/sites/data/paheko/paheko-{{ paheko_version }}/"
         dest: "/home/sites/data/paheko/{{ paheko_version }}"
-        remote_src: true # because the config file is already in the nextcloud_tmp_path
+        remote_src: true # because the config file is already on the paheko path
         mode: preserve
 
-    - name: Deleted downloaded nextcloud files
+    - name: Deleted downloaded paheko files
       become: true
       ansible.builtin.file:
         path: "{{ item }}"
@@ -106,24 +100,17 @@
     src: "/home/sites/data/paheko/{{ paheko_version }}/"
     dest: "/home/sites/data/{{ TLD }}/{{ DOMAIN }}/{{ SITE }}"
     remote_src: true # because the config file is already in the nextcloud_tmp_path
+    mode: '2750'
 
 - name: Modification du propriétaire group et droits du dossier
   ansible.builtin.file:
     path: "/home/sites/data/{{ TLD }}/{{ DOMAIN }}/{{ SITE }}/"
     state: directory
     owner: "php_{{ SIGLE }}_{{ SITE }}"
-    group: "php_{{ SIGLE }}_{{ SITE }}"
-    mode: '644'
+    group: "site_{{ SIGLE }}_{{ SITE }}"
+    mode: '2750'
     recurse: true
 
-- name: Boucle d'ajout du user php dans plusieurs groupe
-  ansible.builtin.user:
-    name: "php_{{ SIGLE }}_{{ SITE }}"
-    groups: "{{ item }}"
-    append: true
-  loop:
-    - "site_{{ SIGLE }}_{{ SITE }}"
-
 # - name: Change displayed icon
 #   ansible.builtin.copy:
 #     src: "{{ icon }}"
@@ -136,7 +123,7 @@
 #     dest: "/usr/share/garradin/www/admin/static/favicon{{ icon | splitext | last }}"
 #   when: favicon is defined
 
-- name: Recharger PHP service
+- name: Recharger PHP et nginx
   ansible.builtin.service:
     name: "{{ item }}"
     state: reloaded