Merge branch 'production' of gitlab.stud.idi.ntnu.no:puppet/control-repo

manifests/site.pp

@@ -61,7 +61,7 @@ node 'elk-server.openstacklocal' {
   }
 
   logstash::configfile { 'es-01-out':
-      source => 'puppet:///site-modules/logstash_conf/30-elasticsearch-output.conf',
+      source => 'puppet:///modules/logstash_conf/30-elasticsearch-output.conf',
       path   => '/etc/logstash/conf.d/30-elasticsearch-output.conf'
   }