From cc2e3fc91a424cdf428f51b4ab1451a5dc838246 Mon Sep 17 00:00:00 2001
From: Klas Arvidsson <klas.arvidsson@liu.se>
Date: Mon, 4 Dec 2023 21:40:31 +0100
Subject: [PATCH] Fix to pass puppet parameter to templete file content
---
manifests/aes_sw.pp | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/manifests/aes_sw.pp b/manifests/aes_sw.pp
index e16a417..cd9452b 100644
--- a/manifests/aes_sw.pp
+++ b/manifests/aes_sw.pp
@@ -87,22 +87,23 @@ class aes::aes_sw {
group => $examadm_group,
}
- # Push TAL-calendar file to UPP-server (replaces old pull solution)
# lint:ignore:140chars
+ $tal_calendar_cronjob = @(END)
+ <% | String $env | %>
+ #!/bin/bash
+ sudo -u examadm /home/examadm/tal-cli/source/scripts/tal-export.py --format ics --lookback 90 --lookahead 180 | sudo -u klaar36 ssh upp.ida.liu.se "cat >| /projects/upp/www/tal/tal-<%= $env %>.ics"
+ sudo -u examadm /home/examadm/tal-cli/source/scripts/tal-export.py --written --format ics --lookback 90 --lookahead 180 | sudo -u klaar36 ssh upp.ida.liu.se "cat >| /projects/upp/www/tal/tal_written-<%= $env %>.ics"
+ | END
+ # lint:endignore:140chars
+
+ # Push TAL-calendar file to UPP-server (replaces old pull solution)
file { '/etc/cron.daily/tal-access' :
ensure => file,
owner => 'root',
group => 'root',
mode => '0700',
- # lint:ignore:strict_indent
- content => @(END),
- #!/bin/bash
- sudo -u examadm /home/examadm/tal-cli/source/scripts/tal-export.py --format ics --lookback 90 --lookahead 180 | sudo -u klaar36 ssh upp.ida.liu.se "cat >| /projects/upp/www/tal/tal-${environment}.ics"
- sudo -u examadm /home/examadm/tal-cli/source/scripts/tal-export.py --written --format ics --lookback 90 --lookahead 180 | sudo -u klaar36 ssh upp.ida.liu.se "cat >| /projects/upp/www/tal/tal_written-${environment}.ics"
- | END
- # lint:endignore:strict_indent
+ content => inline_epp($tal_calendar_cronjob, { 'env' => $server_facts['environment'] }),
}
- # lint:endignore:140chars
file { '/etc/systemd/system/aes_login.service':
ensure => file,
--
GitLab