Skip to content
Snippets Groups Projects
Commit e11589c9 authored by Filip Strömbäck's avatar Filip Strömbäck
Browse files

Merge branch 'devel' into 'production'

Devel

See merge request !45
parents 0b789696 dd29e5ef
No related branches found
No related tags found
2 merge requests!50Fix: Puppet Defining "data_provider": "hiera" in metadata.json is deprecated....,!45Devel
Pipeline #132293 passed
#!/usr/bin/bash #!/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 cd source
python3 -m pip install --user -r scripts/requirements.txt python3 -m pip install --user -r scripts/requirements.txt
......
...@@ -149,7 +149,7 @@ class aes::auth ( ...@@ -149,7 +149,7 @@ class aes::auth (
environment => ["HOME=${auth_home}"], environment => ["HOME=${auth_home}"],
command => "${auth_home}/on_update.sh", command => "${auth_home}/on_update.sh",
require => File["${auth_home}/on_update.sh"], require => File["${auth_home}/on_update.sh"],
creates => "${auth_home}/bin/auth", refreshonly => true,
notify => Service[$auth_service], notify => Service[$auth_service],
} }
......
...@@ -164,7 +164,7 @@ class aes::broker { ...@@ -164,7 +164,7 @@ class aes::broker {
environment => ["HOME=${broker_home}"], environment => ["HOME=${broker_home}"],
command => "${broker_home}/on_update.sh", command => "${broker_home}/on_update.sh",
require => File["${broker_home}/on_update.sh"], require => File["${broker_home}/on_update.sh"],
creates => "${broker_home}/bin/broker", refreshonly => true,
notify => Service[$broker_service], notify => Service[$broker_service],
} }
......
...@@ -114,4 +114,19 @@ class aes { ...@@ -114,4 +114,19 @@ class aes {
shell => '/bin/bash', shell => '/bin/bash',
sshkey => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQCsUKr53aCwErzsdhD/5oEQ4gWW51NgXa70Ow20Fnv/pyKAepDsIMCOB6kf1aET8LOlnq8Wyu0/52GGB38mO6cUzi7MLeWj7bg1Npq7b5/Uoaquq/dginoVQDc5RuJfmoy7PwmjKep/J2OIkCs8kD4sKbqN3ArCW555hgBvlGCdHxER1x2c5wGc2iuMCcbsfonOfORIxzCoiF4igfmuA1wpFZgyjBLuHn/SOtp85pD3nR0JSiaJWcMLB7IkWzXxvbpUWhDf7/gE4mwCDkOajY8zdG+aLkAZI0J1TJUGq50zji4OouwxxPW2JhpVl1KbRPqec+pVtdQIZstgUg3YbJGl', # lint:ignore:140chars 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
}
}
} }
...@@ -16,6 +16,7 @@ class aes::latex { ...@@ -16,6 +16,7 @@ class aes::latex {
# 'texlive-xetex-def', # Not in RHEL9, why is this required? What breaks? # 'texlive-xetex-def', # Not in RHEL9, why is this required? What breaks?
'texlive-tcolorbox', 'texlive-tcolorbox',
'texlive-booktabs', 'texlive-booktabs',
'texlive-varwidth',
'latexmk', 'latexmk',
]: ]:
ensure => installed, ensure => installed,
......
...@@ -73,7 +73,7 @@ class aes::tal_cli ( ...@@ -73,7 +73,7 @@ class aes::tal_cli (
cwd => '/home/examadm/tal-cli', cwd => '/home/examadm/tal-cli',
path => '/bin:/usr/bin', path => '/bin:/usr/bin',
environment => ['HOME=/home/examadm'], environment => ['HOME=/home/examadm'],
creates => '/home/examadm/tal-cli/source/tal', refreshonly => true,
command => '/home/examadm/tal-cli/on_update.sh', command => '/home/examadm/tal-cli/on_update.sh',
require => File['/home/examadm/tal-cli/on_update.sh'], require => File['/home/examadm/tal-cli/on_update.sh'],
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment