Merge branch 'devel' into 'test'

Devel

See merge request !9

files/egg.conf

@@ -19,18 +19,24 @@ server {
 }
 
 server {
+        listen [::]:80 ipv6only=on ;
         listen 80;
+
         server_name ntadigital.it.liu.se;
 
         location / {
-            return 301 http://egg.it.liu.se;
+            return 301 https://egg.it.liu.se;
         }
 }
 
 server {
-        listen 80;
+        listen [::]:443 ssl ipv6only=on ;
+        listen 443 ssl ;
         server_name egg.it.liu.se;
 
+        ssl_certificate /etc/pki/tls/certs/letsencrypt-cert_chain-egg.devel.it.liu.se.pem  ;
+        ssl_certificate_key /etc/pki/tls/private/letsencrypt-egg.devel.it.liu.se.key ;
+
         client_max_body_size 0;
 
         location = /favicon.ico {

manifests/nginx.pp

 # intelligent comment here
 class egg::nginx () {
   $hostname = fact( 'networking.fqdn' )
-  $hostalias = []
+  $hostalias = ['teman.it.liu.se', 'ntadigital.it.liu.se', 'egg.it.liu.se']
+  profiles::letsencrypt::cert { $hostname :
+    addn_domains => $hostalias
+  }
   package { 'nginx':
     ensure => 'installed',
   }
@@ -20,7 +23,7 @@ class egg::nginx () {
 
   # Housekeeping
   service { 'nginx':
-    ensure => 'running',
+    ensure => 'stopped',
     enable => true,
   }
   firewalld_service { 'Allow http in the liu Zone':