Merge branch 'master' of https://gitea.lyc-lecastel.fr/gadmin/gsb2020

roles/docker-nextcloud/tasks/main.yml

@@ -2,6 +2,7 @@
 - name: Creation du repertoire nextcloud
   file:
     path: /root/nextcloud
+    state: directory
 
 - name: Copie du script get_docker
   copy: 
@@ -11,12 +12,20 @@
 - name: Execution du script get_docker
   script: /root/nextcloud/get_docker.sh
 
-- name: Copie de docker-compose
-  copy: 
-    src: docker-compose.yml
-    dest: /usr/local/bin
+- name: Installation de docker-compose
+  shell: curl -L "https://github.com/docker/compose/releases/download/1.28.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
 
-- name: Execution de la commande docker-compose up -d
-  shell:
-    cmd: docker-compose up -d
+- name: Attribution des droits de docker compose
+  file:
+    path: /usr/local/bin/docker-compose
+    mode: '755'
+
+- name: Copie de docker-compose.yml
+  copy: 
+    src: /root/tools/ansible/gsb2021/roles/docker-nextcloud/files/docker-compose.yml
+    dest: /root/nextcloud
+
+- name: Execution du fichier docker-compose.yml
+  shell: docker-compose up -d
+  args:
     chdir: /root/nextcloud

roles/s-lb-wordpress/defaults/main.yml

@@ -0,0 +1,2 @@
+depl_url: "http://s-adm.gsb.adm/gsbstore/"
+depl_wordpress: "wordpress-5.6-fr_FR.tar.gz"

roles/s-lb-wordpress/tasks/main.yml

@@ -5,9 +5,11 @@
     state: directory
  - name: download and extract wordpress
    unarchive: 
-    src: http://depl/gsbstore/wordpress-5.6-fr_FR.tar.gz
+    src: "{{ depl_url }}/{{ depl_wordpress }}"
     dest: /home/
     remote_src: yes
+    owner: www-data
+    group: www-data
 
  - name: Copy sample config file
    command: mv /home/wordpress/wp-config-sample.php /home/wordpress/wp-config.php creates=/home/wordpress/wp-config.php

s-mess.retry

@@ -0,0 +1 @@
+localhost

s-nas.retry

@@ -0,0 +1 @@
+localhost