Aliases support on nginx::site

diff --git a/manifests/site.pp b/manifests/site.pp
index f73ae30cd0450840ae828b0ffb9721c407ec20ef..851d4718b49039cec8bb587e90ad0af06caf35c9 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -5,28 +5,32 @@ define nginx::site(
   $certbot  = true,
   $template = 'site',
   $backend  = 'weblocal',
+  $aliases  = "*.${name}",
 ) {
   nginx::site::config { $name:
     ensure   => $ensure,
     source   => $source,
     template => $template,
     backend  => $backend,
+    aliases  => $aliases,
   }
 
   if $certbot == true {
     certbot::manage { $name:
+      aliases  => $aliases,
       pre_hook => '/usr/sbin/service nginx restart',
       require  => Nginx::Site::Config[$name],
     }
   }
 
   nginx::site::config { "${name}-ssl":
-    use_fqdn  => $name,
-    ensure    => $ssl,
-    source    => $source,
-    template  => "${template}-ssl",
-    backend   => $backend,
-    require   => $certbot ? {
+    server_name => $name,
+    ensure      => $ssl,
+    source      => $source,
+    template    => "${template}-ssl",
+    backend     => $backend,
+    aliases     => $aliases,
+    require     => $certbot ? {
       true    => Certbot::Manage[$name],
       default => undef,
     }

diff --git a/manifests/site/config.pp b/manifests/site/config.pp
index 4bea4952df45edf31c50c9d82de0176616bc4e59..ff8187ef80a3dba3c0c078db455a44dc2e0ad7a9 100644 (file)
--- a/manifests/site/config.pp
+++ b/manifests/site/config.pp
@@ -1,9 +1,10 @@
 define nginx::site::config(
-  $use_fqdn = $name,
-  $ensure   = present,
-  $source   = 'template',
-  $template = 'site',
-  $backend  = 'weblocal',
+  $server_name = $name,
+  $ensure      = present,
+  $source      = 'template',
+  $template    = 'site',
+  $backend     = 'weblocal',
+  $aliases     = "*.${name}",
 ){
   case $source {
     'file': {

diff --git a/templates/site-ssl.erb b/templates/site-ssl.erb
index 57b285f85289d7be6129d8097f89c798aafa4b4d..c0af188da0d5ce09beeb6d7a2ebdae2e1574022b 100644 (file)
--- a/templates/site-ssl.erb
+++ b/templates/site-ssl.erb
@@ -1,10 +1,10 @@
 server {
   listen      443;
-  server_name *.<%= @use_fqdn %> <%= @use_fqdn %>;
+  server_name <%= @server_name %> <%= @aliases %>;
 
   ssl on;
-  ssl_certificate     /etc/letsencrypt/live/<%= @use_fqdn %>/fullchain.pem;
-  ssl_certificate_key /etc/letsencrypt/live/<%= @use_fqdn %>/privkey.pem;
+  ssl_certificate     /etc/letsencrypt/live/<%= @server_name %>/fullchain.pem;
+  ssl_certificate_key /etc/letsencrypt/live/<%= @server_name %>/privkey.pem;
 
   # enable HSTS header
   add_header Strict-Transport-Security "max-age=15768000; includeSubdomains; preload";

diff --git a/templates/site.erb b/templates/site.erb
index 9c575cb91a00d9cd25728b790640295aa6172db1..3fe5f8148a5280dcd16c7654078154e7d93fb11f 100644 (file)
--- a/templates/site.erb
+++ b/templates/site.erb
@@ -1,9 +1,9 @@
 server {
-  listen       80;
-  server_name  *.<%= @use_fqdn %> <%= @use_fqdn %>;
+  listen      80;
+  server_name <%= @server_name %> <%= @aliases %>;
 
   location /.well-known/acme-challenge {
-    root /var/spool/certbot/<%= @use_fqdn %>;
+    root /var/spool/certbot/<%= @server_name %>;
   }
 
   location / {