Merge branch 'production' of ssh://gitlab.it.liu.se:29418/pm-liuit/skadereg into production

manifests/init.pp

@@ -44,11 +44,40 @@
 #
 class skadereg {
   ::users::liu_user { 'andal699':
-    commonname   => 'Andreas Alvarsson',
-    shell  => '/bin/bash',
-    sshkey => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQDBwLJB6f+wJqPl81NwT5NM7ughW6fdk3Jf6W0IWX2Ta7PChjnlBgpNGfec59+iuDBs3V/zFJqwUjIWNG8MshbJPShjhM5CpAf0VSsqd+MRlYtXw1Wtp3uwkbj62n9i8VlP1bKXgbnd4C4qiQ8xNJetMb45Alm3ueeyEHpmQbi4JpFvREaN7hDUfIEITPItgsZtV36Gs1nn+OHdV03wll0AddmD1SiIJPWqtO+RKS58oD3yqagthoLP7QdjB2vptaVhlg+e3SJuOFkC9AgQvzHBPh+NGJSZAe7IQXk3wENYZotEuGOKnQ3cFhMtf3TkoMLfglMtYl3oP1CxcecLkd47',
+    commonname => 'Andreas Alvarsson',
+    shell      => '/bin/bash',
+    sshkey     => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQDBwLJB6f+wJqPl81NwT5NM7ughW6fdk3Jf6W0IWX2Ta7PChjnlBgpNGfec59+iuDBs3V/zFJqwUjIWNG8MshbJPShjhM5CpAf0VSsqd+MRlYtXw1Wtp3uwkbj62n9i8VlP1bKXgbnd4C4qiQ8xNJetMb45Alm3ueeyEHpmQbi4JpFvREaN7hDUfIEITPItgsZtV36Gs1nn+OHdV03wll0AddmD1SiIJPWqtO+RKS58oD3yqagthoLP7QdjB2vptaVhlg+e3SJuOFkC9AgQvzHBPh+NGJSZAe7IQXk3wENYZotEuGOKnQ3cFhMtf3TkoMLfglMtYl3oP1CxcecLkd47',
   }
 
+  # include ::apache
+  # include ::apache::mod_php
+  # include ::certdist
+
+  # $cert = "/etc/pki/tls/certs/cert-${::fqdn}.pem"
+  # $chain = "/etc/pki/tls/certs/chain-${::fqdn}.pem"
+  # $key = "/etc/pki/tls/private/${::fqdn}.key"
+
+  # apache::vhost { 'default:80':
+  #   servername      => $::fqdn,
+  #   default_vhost   => true,
+  #   port            => '80',
+  #   docroot         => '/var/www/html',
+  #   redirect_status => 'permanent',
+  #   redirect_dest   => "https://${::fqdn}/",
+  # }
+  # apache::vhost { "${::fqdn}:443":
+  #   servername            => $::fqdn,
+  #   port                  => '443',
+  #   ssl                   => true,
+  #   ssl_cert              => $cert,
+  #   ssl_chain             => $chain,
+  #   ssl_key               => $key,
+  #   headers               => ['Set Strict-Transport-Security "max-age=31536000"',],
+  #   docroot               => '/var/www',
+  #   proxy_preserve_host   => true,
+  #   allow_encoded_slashes => 'on',
+  # }
+
   include ::yum::centos_scl
 
   file { '/tmp/example':