From a36b203e6ed0cfcd3ac057b86afc4dc1931adb98 Mon Sep 17 00:00:00 2001
From: Joakim Olovsson <joakim.olovsson@liu.se>
Date: Mon, 26 Sep 2022 07:40:19 +0200
Subject: [PATCH] Now everything should work as expected
---
manifests/init.pp | 54 +++++++++++++++++++++++------------------------
1 file changed, 27 insertions(+), 27 deletions(-)
diff --git a/manifests/init.pp b/manifests/init.pp
index 7c469ca..847abfb 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -6,33 +6,33 @@ class bright (
include nginx
profiles::letsencrypt::cert { fact('networking.fqdn'): }
-# nginx::resource::server { fact('networking.fqdn'):
-# ensure => present,
-# www_root => $www_root,
-# location_cfg_append => {
-# 'rewrite' => '^ https://$server_name$request_uri? permanent',
-# },
-# }
-#
-# nginx::resource::server { "${fact('networking.fqdn')} HTTPS":
-# ensure => present,
-# listen_port => 443,
-# www_root => $www_root,
-# index_files => $index_files,
-# ssl => true,
-# ssl_cert => fact("letsencrypt_certs.\"${fact('networking.fqdn')}\".files.combined"),
-# ssl_key => fact("letsencrypt_certs.\"${fact('networking.fqdn')}\".files.key"),
-# ssl_protocols => 'TLSv1.3 TLSv1.2',
-# ssl_ciphers => 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384',
-# }
-#
-# nginx::resource::location { '/test':
-# ensure => present,
-# ssl => true,
-# ssl_only => true,
-# server => "${fact('networking.fqdn')} HTTPS",
-# proxy => 'http://localhost:8100/',
-# }
+ nginx::resource::server { fact('networking.fqdn'):
+ ensure => present,
+ www_root => $www_root,
+ location_cfg_append => {
+ 'rewrite' => '^ https://$server_name$request_uri? permanent',
+ },
+ }
+
+ nginx::resource::server { "${fact('networking.fqdn')} HTTPS":
+ ensure => present,
+ listen_port => 443,
+ www_root => $www_root,
+ index_files => $index_files,
+ ssl => true,
+ ssl_cert => fact("letsencrypt_certs.\"${fact('networking.fqdn')}\".files.combined"),
+ ssl_key => fact("letsencrypt_certs.\"${fact('networking.fqdn')}\".files.key"),
+ ssl_protocols => 'TLSv1.3 TLSv1.2',
+ ssl_ciphers => 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384',
+ }
+
+ nginx::resource::location { '/test':
+ ensure => present,
+ ssl => true,
+ ssl_only => true,
+ server => "${fact('networking.fqdn')} HTTPS",
+ proxy => 'http://localhost:8100/',
+ }
firewalld_service {
default:
--
GitLab