diff --git a/Vagrantfile b/Vagrantfile index f0241eb..51f5515 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -2,32 +2,14 @@ # -*- mode: ruby -*- # vi: set ft=ruby : -unless Vagrant.has_plugin?("vagrant-disksize") - raise Vagrant::Errors::VagrantError.new, "vagrant-disksize plugin is missing. Please install it using 'vagrant plugin install vagrant-disksize' and rerun 'vagrant up'" -end - # All Vagrant configuration is done below. The "2" in Vagrant.configure # configures the configuration version (we support older styles for # backwards compatibility). Please don't change it unless you know what # you're doing. Vagrant.configure("2") do |config| - required_plugins = %w( vagrant-disksize ) - _retry = false - required_plugins.each do |plugin| - unless Vagrant.has_plugin? plugin - system "vagrant plugin install #{plugin}" - _retry=true - end - end - - if (_retry) - exec "vagrant " + ARGV.join(' ') - end - config.vm.box = "debian/bullseye64" config.vm.hostname = 'kaz-vm' - config.disksize.size = '50GB' config.vm.provider "virtualbox" do |vb| vb.memory = "4096" diff --git a/files/snster-kaz/hoster-a/kaz1/kaz-config/container-proxy.list b/files/snster-kaz/hoster-a/kaz1/kaz-config/container-proxy.list index 1e85afe..9422204 100644 --- a/files/snster-kaz/hoster-a/kaz1/kaz-config/container-proxy.list +++ b/files/snster-kaz/hoster-a/kaz1/kaz-config/container-proxy.list @@ -1,2 +1,2 @@ -proxy -#traefik +#proxy +traefik diff --git a/files/snster-kaz/hoster-a/kaz1/kaz.sh b/files/snster-kaz/hoster-a/kaz1/kaz.sh index 9b364fc..1ff75d7 100755 --- a/files/snster-kaz/hoster-a/kaz1/kaz.sh +++ b/files/snster-kaz/hoster-a/kaz1/kaz.sh @@ -24,7 +24,7 @@ export DebugLog="${OUTPUT_DIR}/log/log-kaz-$(date +%y-%m-%d-%T)-" # copie des sources cd / - git clone https://git.kaz.bzh/KAZ/kaz.git + git clone https://git.kaz.bzh/KAZ/KazV2.git kaz (cd /kaz ; git checkout "${KAZBRANCH}" ) cp "${DIR}/kaz-config/dockers.env" /kaz/config/dockers.env diff --git a/files/snster-kaz/hoster-b/kaz2/kaz.sh b/files/snster-kaz/hoster-b/kaz2/kaz.sh index 76cee01..6f01a0f 100644 --- a/files/snster-kaz/hoster-b/kaz2/kaz.sh +++ b/files/snster-kaz/hoster-b/kaz2/kaz.sh @@ -24,7 +24,7 @@ export DebugLog="${OUTPUT_DIR}/log/log-kaz-$(date +%y-%m-%d-%T)-" # copie des sources cd / - git clone https://git.kaz.bzh/KAZ/kaz.git + git clone https://git.kaz.bzh/KAZ/KazV2.git kaz (cd /kaz ; git checkout "${KAZBRANCH}" ) cp "${DIR}/kaz-config/dockers.env" /kaz/config/dockers.env