Merge remote-tracking branch 'origin/production' into test

manifests/init.pp

 class aes {
   include aes::examfiles
   include aes::aes_sw
+  include aes::tal_cli
   include aes::opendsa
   include aes::squid_filter
   include aes::latex
@@ -12,6 +13,9 @@ class aes {
   package {
     [
       'devtoolset-7',
+      'gcc',
+      'gcc-c++',
+      'libaio',
       'python36',
     ]:
       ensure  => installed,
@@ -96,9 +100,15 @@ class aes {
     sshkey     => 'AAAAB3NzaC1yc2EAAAADAQABAAACAQDbYFQ5iuox4ZxjleyIR4Pebp045xV1AhcaGXLNsBAMEk08d5ExPVXdoTsNcV9aGDH3mMnhihe4d3bY8xh919n5f500VY6TI1BQKDYUq5HXxbgfl6AG96WntcRc8OIKo31hjMc4o+GPawgvpit7cWs4tWBAxoenJcB43m99AaVH6xd8e6DYC6os6Zv69hu+hD/01aFzJEnANAAsDRqr5b+LUy/qKeRWzT1zGSzWUOeJBHS9rGXHIPmgoOs7FMCtT3w/lzoehxDNCsOUG8aBBb4jH7zDB59fYE3bp55lxjx176AraFHv/H/hcB6EGkqyOyMppHi2B0uPRxlTFOtNVSHptqKINh9NMYAniv+ZUGylJZMSWSQkRSI7U65EvfOaLFTHB/+IBfWAaXjcA0fNcm3lG0tCRXg3rbpumQ2ikq23FpFzNHG+T+383pJjeOjvZB26ij5C+vZ+jEJyXyL528OjO8sOmHEeR6lyc2UjAeHbf7//+gv/bo7wDTSMZVySLKXVwxY+eCEAwh8aVQHCmwx/qWmfE9FuKYZ6AZfdCPpCSQOZY97aQTMMAcSgLV2sYrMim9QpylkH0h4RLhBo76w+83Cg1uprv1ypag0RXIOu+BV0gOHAa3DxhCgWtf9JR3B4YDAq8GaYuVRq9Q6c9+iPo+EmQEdbU+7X4Loj34auOw==', # lint:ignore:140chars
   }
 
+  ::users::liu_user { 'emmen85':
+    commonname => 'Emma Enocksson Svensson',
+    shell      => '/bin/bash',
+    sshkey     => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQCsUKr53aCwErzsdhD/5oEQ4gWW51NgXa70Ow20Fnv/pyKAepDsIMCOB6kf1aET8LOlnq8Wyu0/52GGB38mO6cUzi7MLeWj7bg1Npq7b5/Uoaquq/dginoVQDc5RuJfmoy7PwmjKep/J2OIkCs8kD4sKbqN3ArCW555hgBvlGCdHxER1x2c5wGc2iuMCcbsfonOfORIxzCoiF4igfmuA1wpFZgyjBLuHn/SOtp85pD3nR0JSiaJWcMLB7IkWzXxvbpUWhDf7/gE4mwCDkOajY8zdG+aLkAZI0J1TJUGq50zji4OouwxxPW2JhpVl1KbRPqec+pVtdQIZstgUg3YbJGl', # lint:ignore:140chars
+  }
+
   ::server_firewall::rules_file { '45-permit_squid.rules':
     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
@@ -113,5 +123,4 @@ class aes {
     end policy
     |-EOF
   }
-
 }

manifests/latex.pp

 class aes::latex {
-
   package {
     [
       'texlive',
@@ -15,6 +14,4 @@ class aes::latex {
     ]:
       ensure  => installed,
   }
-
-
 }

manifests/opendsa.pp

 class aes::opendsa {
-
   $opendsa_user = opendsa
   $opendsa_group = $opendsa_user
   $opendsa_home = "/srv/${opendsa_user}"
@@ -41,7 +40,7 @@ class aes::opendsa {
 
   exec { 'update-repo':
     command     => "/opt/utils/update_repo.sh ${opendsa_home}/OpenDSA https://oauth2:taNPRZid9Hv6jJtdW_T8@gitlab.liu.se/opendsa/OpenDSA.git exam",
-    environment => [ "REPO_USER=${opendsa_user}", "REPO_GROUP=${opendsa_group}", "REPO_ON_UPDATE=${opendsa_home}/on_update.sh" ],
+    environment => ["REPO_USER=${opendsa_user}", "REPO_GROUP=${opendsa_group}", "REPO_ON_UPDATE=${opendsa_home}/on_update.sh"],
     # This command will need to run "on_update" as root in order to restart the service.
     user        => root,
     group       => root,
@@ -63,5 +62,4 @@ class aes::opendsa {
   }
 
   # Ändra TDDD86-raden i rules.d/opendsa till "TDDD86[AB]_191219"
-
 }

manifests/squid_filter.pp

 class aes::squid_filter {
-
   package { 'squid' :
     ensure => 'present',
   }
@@ -63,6 +62,6 @@ class aes::squid_filter {
   # todo: logrotate
   service { 'squid' :
     ensure => 'running',
+    enable => true,
   }
-
 }

manifests/tal_cli.pp

+class aes::tal_cli (
+  Optional[String] $credentials = undef
+) {
+  file { '/home/examadm/tal-cli' :
+    ensure => directory,
+    owner  => examadm,
+    group  => examadm,
+    mode   => '0700',
+  }
+
+  file { '/home/examadm/bin/tal-cli' :
+    ensure => file,
+    owner  => examadm,
+    group  => examadm,
+    mode   => '0755',
+    source => "puppet:///modules/${module_name}/tal/tal-cli",
+  }
+
+  file { '/home/examadm/bin/tal-export' :
+    ensure => file,
+    owner  => examadm,
+    group  => examadm,
+    mode   => '0755',
+    source => "puppet:///modules/${module_name}/tal/tal-export",
+  }
+
+  file { '/home/examadm/tal-cli/.tal' :
+    ensure  => file,
+    owner   => examadm,
+    group   => examadm,
+    mode    => '0600',
+    content => $credentials,
+  }
+
+  file { '/home/examadm/tal-cli/on_update.sh' :
+    ensure => file,
+    owner  => examadm,
+    group  => examadm,
+    mode   => '0700',
+    source => "puppet:///modules/${module_name}/tal/on_update.sh",
+  }
+
+  exec { 'update-tal-repo' :
+    command     => '/opt/utils/update_repo.sh /home/examadm/tal-cli/source https://oauth2:glpat-bfpVssm_zFmt1YRW7cLz@gitlab.liu.se/upp-aes/tal-cli.git master',
+    environment => ['REPO_ON_UPDATE=/home/examadm/tal-cli/on_update.sh'],
+    user        => examadm,
+    group       => examadm,
+    cwd         => '/home/examadm/tal-cli',
+  }
+
+  file { '/etc/cron.daily/tal-remind' :
+    ensure  => file,
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0700',
+    content => @(END),
+    #!/bin/bash
+    if [ "$(hostname)" = "aes-devel.edu.liu.se" ]
+    then
+        TO="klas.arvidsson@liu.se"
+    else
+        TO="inrapportering@ida.liu.se"
+    fi
+    if [ -e /home/examadm/ENABLE_TAL_REMINDERS ]
+    then
+        sudo -u examadm /home/examadm/tal-cli/scripts/tal-remind.py --to ${TO} --send
+        sudo -u examadm /home/examadm/tal-cli/scripts/tal-remind.py --to ${TO} --computer-exam --send
+    fi
+    | END
+  }
+}

metadata.json

@@ -26,7 +26,7 @@
       "version_requirement": ">= 6.21.0 < 8.0.0"
     }
   ],
-  "pdk-version": "2.2.0",
+  "pdk-version": "2.6.1",
   "template-url": "https://gitlab.it.liu.se/puppet-infra/pdk-templates.git#liu",
-  "template-ref": "heads/liu-0-gd8925d4"
+  "template-ref": "heads/liu-0-g09dd5f0"
 }