Merge branch 'devel' into 'production'

Devel

See merge request liu-puppet-modules/aes!44

manifests/aes_sw.pp

@@ -88,19 +88,22 @@ class aes::aes_sw {
   }
 
   # lint:ignore:140chars
-  file { "${examadm_home}/.ssh/authorized_keys":
+  $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,
-    mode    => '0600',
-    owner   => $examadm_user,
-    group   => $examadm_group,
-    # lint:ignore:strict_indent heredoc failing...
-    content => @(SSHPUBKEY),
-      command="/home/examadm/tal-cli/source/scripts/tal-export.py --format ics --lookback 90 --lookahead 180",no-pty,no-user-rc,no-port-forwarding,no-agent-forwarding,no-X11-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJW4LP0av20r7lPXNgsftF9oaAXK41AvHyuHwybciZC/QBfTcmYif83563cTg0OzR/p+OSobiDM0odaaFYtP/8xbuVRz87X5bGYm2m8yHHqPxobHkT5g/faMkl9Fef+Al4EsT5tiaYMOhG2lj8XRYuwAb7qjoz3FFbs8TEPE7Sv+4BUCCH94taCuNYLXSxN1EXvw7VW6Ld5QXRFP53l2QUeTqE9oSii3BVrXlqqrLvNV/7nwdwyse4uhff4QrM9o4oc9FaQr8PLlPGxdlbSfIQJMVzHGpeDu0WLw+NqtLO1hsdlvQm7GrT/v8N7GJNKlsvhwnwUuMhTrB0yPMbbub1 klaar36@upp
-      command="/home/examadm/tal-cli/source/scripts/tal-export.py --written --format ics --lookback 90 --lookahead 180",no-pty,no-user-rc,no-port-forwarding,no-agent-forwarding,no-X11-forwarding ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILZ8aEAXw0tRcYrk1aqldepuC6tmdUYZuM270QdDF79o tal written exams to ics
-    | SSHPUBKEY
-    # lint:endignore:strict_indent
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0700',
+    content => inline_epp($tal_calendar_cronjob, { 'env' => $server_facts['environment'] }),
   }
-  # lint:endignore:140chars
 
   file { '/etc/systemd/system/aes_login.service':
     ensure  => file,

scripts/eyaml_encrypt.sh

 #! /bin/sh -eu
 
+# Either pass -s <string> for a string, or -f <file> for a file.
+
 exec eyaml encrypt --pkcs7-public-key "puppet_public_key.pkcs7.pem" "$@"