From c4550e854d78c4e79da20d31b2a4ca0311b46857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Tue, 29 Jun 2021 22:29:16 +0200 Subject: Blog working. --- manifests/site.pp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'manifests/site.pp') diff --git a/manifests/site.pp b/manifests/site.pp index a18bec7..1613c64 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -3,7 +3,8 @@ node 'hornquist.se' { 'cowsay', ], { ensure => installed }) - $cgit_root = '/var/www/cgit'; + $cgit_root = '/var/www/cgit' + $blog_root = '/var/www/blog' class { '::cgit': root => $cgit_root, @@ -20,6 +21,10 @@ node 'hornquist.se' { ], } + blog { 'Hugos blog': + root => "${blog_root}/hugo", + } + service { 'php7.4-fpm': ensure => running, enable => true, @@ -92,7 +97,7 @@ node 'hornquist.se' { ssl_cert => "/etc/letsencrypt/live/${certname}/fullchain.pem", ssl_key => "/etc/letsencrypt/live/${certname}/privkey.pem", use_default_location => false, - www_root => '/var/www/blog', + www_root => $blog_root, } nginx::resource::server { 'hornquist': @@ -231,7 +236,7 @@ node 'hornquist.se' { ], } - nginx::resource::location { '~ \.ht': + nginx::resource::location { '~ /\.ht': location_cfg_append => { deny => 'all' }, index_files => [], ssl => true, @@ -241,5 +246,4 @@ node 'hornquist.se' { 'userdir', ], } - } -- cgit v1.2.3