From bc2119a1791c13a9232497a2265a153e0792046d Mon Sep 17 00:00:00 2001
From: saganorenkarlson <sagno626@student.liu.se>
Date: Thu, 13 Jun 2024 13:44:09 +0200
Subject: [PATCH] Uncommented apache vhost configs
---
manifests/init.pp | 63 +++++++++++++++++++++++++----------------------
1 file changed, 33 insertions(+), 30 deletions(-)
diff --git a/manifests/init.pp b/manifests/init.pp
index fb654be..33f5f0b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -112,35 +112,6 @@ class aim_control (
$chain = fact("letsencrypt_certs.\"${fact('networking.fqdn')}\".files.chain")
$key = fact("letsencrypt_certs.\"${fact('networking.fqdn')}\".files.key")
- # apache::vhost { 'default:80':
- # servername => $facts['networking']['fqdn'],
- # default_vhost => true,
- # port => '80',
- # docroot => '/var/www/html',
- # redirect_status => 'permanent',
- # redirect_dest => "https://${facts['networking']['fqdn']}/",
- # }
-
- # apache::vhost { "${facts['networking']['fqdn']}:443":
- # servername => $facts['networking']['fqdn'],
- # port => '443',
- # ssl => true,
- # ssl_cert => $cert,
- # ssl_chain => $chain,
- # ssl_key => $key,
- # headers => ['Set Strict-Transport-Security "max-age=31536000"',],
- # docroot => '/var/www/skadereg/public',
- # docroot_owner => 'apache',
- # docroot_group => 'skadereg',
- # directories => [
- # {
- # path => '/var/www/skadereg/public',
- # allow_override => [ 'ALL' ],
- # directoryindex => 'index.php',
- # }
- # ],
- # }
-
file { '/var/www/skadereg/':
ensure => directory,
owner => 'apache',
@@ -149,12 +120,44 @@ class aim_control (
recurse => true,
}
- -> vcsrepo { '/var/www/skadereg':
+# TODO: Add setup for keys
+ vcsrepo { '/var/www/skadereg':
ensure => latest,
provider => git,
source => 'git@gitlab.liu.se:aim-control/laravel.git',
user => 'apache',
group => 'skadereg',
+ require => File['/var/www/skadereg/'], # Ensure directory is created first
+ }
+
+ apache::vhost { 'default:80':
+ servername => $facts['networking']['fqdn'],
+ default_vhost => true,
+ port => 80,
+ docroot => '/var/www/html',
+ redirect_status => 'permanent',
+ redirect_dest => "https://${facts['networking']['fqdn']}/",
+ }
+
+ apache::vhost { "${facts['networking']['fqdn']}:443":
+ servername => $facts['networking']['fqdn'],
+ port => 443,
+ ssl => true,
+ ssl_cert => $cert,
+ ssl_chain => $chain,
+ ssl_key => $key,
+ headers => ['Set Strict-Transport-Security "max-age=31536000"'],
+ docroot => '/var/www/skadereg/public',
+ docroot_owner => 'apache',
+ docroot_group => 'skadereg',
+ directories => [
+ {
+ path => '/var/www/skadereg/public',
+ allow_override => ['ALL'],
+ directoryindex => 'index.php',
+ }
+ ],
+ require => Vcsrepo['/var/www/skadereg'], # Ensure VCS repo is checked out first
}
# -> file { '/var/www/skadereg/.env':
--
GitLab