From a6672fe6ab769f1b7d76030cdcf8266e655da0c8 Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Tue, 20 Apr 2021 17:48:02 +0200 Subject: [PATCH] put supervise_chrome_processes.sh in right folder --- .../overlay/etc/hiera/data/local.yaml | 1 + global/overlay/etc/puppet/manifests/cosmos-site.pp | 9 +-------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/eidastest-1.qa.sveidas.se/overlay/etc/hiera/data/local.yaml b/eidastest-1.qa.sveidas.se/overlay/etc/hiera/data/local.yaml index e234114f..c238eb21 100644 --- a/eidastest-1.qa.sveidas.se/overlay/etc/hiera/data/local.yaml +++ b/eidastest-1.qa.sveidas.se/overlay/etc/hiera/data/local.yaml @@ -7,6 +7,7 @@ eidastest_compose: container_name: standalone-chrome volumes: - /dev/shm:/dev/shm + - ./supervise_chrome_processes.sh:/scripts/supervise_chrome_processes.sh ports: - "4444:4444" environment: diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index ea7626ad..4a36c828 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -444,20 +444,13 @@ class eidastest($version="1.0.0", $hostname="locahost") { path => "${home}", mode => '0755', } - file { "${home}/eidastest/scripts": - ensure => directory, - owner => 'root', - group => 'root', - path => "${home}/eidastest/scripts", - mode => '0755', - } file { "${home}/eidastest/config.ini": content => template('eid/eidastest/config.ini.erb'), owner => 'root', group => 'root', mode => '0755', } - file { "${home}/eidastest/scripts/supervise_chrome_processes.sh": + file { "${home}/eidastest/supervise_chrome_processes.sh": content => template('eid/eidastest/supervise_chrome_processes.sh.erb'), owner => 'root', group => 'root',