From 790cf9f0a65750ff975d6b992876697acb8f6a79 Mon Sep 17 00:00:00 2001 From: Cerena Hostains Date: Thu, 11 Jan 2024 15:22:20 +0100 Subject: [PATCH] modif fog --- roles/fog/defaults/main.yml | 5 ++- roles/fog/files/fogsettings | 19 +++++----- roles/fog/tasks/main.yml | 71 +++++++++++-------------------------- 3 files changed, 31 insertions(+), 64 deletions(-) diff --git a/roles/fog/defaults/main.yml b/roles/fog/defaults/main.yml index 7c9e726..0086a1a 100644 --- a/roles/fog/defaults/main.yml +++ b/roles/fog/defaults/main.yml @@ -1,4 +1,3 @@ depl_url: "http://s-adm.gsb.adm/gsbstore" -depl_fog: "fogproject-1.5.10.tar.gz" -instructions: "Pour lancer l'installateur Fog, faites : 'bash /root/tools/fog/bin/installfog.sh'. Suivez ensuite les instructions" - +depl_fog: "fogproject-1.5.9.tar.gz" +instructions: "Pour lancer l'installateur Fog, faites : 'bash /root/tools/fog/bin/installfog.sh'. Suivez ensuite les instructions" diff --git a/roles/fog/files/fogsettings b/roles/fog/files/fogsettings index 2d2c07a..7afe97a 100644 --- a/roles/fog/files/fogsettings +++ b/roles/fog/files/fogsettings @@ -3,7 +3,7 @@ ## Find more information about this file in the FOG Project wiki: ## https://wiki.fogproject.org/wiki/index.php?title=.fogsettings ## Version: 1.5.10 -## Install time: jeu. 11 janv. 2024 +## Install time: jeu. 11 janv. 2024 11:41:05 ipaddress='172.16.64.16' copybackold='0' interface='enp0s9' @@ -25,25 +25,22 @@ snmysqluser='fogmaster' snmysqlpass='HHO5vSGqFiHE_9d2lja3' snmysqlhost='localhost' mysqldbname='fog' -installlang='1' +installlang='0' storageLocation='/images' fogupdateloaded=1 -docroot='/var/www/' +docroot='/var/www/html/' webroot='/fog/' caCreated='yes' -httpproto='https' +httpproto='http' startrange='172.16.64.10' endrange='172.16.64.254' -#bootfilename='undionly.kpxe' -packages='apache2 bc build-essential cpp curl g++ gawk gcc genisoimage gettext git gzip htmldoc isc-dhcp-server isolinux lftp libapache2-mod-php libc6 libcurl4 liblzma-dev m4 mariadb-client mariadb-server net-tools nfs-kernel-server openssh-server php php-bcmath php-cli php-curl php-fpm php-gd php-intl php-json php-ldap php-mbstring php-mysql tar tftpd-hpa tftp-hpa unzip vsftpd wget zlib1g' +bootfilename='undionly.kpxe' +packages='apache2 bc build-essential cpp curl g++ gawk gcc genisoimage git gzip htmldoc isc-dhcp-server isolinux lftp libapache2-mod-php7.4 libc6 libcurl4 li> noTftpBuild='' -tftpAdvOpts='' sslpath='/opt/fog/snapins/ssl/' backupPath='/home/' armsupport='0' -php_ver='8.2' -#php_verAdds='-7.4' +php_ver='7.4' +php_verAdds='-7.4' sslprivkey='/opt/fog/snapins/ssl//.srvprivate.key' -sendreports='Y' ## End of FOG Settings -# diff --git a/roles/fog/tasks/main.yml b/roles/fog/tasks/main.yml index 9a57890..13c8cd0 100644 --- a/roles/fog/tasks/main.yml +++ b/roles/fog/tasks/main.yml @@ -1,55 +1,26 @@ --- -- name: installation des paquets - apt: - state: present - name: - - apache2 - - curl - - git - - gzip - - isc-dhcp-server - - mariadb-client - - mariadb-server - - net-tools - - openssh-server - - php - - php-cli - - php-curl - - php-fpm - - php-gd - - php-intl - - php-json - - php-ldap - - php-mbstring - - php-mysql - - tar - - unzip - - vsftpd - - wget +- name: creation d'un repertoire fog + file: + path: /root/tools/fog + state: directory + +- name: recuperation de l'archive d'installation fog sur git + git: + repo: https://gitea.lyc-lecastel.fr/gadmin/fog.git + dest: /root/tools/fog/ + clone: yes + update: yes + +- name: Modification fichier bash (desac UDPCast) + ansible.builtin.lineinfile: + path: /root/tools/fog/lib/common/functions.sh + regexp: '^configureUDPCast\(\).*' + line: "configureUDPCast() {\nreturn" + backup: yes - name: fichier config fogsettings - copy: - src: fogsettings - dest: "/tmp" + command: "cp /root/tools/ansible/roles/fog/files/fogsettings /opt/fog/" -- name: recuperation de l archive d'installation fog - get_url: - url: "{{ depl_url }}/{{ depl_fog }}" - dest: "/tmp/" +- name: fichier fogsettings en .fogsettings + command: "mv /opt/fog/fogsettings /opt/fog/.fogsettings" -- name: Décompression de l'archive - ansible.builtin.unarchive: - src: "/tmp/{{ depl_fog }}" - dest: "/tmp/" - -- name: exécution du script d'installation de fog - ansible.builtin.shell: sudo bash installfog.sh --recreate-keys -f /tmp/fogsettings -y - args: - chdir: /tmp/fogproject-1.5.10/bin/ - - -#- name: exécution du script d'installation de fog -# ansible.builtin.shell: sudo bash /tmp/fogproject-1.5.10/bin/installfog.sh --recreate-keys -f /tmp/fogsettings -# args: -# chdir: /tmp/fogproject-1.5.10 -#