diff --git a/files/tal/on_update.sh b/files/tal/on_update.sh index 068b662364711855ac1e0e8c6a085896c7b4fb2b..d29cffa873c30f5a91836f4e5112258fe8985f9b 100644 --- a/files/tal/on_update.sh +++ b/files/tal/on_update.sh @@ -1,5 +1,12 @@ #!/usr/bin/bash +# Log if we were asked to do so. +if [[ $# -gt 0 ]] +then + /home/examadm/tal-cli/on_update.sh 2>&1 | tee /home/examadm/tal-cli/log + exit $? +fi + cd source python3 -m pip install --user -r scripts/requirements.txt diff --git a/manifests/auth.pp b/manifests/auth.pp index eacb162d31cce551ca10c7e012ba9513698610dc..8180e32bf07aa1403253f2470b3de9f66cec1889 100644 --- a/manifests/auth.pp +++ b/manifests/auth.pp @@ -149,7 +149,7 @@ class aes::auth ( environment => ["HOME=${auth_home}"], command => "${auth_home}/on_update.sh", require => File["${auth_home}/on_update.sh"], - creates => "${auth_home}/bin/auth", + refreshonly => true, notify => Service[$auth_service], } diff --git a/manifests/broker.pp b/manifests/broker.pp index 4dfa689593333a4b8be043b229ecb130a0c6e195..c2895d5e80a5e8f6096332176cf5a67c4e380a35 100644 --- a/manifests/broker.pp +++ b/manifests/broker.pp @@ -164,7 +164,7 @@ class aes::broker { environment => ["HOME=${broker_home}"], command => "${broker_home}/on_update.sh", require => File["${broker_home}/on_update.sh"], - creates => "${broker_home}/bin/broker", + refreshonly => true, notify => Service[$broker_service], } diff --git a/manifests/init.pp b/manifests/init.pp index 660f39131cbb6e080ee26b591988f1ee6a7335d7..d09d7c2560ab4aa542a2caeb441a0a3899156288 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -114,4 +114,19 @@ class aes { shell => '/bin/bash', sshkey => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQCsUKr53aCwErzsdhD/5oEQ4gWW51NgXa70Ow20Fnv/pyKAepDsIMCOB6kf1aET8LOlnq8Wyu0/52GGB38mO6cUzi7MLeWj7bg1Npq7b5/Uoaquq/dginoVQDc5RuJfmoy7PwmjKep/J2OIkCs8kD4sKbqN3ArCW555hgBvlGCdHxER1x2c5wGc2iuMCcbsfonOfORIxzCoiF4igfmuA1wpFZgyjBLuHn/SOtp85pD3nR0JSiaJWcMLB7IkWzXxvbpUWhDf7/gE4mwCDkOajY8zdG+aLkAZI0J1TJUGq50zji4OouwxxPW2JhpVl1KbRPqec+pVtdQIZstgUg3YbJGl', # lint:ignore:140chars } + + if $facts[networking][fqdn] == 'aes-devel.edu.liu.se' { + ::users::liu_user { 'malni83': + commonname => 'Malte Nilsson', + shell => '/bin/bash', + sshkey => 'AAAAB3NzaC1yc2EAAAADAQABAAABgQDYNp5BTaa0edzbWS9fm99zpI2WG4ZSZn5OZgQ55v9dCOTT9e8iNKI/MRB/ll/Axukun/K0IKdxJjsBq/cmk9RYEvSWdpn8byPQ18FaWpx1eoEuBDPL2EKu7jX09czencgE61dJ8Nli7oO8wt1JBLGVXBgJYV53mPB5XStkBoLj8sNbPBUZpALwNo4DzUBTg0TuT2RzSrDPjnjbOrjJrSC0vs+Ymub0/u1p4DLlW3zR1JUjR6v42mofj6d9XAgZuH8NBWE2kxRt5XKRqYJUK7dvNKocNKc6aENC5W2Te80K2EPHWUWig714cyIh15jehhDxS9G6dezqKM2L4zYxbDCkJXBO1TSdGvcuoWkS+idW6hSCBYmG3YbF5/ZWuhUiFVw4PvyZCQcXGDT7865RSrS8Ba8AsBpXWwh/RNQc818pFIka+p0wsuaebEt1hYIcadQ46YEF+p8KnWSdfrfKv3PZgCXkISR47/WCfWC1frP5/7bpLxSPZbbQXBNZgaB/db8=', # lint:ignore:140chars + } + + ::users::liu_user { 'simah37': + commonname => 'Simon Ahrenstedt', + shell => '/bin/bash', + sshkeytype => 'ssh-ed25519', + sshkey => 'AAAAC3NzaC1lZDI1NTE5AAAAIOkVNze73xbdkn/M4klf0jPFW6BPWImzs5ZM2Y60cVEf', # lint:ignore:140chars + } + } } diff --git a/manifests/latex.pp b/manifests/latex.pp index 46a6f27111431f91f8ce45d07d09a19d48628240..ac672a4cda678705aac53555291acede8a811b50 100644 --- a/manifests/latex.pp +++ b/manifests/latex.pp @@ -16,6 +16,7 @@ class aes::latex { # 'texlive-xetex-def', # Not in RHEL9, why is this required? What breaks? 'texlive-tcolorbox', 'texlive-booktabs', + 'texlive-varwidth', 'latexmk', ]: ensure => installed, diff --git a/manifests/tal_cli.pp b/manifests/tal_cli.pp index d4f277549d065da87dd0984a34eca1bca79a07b3..2164dcc7a0291fe88358a4a41a555b1476724bee 100644 --- a/manifests/tal_cli.pp +++ b/manifests/tal_cli.pp @@ -73,7 +73,7 @@ class aes::tal_cli ( cwd => '/home/examadm/tal-cli', path => '/bin:/usr/bin', environment => ['HOME=/home/examadm'], - creates => '/home/examadm/tal-cli/source/tal', + refreshonly => true, command => '/home/examadm/tal-cli/on_update.sh', require => File['/home/examadm/tal-cli/on_update.sh'], }