From 4060fcafe05a811394d217917c184ea4b590b413 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20B=C3=A9rtoli?= Date: Wed, 16 Mar 2022 13:39:41 -0300 Subject: [PATCH] 18681: Fix typo MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Arvados-DCO-1.1-Signed-off-by: Javier Bértoli --- tools/salt-install/Vagrantfile | 19 +++++++++++++------ .../aws/pillars/nginx_passenger.sls | 2 +- .../pillars/nginx_passenger.sls | 2 +- .../pillars/nginx_passenger.sls | 2 +- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/tools/salt-install/Vagrantfile b/tools/salt-install/Vagrantfile index a8dd345343..1573b6862b 100644 --- a/tools/salt-install/Vagrantfile +++ b/tools/salt-install/Vagrantfile @@ -41,6 +41,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| /vagrant/local.params.example.single_host_multiple_hostnames > /tmp/local.params.single_host_multiple_hostnames" # s/#\ BRANCH=\"main\"/\ BRANCH=\"main\"/g;' \ + arv.vm.provision "shell", + inline: "cp -vr /tmp/local.params.single_host_multiple_hostnames /tmp/local.params.single_host_multiple_hostnames.falla; + cp -vr /vagrant/centos7-local.params.single_host_single_hostname-f258b604f831bb3bd7fab506c670b975ae8e4118 /tmp/local.params.single_host_multiple_hostnames" arv.vm.provision "shell", path: "provision.sh", args: [ @@ -54,7 +57,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # A single_host single_hostname example config.vm.define "arvados-sh-sn" do |arv| - arv.vm.box = "bento/debian-11" + #arv.vm.box = "bento/centos-7" + arv.vm.box = "bento/ubuntu-20.04" arv.vm.hostname = "zeppo" # CPU/RAM config.vm.provider :virtualbox do |v| @@ -80,12 +84,15 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| arv.vm.provision "shell", inline: "cp -vr /vagrant/config_examples/single_host/single_hostname /home/vagrant/local_config_dir; cp -vr /vagrant/tests /home/vagrant/tests; - sed 's#HOSTNAME_EXT=\"hostname_ext_fixme_or_this_wont_work\"#HOSTNAME_EXT=\"zeppo.local\"#g; - 's#IP_INT=\"ip_int_fixme_or_this_wont_work\"#IP_INT=\"127.0.0.1\"#g; - s#cluster_fixme_or_this_wont_work#zeppo#g; - s#domain_fixme_or_this_wont_work#local#g;' \ + sed 's#cluster_fixme_or_this_wont_work#cnts7#g; + s#domain_fixme_or_this_wont_work#local#g; + s#HOSTNAME_EXT=\"hostname_ext_fixme_or_this_wont_work\"#HOSTNAME_EXT=\"cnts7.local\"#g; + s#IP_INT=\"ip_int_fixme_or_this_wont_work\"#IP_INT=\"127.0.0.1\"#g; + s#RELEASE=\"production\"#RELEASE=\"development\"#g; + s/# BRANCH=\"main\"/BRANCH=\"main\"/g; + s/# VERSION=.*$/VERSION=\"latest\"/g' \ /vagrant/local.params.example.single_host_single_hostname > /tmp/local.params.single_host_single_hostname" - # s/#\ BRANCH=\"main\"/\ BRANCH=\"main\"/g; + arv.vm.provision "shell", path: "provision.sh", args: [ diff --git a/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_passenger.sls b/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_passenger.sls index a1d7efde6b..fbd42bd7a3 100644 --- a/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_passenger.sls +++ b/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_passenger.sls @@ -28,7 +28,7 @@ nginx: # As we now differentiate where passenger is required or not, we need to # load this module conditionally, so we add this conditional just to use # the same pillar file - {% if "install_from_phusionpassenger" == "____NGINX_INSTALL_SOURCE__" %} + {% if "install_from_phusionpassenger" == "__NGINX_INSTALL_SOURCE__" %} # This is required to get the passenger module loaded # In Debian it can be done with this # include: 'modules-enabled/*.conf' diff --git a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_passenger.sls b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_passenger.sls index c376cd0aa5..dbf21c2651 100644 --- a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_passenger.sls +++ b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_passenger.sls @@ -28,7 +28,7 @@ nginx: # As we now differentiate where passenger is required or not, we need to # load this module conditionally, so we add this conditional just to use # the same pillar file - {% if "install_from_phusionpassenger" == "____NGINX_INSTALL_SOURCE__" %} + {% if "install_from_phusionpassenger" == "__NGINX_INSTALL_SOURCE__" %} # This is required to get the passenger module loaded # In Debian it can be done with this # include: 'modules-enabled/*.conf' diff --git a/tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_passenger.sls b/tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_passenger.sls index 9db0936778..c25720c60a 100644 --- a/tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_passenger.sls +++ b/tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_passenger.sls @@ -28,7 +28,7 @@ nginx: # As we now differentiate where passenger is required or not, we need to # load this module conditionally, so we add this conditional just to use # the same pillar file - {% if "install_from_phusionpassenger" == "____NGINX_INSTALL_SOURCE__" %} + {% if "install_from_phusionpassenger" == "__NGINX_INSTALL_SOURCE__" %} # This is required to get the passenger module loaded # In Debian it can be done with this # include: 'modules-enabled/*.conf' -- 2.30.2