From 356bd44b4b0eaece5280b1585dc1e9b30a32c6c5 Mon Sep 17 00:00:00 2001
From: Thomas Johansson <thomas.johansson@liu.se>
Date: Wed, 16 Aug 2023 01:56:09 +0200
Subject: [PATCH] Fixed all PDK related issues
---
manifests/aes_sw.pp | 25 +++++++++++++++++++++----
manifests/auth.pp | 16 ++++++++++++----
manifests/auth_keydb.pp | 6 ++++++
manifests/broker.pp | 6 ++++++
manifests/examfiles.pp | 6 ++++++
manifests/init.pp | 10 +++++++++-
manifests/latex.pp | 6 ++++++
manifests/opendsa.pp | 6 ++++++
manifests/squid_filter.pp | 6 ++++++
manifests/tal_cli.pp | 11 +++++++++++
10 files changed, 89 insertions(+), 9 deletions(-)
diff --git a/manifests/aes_sw.pp b/manifests/aes_sw.pp
index 2bfa484..15cec34 100644
--- a/manifests/aes_sw.pp
+++ b/manifests/aes_sw.pp
@@ -1,3 +1,8 @@
+# @summary
+# Describe what this class do!
+#
+# Detailed summary info if suitable
+#
class aes::aes_sw {
$examadm_user = examadm
$examadm_group = $examadm_user
@@ -34,24 +39,29 @@ class aes::aes_sw {
group => $examadm_group,
}
+ # lint:ignore:140chars
file { "${examadm_home}/.ssh/authorized_keys":
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
}
+ # lint:endignore:140chars
file { '/etc/systemd/system/aes_login.service':
ensure => file,
owner => root,
group => root,
mode => '0644',
+ # lint:ignore:strict_indent heredoc failing...
content => @(LOGINSERVICE),
- [Unit]
+ [Unit]
Description=AES Login server
After=network.target
@@ -64,6 +74,7 @@ class aes::aes_sw {
[Install]
WantedBy=multi-user.target
| LOGINSERVICE
+ # lint:endignore:strict_indent
}
# todo: logrotate
@@ -77,8 +88,9 @@ class aes::aes_sw {
owner => root,
group => root,
mode => '0644',
+ # lint:ignore:strict_indent heredoc failing...
content => @(MSSERVICE),
- [Unit]
+ [Unit]
Description=AES Exam server
After=network.target
@@ -91,6 +103,7 @@ class aes::aes_sw {
[Install]
WantedBy=multi-user.target
| MSSERVICE
+ # lint:endignore:strict_indent
}
file { '/etc/cron.daily/aes_ms':
@@ -98,10 +111,12 @@ class aes::aes_sw {
owner => root,
group => root,
mode => '0700',
+ # lint:ignore:strict_indent heredoc failing...
content => @(MSCRON),
- #!/bin/sh
+ #!/bin/sh
/usr/bin/systemctl restart aes_ms
| MSCRON
+ # lint:endignore:strict_indent
}
file { '/etc/cron.daily/aes_login':
@@ -109,10 +124,12 @@ class aes::aes_sw {
owner => root,
group => root,
mode => '0700',
+ # lint:ignore:strict_indent heredoc failing...
content => @(MSCRON),
- #!/bin/sh
+ #!/bin/sh
/usr/bin/systemctl restart aes_login
| MSCRON
+ # lint:endignore:strict_indent
}
# todo: logrotate
diff --git a/manifests/auth.pp b/manifests/auth.pp
index d950cb8..248720e 100644
--- a/manifests/auth.pp
+++ b/manifests/auth.pp
@@ -1,7 +1,15 @@
-# # New keytab base64+pkcs7 encoded
-# Optional[String] $keytab_base64 = undef, # Kerberos keytab file for HTTP/fqdn (ida-web)
-# Optional[String] $keytab2_base64 = undef, # Kerberos keytab file for HTTP/fqdn (ida-web2)
-#) {
+# @summary
+# Describe what this class do!
+#
+# Detailed summary info if suitable
+#
+#
+# @param keytab_production_base64
+# Describe keytab_production_base64
+#
+# @param keytab_devel_base64
+# Describe keytab_devel_base64
+#
class aes::auth (
# Comment out old keytab params but
# keep temporay for comparison
diff --git a/manifests/auth_keydb.pp b/manifests/auth_keydb.pp
index f7a0c5a..5bde484 100644
--- a/manifests/auth_keydb.pp
+++ b/manifests/auth_keydb.pp
@@ -1,3 +1,9 @@
+# @summary
+# Describe what this class do!
+#
+# Detailed summary info if suitable
+#
+#
class aes::auth_keydb {
$keydb_user = auth_keydb
$keydb_group = $keydb_user
diff --git a/manifests/broker.pp b/manifests/broker.pp
index 3372440..3a09333 100644
--- a/manifests/broker.pp
+++ b/manifests/broker.pp
@@ -1,3 +1,9 @@
+# @summary
+# Describe what this class do!
+#
+# Detailed summary info if suitable
+#
+#
class aes::broker {
$broker_user = broker
$broker_group = $broker_user
diff --git a/manifests/examfiles.pp b/manifests/examfiles.pp
index 6571ba0..0e0d7f7 100644
--- a/manifests/examfiles.pp
+++ b/manifests/examfiles.pp
@@ -1,3 +1,9 @@
+# @summary
+# Describe what this class do!
+#
+# Detailed summary info if suitable
+#
+#
class aes::examfiles {
include users::micis03
include users::jondy94
diff --git a/manifests/init.pp b/manifests/init.pp
index 1e59034..6f3529e 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,3 +1,9 @@
+# @summary
+# Describe what this class do!
+#
+# Detailed summary info if suitable
+#
+#
class aes {
include aes::examfiles
include aes::aes_sw
@@ -107,8 +113,9 @@ class aes {
}
::server_firewall::rules_file { '45-permit_squid.rules':
+ # lint:ignore:strict_indent heredoc failing...
content => @(EOF),
- service squid is tcp/3128
+ service squid is tcp/3128
service sclogin is tcp/23431
service aesmsi is tcp/23816
service aesmso is tcp/23817
@@ -122,5 +129,6 @@ class aes {
accept service:aesbroker from class:liu-nets
end policy
|-EOF
+ # lint:endignore:strict_indent
}
}
diff --git a/manifests/latex.pp b/manifests/latex.pp
index e2d1c8b..0209226 100644
--- a/manifests/latex.pp
+++ b/manifests/latex.pp
@@ -1,3 +1,9 @@
+# @summary
+# Describe what this class do!
+#
+# Detailed summary info if suitable
+#
+#
class aes::latex {
package {
[
diff --git a/manifests/opendsa.pp b/manifests/opendsa.pp
index c2e623d..0dc64cf 100644
--- a/manifests/opendsa.pp
+++ b/manifests/opendsa.pp
@@ -1,3 +1,9 @@
+# @summary
+# Describe what this class do!
+#
+# Detailed summary info if suitable
+#
+#
class aes::opendsa {
$opendsa_user = opendsa
$opendsa_group = $opendsa_user
diff --git a/manifests/squid_filter.pp b/manifests/squid_filter.pp
index 3e64c0c..071d583 100644
--- a/manifests/squid_filter.pp
+++ b/manifests/squid_filter.pp
@@ -1,3 +1,9 @@
+# @summary
+# Describe what this class do!
+#
+# Detailed summary info if suitable
+#
+#
class aes::squid_filter {
package { 'squid' :
ensure => 'present',
diff --git a/manifests/tal_cli.pp b/manifests/tal_cli.pp
index c17363e..530af22 100644
--- a/manifests/tal_cli.pp
+++ b/manifests/tal_cli.pp
@@ -1,3 +1,12 @@
+# @summary
+# Describe what this class do!
+#
+# Detailed summary info if suitable
+#
+#
+# @param credentials
+# Describe credentials
+#
class aes::tal_cli (
Optional[String] $credentials = undef
) {
@@ -53,6 +62,7 @@ class aes::tal_cli (
owner => 'root',
group => 'root',
mode => '0700',
+ # lint:ignore:strict_indent heredoc failing...
content => @(END),
#!/bin/bash
if [ "$(hostname)" = "aes-devel.edu.liu.se" ]
@@ -67,5 +77,6 @@ class aes::tal_cli (
sudo -u examadm /home/examadm/tal-cli/source/scripts/tal-remind.py --to ${TO} --computer-exam --send
fi
| END
+ # lint:endignore:strict_indent
}
}
--
GitLab