stuff

2 files changed, 2 insertions, 55 deletions

diff --git a/modules/profiles/manifests/gandalf_web.pp b/modules/profiles/manifests/gandalf_web.pp
index 1295d83..98b539f 100644
--- a/modules/profiles/manifests/gandalf_web.pp
+++ b/modules/profiles/manifests/gandalf_web.pp
@@ -2,21 +2,7 @@ class profiles::gandalf_web (
   String $certname,
 ) {
 
-  class { '::nginx':
-    manage_repo          => false,
-    # server_purge       => true,
-    package_name         => 'nginx-mainline',
-    service_config_check => true,
-    http_cfg_append      => {
-      'charset'          => 'utf-8',
-    },
-    mime_types_preserve_defaults => true,
-    mime_types => {
-      'text/plain' => 'wiki txt',
-    },
-    include_modules_enabled => true,
-    server_purge            => true,
-  }
+  include ::nginx
 
   file { '/etc/nginx/modules-enabled':
     ensure  => directory,
@@ -60,43 +46,4 @@ class profiles::gandalf_web (
     post_hook_commands => [ 'systemctl restart nginx.service', ],
   }
 
-
-  nginx::resource::server { 'gandalf':
-    ipv6_enable          => true,
-    listen_options       => 'default_server',
-    ipv6_listen_options  => 'default_server',
-    server_name          => [ '_' ],
-    access_log           => absent,
-    error_log            => absent,
-    ssl                  => true,
-    ssl_cert             => "/etc/letsencrypt/live/${certname}/fullchain.pem",
-    ssl_key              => "/etc/letsencrypt/live/${certname}/privkey.pem",
-    ssl_redirect         => true,
-    index_files          => [ 'index.html', ],
-    www_root             => '/var/www/adrift.space',
-    use_default_location => false,
-  }
-
-  nginx::resource::location { '/':
-    try_files   => ['$uri', '$uri/', '=404'],
-    index_files => [],
-    ssl         => true,
-    ssl_only    => true,
-    autoindex   => on,
-    server      => 'gandalf',
-  }
-
-  nginx::resource::server { 'repo.gandalf.adrift.space':
-    ipv6_enable         => true,
-    ipv6_listen_options => '',
-    server_name         => [ 'repo.gandalf.adrift.space', ],
-    ssl                 => true,
-    ssl_cert             => "/etc/letsencrypt/live/${certname}/fullchain.pem",
-    ssl_key              => "/etc/letsencrypt/live/${certname}/privkey.pem",
-    ssl_redirect         => true,
-    index_files          => [ 'index.html', ],
-    www_root             => '/usr/net/repo/',
-    use_default_location => true,
-  }
-
 }
diff --git a/modules/profiles/manifests/puppetserver.pp b/modules/profiles/manifests/puppetserver.pp
index 77d0d47..0dd1146 100644
--- a/modules/profiles/manifests/puppetserver.pp
+++ b/modules/profiles/manifests/puppetserver.pp
@@ -49,7 +49,7 @@ class profiles::puppetserver {
       {
         'name' => 'local nodes',
         'path' => 'nodes/%{trusted.certname}.yaml'
-      }
+      },
     ]
   }