From d62f39576f81c3e3224629f3526aa3cfa9fb1de5 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Fri, 3 May 2024 15:09:08 +0200
Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20de=20la=20partie=20Vagrant?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/Vagrantfile | 22 ++++++++++++----------
 test/vagrant.yml | 48 ++++--------------------------------------------
 2 files changed, 16 insertions(+), 54 deletions(-)

diff --git a/test/Vagrantfile b/test/Vagrantfile
index 264b2d5..b533ca7 100644
--- a/test/Vagrantfile
+++ b/test/Vagrantfile
@@ -34,7 +34,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     node.vm.hostname = "bookworm.evolix.net"
     node.vm.box = "debian/bookworm64"
 
-    node.vm.provision "apt update", type: "shell", inline: "apt update"
+    node.vm.provision "apt update", type: "shell", inline: "DEBIAN_FRONTEND=noninteractive apt-get --quiet update"
 
     node.vm.provision :ansible do |ansible|
       ansible.limit = "bookworm"
@@ -42,7 +42,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       # ansible.tags = "mysql"
       ansible.raw_arguments = [
         "-b",
-        "--ask-vault-pass",
+        # "--ask-vault-pass",
         # "--diff",
         # "--step",
         # "--syntax",
@@ -59,7 +59,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     node.vm.hostname = "bullseye.evolix.net"
     node.vm.box = "debian/bullseye64"
 
-    node.vm.provision "apt update", type: "shell", inline: "apt update"
+    node.vm.provision "apt update", type: "shell", inline: "DEBIAN_FRONTEND=noninteractive apt-get --quiet update"
 
     node.vm.provision :ansible do |ansible|
       ansible.limit = "bullseye"
@@ -67,7 +67,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       # ansible.tags = "mysql"
       ansible.raw_arguments = [
         "-b",
-        "--ask-vault-pass",
+        # "--ask-vault-pass",
         # "--diff",
         # "--step",
         # "--syntax",
@@ -84,7 +84,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     node.vm.hostname = "buster"
     node.vm.box = "debian/buster64"
 
-    node.vm.provision "apt update", type: "shell", inline: "apt update"
+    clean_backports_script = <<~SCRIPT
+      sed -i '/backports/d' /etc/apt/sources.list
+      DEBIAN_FRONTEND=noninteractive apt-get --quiet update
+    SCRIPT
+    node.vm.provision "backports", type: "shell", inline: clean_backports_script
 
     node.vm.provision :ansible do |ansible|
       ansible.limit = "buster"
@@ -92,7 +96,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       # ansible.tags = "mysql"
       ansible.raw_arguments = [
         "-b",
-        "--ask-vault-pass",
+        # "--ask-vault-pass",
         # "--diff",
         # "--step",
         # "--syntax",
@@ -107,7 +111,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     node.vm.box = "debian/stretch64"
 
     node.vm.provision "elts", type: "shell", inline: elts_script
-    node.vm.provision "apt update", type: "shell", inline: "apt update"
 
     node.vm.provision :ansible do |ansible|
       ansible.limit = "stretch"
@@ -115,7 +118,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       # ansible.tags = "mysql"
       ansible.raw_arguments = [
         "-b",
-        "--ask-vault-pass",
+        # "--ask-vault-pass",
         # "--diff",
         # "--step",
         # "--syntax",
@@ -137,7 +140,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     node.ssh.extra_args = old_ssh_options
 
     node.vm.provision "elts", type: "shell", inline: elts_script
-    node.vm.provision "apt update", type: "shell", inline: "apt update"
 
     node.vm.provision :ansible do |ansible|
       ansible.limit = "jessie"
@@ -146,7 +148,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       ansible.raw_ssh_args = old_ssh_options
       ansible.raw_arguments = [
         "-b",
-        "--ask-vault-pass",
+        # "--ask-vault-pass",
         # "--diff",
         # "--step",
         # "--syntax",
diff --git a/test/vagrant.yml b/test/vagrant.yml
index 2e80924..c6738e3 100644
--- a/test/vagrant.yml
+++ b/test/vagrant.yml
@@ -65,6 +65,10 @@
         release: buster
       - name: php74
         release: bullseye
+      - name: php82
+        release: bookworm
+      - name: php83
+        release: bookworm
     # evolinux_apt_public_sources: False
 
   # pre_tasks:
@@ -73,53 +77,9 @@
   #       var: hostvars[inventory_hostname]
 
   roles:
-    - bullseye-detect
-    # - aws-tuning
-    # - apt
     - evolinux-base
     - evolinux-users
-    # - { role: del-user, username: "gcolpart" }
-    # - metricbeat
-    # - { role: squid, squid_localproxy_enable: True }
-    # - apache
-    # - nginx
-    # - mysql
-    # - mysql-oracle
-    # - percona
-    # - postgresql
-    - packweb-apache
-    # - { role: packweb-apache, packweb_mysql_variant: "oracle" }
-    # - { role: memcached, memcached_instance_name: "instance1" }
-    # - { role: memcached, memcached_instance_name: "instance2", memcached_port: 11212 }
-    # - { role: redis }
-    # - { role: redis, redis_instance_name: "instance1", redis_port: 6380 }
-    # - { role: redis, redis_instance_name: "instance2", redis_port: 6381 }
-    # - evoacme
-    # - etc-git
-    # - kvm-host
-    # - mongodb
-    # - mysql
-    # - proftpd
-    # - haproxy
-    # - varnish
-    # - supervisord
-    # - elasticsearch
-    # - kibana
-    # - evoacme
-    # - lxc
-    # - { role: lxc-php, lxc_php_version: "php56" }
-    # - { role: lxc-php, lxc_php_version: "php70" }
-    # - { role: lxc-php, lxc_php_version: "php73" }
-    # - { role: lxc-php, lxc_php_version: "php74" }
-    # - evocheck
-    # - tomcat
-    # - redis
-    # - unbound
-    # - php
-    # - ldap
     # - { role: postfix, postfix_packmail: True, postfix_force_main_cf: True }
-    # - apache
-    # - php
     # - { role: webapps/evoadmin-mail }
     # - { role: webapps/roundcube }