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

Conflicts:
	manifests/init.pp

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

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',