diff --git a/files/vm-provision.sh b/files/vm-provision.sh index 2b6d5bc..50e11f4 100755 --- a/files/vm-provision.sh +++ b/files/vm-provision.sh @@ -25,17 +25,7 @@ export DebugLog="${VAGRANT_SRC_DIR}/log/log-vagrant-$(date +%y-%m-%d-%T)-" # MAJ et install sed -i -e 's/main.*/main contrib non-free/' /etc/apt/sources.list - if [ -f "${VAGRANT_SRC_DIR}/.apt-mirror-config" ]; then - # pour ceux qui disposent d'un cache apt local et pas la fibre - # suffit d'indiquer "host:port" dans le fichier ".apt-mirror-config" - . "${VAGRANT_SRC_DIR}/.apt-mirror-config" - sed -i \ - -e "s%s\?://deb.debian.org%://${APT_MIRROR_DEBIAN}%g" \ - -e "s%s\?://security.debian.org%://${APT_MIRROR_DEBIAN_SECURITY}%g" \ - -e "s%s\?://archive.ubuntu.com%://${APT_MIRROR_UBUNTU}%g" \ - -e "s%s\?://security.ubuntu.com%://${APT_MIRROR_UBUNTU_SECURITY}%g" \ - /etc/apt/sources.list - fi + DEBIAN_FRONTEND=noninteractive apt-get --allow-releaseinfo-change update DEBIAN_FRONTEND=noninteractive apt-get -y upgrade @@ -46,30 +36,6 @@ export DebugLog="${VAGRANT_SRC_DIR}/log/log-vagrant-$(date +%y-%m-%d-%T)-" 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 .customDocker.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}/.customDocker.sh" ]; then - chmod a+x "${VAGRANT_SRC_DIR}/.customDocker.sh" - "${VAGRANT_SRC_DIR}/.customDocker.sh" - fi - - - - # Localisation du $LANG, en par défaut, timezone Paris - if [ -z "${HOSTLANG}" ] ; then - HOSTLANG="en_US.UTF-8" - fi - echo "Europe/Paris" > /etc/timezone - ln -sf /usr/share/zoneinfo/Europe/Paris /etc/localtime - dpkg-reconfigure -f noninteractive tzdata - sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen - sed -i -e "s/# ${HOSTLANG} /${HOSTLANG} /" /etc/locale.gen - echo "LANG=\"${HOSTLANG}\"">/etc/default/locale - dpkg-reconfigure --frontend=noninteractive locales || true # don't fail for a locales problem - update-locale LANG=${HOSTLANG} || true # don't fail for a locales problem echo -e "\n #### create user\n"