diff --git a/files/squid/helpers/rules.d/opendsa.rules b/files/squid/helpers/rules.d/opendsa.rules index 4c36719c8ff49ab46637b8934544252cded77471..724eedbdae57aef32333fb75a67ea981a419afd9 100644 --- a/files/squid/helpers/rules.d/opendsa.rules +++ b/files/squid/helpers/rules.d/opendsa.rules @@ -2,6 +2,8 @@ // ^.* false +^https?://www\.ida\.liu\.se/edu/ugrad/datortenta/OpenDSA/Books/TDDD86_200317/.* true + ^https?://www\.ida\.liu\.se/edu/ugrad/datortenta/OpenDSA/Books/.* false ^https?://www\.ida\.liu\.se/edu/ugrad/datortenta/OpenDSA/lib/.* true ^https?://www\.ida\.liu\.se/edu/ugrad/datortenta/OpenDSA/JSAV/.* true diff --git a/manifests/init.pp b/manifests/init.pp index d06fa4209cf1ea522c87618796fbe5dc9c2bad9b..2a1ff0e7024ce71df53d73bd34f752b75fa0fb71 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -48,6 +48,15 @@ class aes { content => file("${module_name}/update_repo.sh"), } + # File to easily see when Puppet was last executed. + # Ideally, we would like to know if it is devel or production as well. + exec { '/usr/bin/touch /var/last_puppet_run' : + cwd => "/var", + creates => "/var/last_puppet_run", + user => root, + group => root, + } + ::users::liu_user { 'klaar36': commonname => 'Klas Arvidsson', shell => '/bin/bash',