diff --git a/Vagrantfile b/Vagrantfile index 9162983..4a0ca06 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -12,7 +12,7 @@ end # you're doing. Vagrant.configure("2") do |config| - required_plugins = %w( vagrant-vbguest vagrant-disksize ) + required_plugins = %w( vagrant-disksize ) _retry = false required_plugins.each do |plugin| unless Vagrant.has_plugin? plugin diff --git a/files/snster-kaz/kaz/prod/kaz-config/dockers.env b/files/snster-kaz/kaz/prod/kaz-config/dockers.env index 8151ebc..bc35233 100644 --- a/files/snster-kaz/kaz/prod/kaz-config/dockers.env +++ b/files/snster-kaz/kaz/prod/kaz-config/dockers.env @@ -59,6 +59,9 @@ sympaHost=listes vigiloHost=vigilo webmailHost=webmail wordpressHost=wp +ldapUIHost=mdp +mobilizonHost=mobilizon +vaultwardenHost=koffre ######################################## # noms des containers @@ -84,6 +87,8 @@ sympaServName=sympaServ vigiloServName=vigiloServ webServName=webServ wordpressServName=wpServ +mobilizonServName=mobilizonServ +vaultwardenServName=vaultwardenServ cachetDBName=cachetDB ethercalcDBName=ethercalcDB @@ -97,6 +102,8 @@ roundcubeDBName=roundcubeDB sympaDBName=sympaDB vigiloDBName=vigiloDB wordpressDBName=wpDB +mobilizonDBName=mobilizonDB +vaultwardenDBName=vaultwardenDB ldapUIName=ldapUI diff --git a/files/vm-provision.sh b/files/vm-provision.sh index 68dde84..60dc63f 100755 --- a/files/vm-provision.sh +++ b/files/vm-provision.sh @@ -45,9 +45,18 @@ http_port 3142" >> /etc/squid/squid.conf # MAJ et Install DEBIAN_FRONTEND=noninteractive apt-get -y upgrade DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade - DEBIAN_FRONTEND=noninteractive apt-get install -y apg curl git sudo unzip rsync firefox-esr tcpdump net-tools mousepad wireshark swapspace whois python3-lxc lxc python3-pygraphviz python3-pil python3-yaml imagemagick btrfs-progs docker-registry # could be with --no-install-recommends + DEBIAN_FRONTEND=noninteractive apt-get install -y linux-headers-`dpkg --print-architecture` virtualbox-guest-additions-iso dkms apg curl git sudo unzip rsync firefox-esr tcpdump net-tools mousepad wireshark swapspace whois python3-lxc lxc python3-pygraphviz python3-pil python3-yaml imagemagick btrfs-progs docker-registry # could be with --no-install-recommends DEBIAN_FRONTEND=noninteractive apt-get install -y xfce4 lightdm xfce4-terminal xserver-xorg gitk # needs to install recommends + # vbox guest utils + #VERSION=`curl https://download.virtualbox.org/virtualbox/LATEST-STABLE.TXT` + #curl https://download.virtualbox.org/virtualbox/$VERSION/VBoxGuestAdditions_$VERSION.iso -o /tmp/vbox.iso + #mount -o loop /tmp/vbox.iso /mnt + mount -o loop /usr/share/virtualbox/VBoxGuestAdditions.iso /mnt + /mnt/VBoxLinuxAdditions.run || true # vboxsf module will fail to load before reboot, expected behavior + /sbin/rcvboxadd quicksetup all || true + umount /mnt + ssh-keygen -t rsa -b 4096 -N '' <<<$'\ny' rsync /root/.ssh/id_rsa.pub /root/.ssh/authorized_keys