miscweb: Add generic fqdn vhost over 443/HTTPS

Fold miscweb-fqdn back into miscweb-sites so that we don't need
another hieradata variable to specify which cert to use for this.

This shouldn't change upgrade simplicity because either way we'll
need a node hieradata

Ref #87.

Author: Krinkle

hieradata/environments/production/roles/miscweb.yaml

@@ -18,6 +18,7 @@ profile::certbot::certificates:
       - bugs.jqueryui.com
       - plugins.jquery.com
 profile::notifier::tls_key_name: miscweb-fqdn
+profile::miscweb::fqdn_certificate: miscweb-fqdn
 profile::miscweb::default_certificate: miscweb-sites
 
 profile::miscweb::sites:

modules/profile/manifests/miscweb.pp

@@ -3,6 +3,7 @@
   String[1]                                      $default_certificate = lookup('profile::miscweb::default_certificate'),
   Hash[Stdlib::Fqdn, Profile::Miscweb::Site]     $sites               = lookup('profile::miscweb::sites'),
   Hash[Stdlib::Fqdn, Profile::Miscweb::Redirect] $redirects           = lookup('profile::miscweb::redirects'),
+  String[1]                                      $fqdn_certificate    = lookup('profile::miscweb::fqdn_certificate'),
 ) {
   nftables::allow { 'miscweb-https':
     proto => 'tcp',
@@ -97,4 +98,17 @@
       require => Letsencrypt::Certificate[$certificate],
     }
   }
+
+  # Ease host upgrades by defining a generic FQDN vhost over 443/HTTPS
+  # which we use in Fastly to connect to the origin by FQDN
+  # https://github.com/jquery/infrastructure-puppet/issues/87
+  $fqdn = $::facts['networking']['fqdn']
+  $redirect = {
+    'target' => 'https://jquery.com',
+    'mode' => 'root',
+  }
+  nginx::site { 'fqdn_redirect':
+    content => template('profile/miscweb/redirect.nginx.erb'),
+    require => Letsencrypt::Certificate[$fqdn_certificate],
+  }
 }