Merge branch 'devel' into 'production'

Devel

See merge request !18

files/squid/helpers/rules.d/rstudio.rules

@@ -26,6 +26,8 @@
 ^https?://shiny\.rstudio\.com/reference/shiny/.*        true
 ^https?://www\.jasondavies\.com/wordtree/.*             true
 ^https?://www\.ida\.liu\.se/~732A98/.*			true
+^https?://www\.gpsvisualizer\.com/atlas\.html          false
+^https?://www\.gpsvisualizer\.com/.*                    true
 
 // For plot.ly
 ^https?://ajax\.googleapis\.com/ajax/libs/.*\.js         true

files/sudoers_aes

 klaar36 ALL=(ALL) NOPASSWD: ALL
 filst04 ALL=(ALL) NOPASSWD: ALL
 
-User_Alias EXAM_ADMINS = torjo38, klaar36, vikol94, magni54, filst04
-Runas_Alias EXAM_USER = examadm, %examadm, opendsa, %opendsa
+User_Alias EXAM_ADMINS = torjo38, klaar36, vikol94, magni54, filst04, emmen85
+Runas_Alias EXAM_USER = examadm, %examadm, opendsa, %opendsa, squid, %squid
 
 Cmnd_Alias SERVICE_CMDS = /usr/bin/systemctl, /usr/bin/less
 

manifests/autocorr.pp

+class aes::autocorr {
+
+  $autocorr_user = autocorr
+  $autocorr_group = $autocorr_user
+  $autocorr_home = "/home/${autocorr_user}"
+
+  user { 'autocorr' :
+    ensure     => present,
+    managehome => false,
+    membership => inclusive,
+    system     => true,
+    shell      => '/bin/bash',
+  }
+
+  file { $autocorr_home:
+    ensure => directory,
+    mode   => '0755',
+    owner  => $autocorr_user,
+    group  => $autocorr_group,
+  }
+
+  file { "${autocorr_home}/.ssh":
+    ensure => directory,
+    mode   => '0700',
+    owner  => $autocorr_user,
+    group  => $autocorr_group,
+  }
+
+  file { "${autocorr_home}/.ssh/authorized_keys":
+    ensure  => file,
+    mode   => '0600',
+    owner  => $autocorr_user,
+    group  => $autocorr_group,
+    content => @(SSHPUBKEY),
+command="if [[ \"$SSH_ORIGINAL_COMMAND\" =~ ^scp[[:space:]]-f[[:space:]]/home/examadm/Version-3.1/exam/[[:space:]0-9a-zA-Z_/.-]*$ ]]; then $SSH_ORIGINAL_COMMAND; else >&2 echo \"ERROR Access Denied ('$SSH_ORIGINAL_COMMAND')\"; fi",no-pty,no-user-rc,no-port-forwarding,no-agent-forwarding,no-X11-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCu/so6GPeUOpK0Zeiv8pM4UF4BAGnbjc92rYJP7PH2tnCvzTcj7Zx5fw6oyoFPw7SJ21ybIYHr1Eef7LsfJc6lOx/xNm8XABhOJw7Gy12WnjRF9SmsT7+YqJDvDOeN89PvzmHNdhpCerpdhDGvAKu2MjP2fAEW0eIgHWYfzFwQxXqfsEdKYAtIx0v/VTLxFjtZOz5PQGAPR28NZkffMt1ePaAO5WUwjkxcyIbrtrOWWYDtqa9G7gTwgdf7m9IG69G6sqKGzyZrfd0nrpMmtWmX6/9bWwUk1ADaLdEFiupsZ9k+QsLB7/v7fxzbPD61yAJ75JUecghlXFJ4ob9OsmPz torjo@upp
+    | SSHPUBKEY
+  }
+}

manifests/init.pp

@@ -8,6 +8,7 @@ class aes {
   include aes::broker
   include aes::auth
   include aes::auth_keydb
+  include aes::autocorr
   include liurepo::centos_sclo_rh
 
   package {
@@ -100,6 +101,12 @@ 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