Merge branch 'main' of https://gitea.lyc-lecastel.fr/gadmin/gsb2023

pre/inst-depl

@@ -9,16 +9,23 @@ apt update && apt upgrade
 apt install -y apache2 git 
 STOREREP="/var/www/html/gsbstore" 
 
-GLPIREL=10.0.5
+GLPIREL=10.0.6
 str="wget -nc https://github.com/glpi-project/glpi/releases/download/${GLPIREL}/glpi-${GLPIREL}.tgz"
 
-FIREL=10.0.3+1.0
-str2="https://github.com/fusioninventory/fusioninventory-for-glpi/releases/download/glpi${FIREL}/fusioninventory-${FIREL}.tar.bz2"
 
-FIAGREL=2.6
+#Fusion Inventory
-str31="wget -nc https://github.com/fusioninventory/fusioninventory-agent/releases/download/${FIAGREL}/fusioninventory-agent_windows-x64_${FIAGREL}.exe"
+
+#FIREL=10.0.3+1.0
+#str2="https://github.com/fusioninventory/fusioninventory-for-glpi/releases/download/glpi${FIREL}/fusioninventory-${FIREL}.tar.bz2"
+
+
+#GLPI Agent
+
+GLPIAGVER=1.4
+str31="wget -nc https://github.com/glpi-project/glpi-agent/releases/download/${GLPIAGVER}/GLPI-Agent-${GLPIAGVER}-x64.msi"
+
+str32="wget -nc https://github.com/glpi-project/glpi-agent/releases/download/${GLPIAGVER}/GLPI-Agent-${GLPIAGVER}-x86.msi"
 
-str32="wget -nc https://github.com/fusioninventory/fusioninventory-agent/releases/download/${FIAGREL}/fusioninventory-agent_windows-x86_${FIAGREL}.exe"
 
 FOGREL=1.5.9
 str4="wget -nc https://github.com/FOGProject/fogproject/archive/${FOGREL}.tar.gz -O fogproject-${FOGREL}.tar.gz"

roles/glpi/defaults/main.yml

@@ -0,0 +1,6 @@
+depl_url: "http://s-adm.gsb.adm/gsbstore"
+#depl_glpi: "glpi-9.5.6.tgz"
+depl_glpi: "glpi-10.0.6.tgz"
+#depl_fusioninventory: "fusioninventory-9.5+3.0.tar.bz2"
+depl_glpi_agentx64: "GLPI-Agent-1.4-x64.msi"
+depl_glpi_agentx86: "GLPI-Agent-1.4-x86.msi"

roles/glpi/tasks/main.yml

@@ -105,12 +105,12 @@
 #  - name: copy .my.cnf file with root password credentials
 #    copy: src=.my.cnf dest=/root/tools/ansible/.my.cnf owner=root mode=0600
 
-  - name: Installation de Fusioninventory pour Linux
+#  - name: Installation de Fusioninventory pour Linux
-    unarchive:
+#    unarchive:
-      src: "{{ depl_url }}/{{ depl_fusioninventory }}"
+#      src: "{{ depl_url }}/{{ depl_fusioninventory }}"
-      #src: http://depl/gsbstore/fusioninventory-{{ fd_version }}.tar.bz2
+#src: http://depl/gsbstore/fusioninventory-{{ fd_version }}.tar.bz2
-      dest: /var/www/html/glpi/plugins
+#      dest: /var/www/html/glpi/plugins
-      remote_src: yes
+#      remote_src: yes
 
   - name: Creation de ficlient
     file:
@@ -127,15 +127,15 @@
       group: www-data
       mode: 0775
 
-  - name: Installation de FusionInventory windows x64
+  - name: Installation de GLPI Agent windows x64
     get_url:
-      url: "{{ depl_url }}/{{ depl_fusioninventory_agentx64 }}"
+      url: "{{ depl_url }}/{{ depl_glpi_agentx64 }}"
       dest: "/var/www/html/ficlients"
 
-  - name: Installation de FusionInventory windows x86
+#  - name: Installation de GLPI Agent windows x86
-    get_url:
+#    get_url:
-      url: "{{ depl_url }}/{{ depl_fusioninventory_agentx86 }}"
+#      url: "{{ depl_url }}/{{ depl_glpi_agentx86 }}"
-      dest: "/var/www/html/ficlients"
+#      dest: "/var/www/html/ficlients"
 
   - name: Attribution des permissions sur repertoire /plugins/fusioninventory
     file:

roles/itil/defaults/main.yml

@@ -1,6 +0,0 @@
-depl_url: "http://s-adm.gsb.adm/gsbstore"
-#depl_glpi: "glpi-9.5.6.tgz"
-depl_glpi: "glpi-10.0.5.tgz"
-depl_fusioninventory: "fusioninventory-9.5+3.0.tar.bz2"
-depl_fusioninventory_agentx64: "fusioninventory-agent_windows-x64_2.6.exe"
-depl_fusioninventory_agentx86: "fusioninventory-agent_windows-x86_2.6.exe"

roles/lb-nfs-client/tasks/main.yml

@@ -10,4 +10,4 @@
     dest: /etc/fstab
     regexp: ''
     insertafter: EOF
-    line: '192.168.102.253:/home/wordpress /var/www/html/wordpress nfs soft,timeo=5,intr,rsize=8192,wsize=8192,wsize=8192 0 0'
+    line: '192.168.102.253:/home/wordpress /var/www/html/ nfs soft,timeo=5,intr,rsize=8192,wsize=8192,wsize=8192 0 0'

roles/lb-web/tasks/main.yml

@@ -1,33 +1,10 @@
 ---
-  - name: installation php et apache ...
+- name: installation php et apache ...
-    apt:
+  apt:
-      name:
+    name:
-        - apache2
+      - apache2
-        - php
+      - php
-        - php-mbstring
+      - php-mbstring
-        - php-mysql
+      - php-mysql
-        - mariadb-client
+      - mariadb-client
-      state: present
+    state: present
-
- - name: download and extract wordpress
-   unarchive: 
-    src: https://fr.wordpress.org/latest-fr_FR.tar.gz 
-    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
-
- - name: Changement du fichier de conf
-   copy:
-     src: wp-config.php
-     dest: /home/wordpress/wp-config.php
-
- - name: Attributions des permissions
-   file:
-     path: /home/wordpress
-     recurse: yes
-     owner: 33
-     group: 33

s-itil.yml

@@ -2,23 +2,20 @@
 - hosts: localhost
   connection: local
 
-  vars:
+ #vars:
 
-    glpi_version: "9.4.5"
+    #glpi_version: "9.4.5"
-    fd_version: "9.4+1.1"
+    #glpi_dir: "/var/www/html/glpi"
-    fd_version64: "x64_2.5.2"
+    #glpi_dbhost: "127.0.0.1"
-    fd_version86: "x86_2.5.2"
+    #glpi_dbname: "glpi"
-    glpi_dir: "/var/www/html/glpi"
+    #glpi_dbuser: "glpi"
-    glpi_dbhost: "127.0.0.1"
+    #glpi_dbpasswd: "glpi"
-    glpi_dbname: "glpi"
-    glpi_dbuser: "glpi"
-    glpi_dbpasswd: "glpi"
 
   roles:
     - base
     - goss
     - snmp-agent
-    - itil
+    - glpi
     - ssh-cli
     - syslog-cli
     - post

s-lb-web1.yml

@@ -8,4 +8,3 @@
     - snmp-agent
     - lb-nfs-client
     - post
-

s-nas.yml

@@ -10,7 +10,6 @@
   roles:
     - base
     - snmp-agent
-    - lb-web
     - lb-nfs-server
     - ssh-cli
     - syslog-cli