From a878cbd4f2015637eb0b7d44cfa672f78729e310 Mon Sep 17 00:00:00 2001
From: Francois Lesueur <francois.lesueur@univ-ubs.fr>
Date: Wed, 1 Mar 2023 15:11:01 +0100
Subject: [PATCH] customvm

---
 .gitignore            |  1 +
 files/vm-provision.sh | 14 +++++---------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9023093..6261880 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ DEADJOE
 /files/kaz/download
 /files/kaz/git
 /files/kaz/log
+/files/customVM.sh
diff --git a/files/vm-provision.sh b/files/vm-provision.sh
index 183fff6..3dc5775 100755
--- a/files/vm-provision.sh
+++ b/files/vm-provision.sh
@@ -36,6 +36,11 @@ http_port 3142" >> /etc/squid/squid.conf
     echo "Acquire::http::Proxy \"http://127.0.0.1:3142\";" > /etc/apt/apt.conf.d/01proxy;  # utilisation de apt-cacher-ng
     # Ajouter http://www.squid-cache.org/Doc/config/cache_peer/ à squid pour un proxy upstream
 
+    # Pour le confort de chacun, un customVM.sh optionnel
+    if [ -f "${VAGRANT_SRC_DIR}/customVM.sh" ]; then
+	     bash "${VAGRANT_SRC_DIR}/customVM.sh"
+    fi
+
     # MAJ et Install
     DEBIAN_FRONTEND=noninteractive apt-get -y upgrade
     DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade
@@ -45,15 +50,6 @@ http_port 3142" >> /etc/squid/squid.conf
     ssh-keygen -t rsa -b 4096 -N '' <<<$'\ny'
     rsync /root/.ssh/id_rsa.pub /root/.ssh/authorized_keys
 
-    # Pour le confort de chacun
-    # Le fihcier .customVM.sh contient
-    # DEBIAN_FRONTEND=noninteractive apt-get install -y joe
-    # DEBIAN_FRONTEND=noninteractive apt-get install -y emacs
-    # DEBIAN_FRONTEND=noninteractive apt-get install -y vim
-    if [ -f "${VAGRANT_SRC_DIR}/.customVM.sh" ]; then
-	     bash "${VAGRANT_SRC_DIR}/.customVM.sh"
-    fi
-
     # Localisation du $LANG, en par défaut, timezone Paris
     if [ -z "${HOSTLANG}" ] ; then
 	     HOSTLANG="en_US.UTF-8"