From cbaa6d3c787db316aee3e42860f0310169618629 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Mon, 13 Jun 2022 22:41:58 +0200
Subject: Update blog module to use package.

---
 manifests/init.pp     |  8 ++++++++
 manifests/instance.pp | 25 ++++++++++++++++---------
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 8d159d4..85a6482 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -7,6 +7,14 @@ class blog (
   String $blog_server_name = 'blog-server',
 ) {
 
+  ensure_packages(['website-blog-2', 'php-fpm'])
+
+  file { '/var/website-blog-2':
+    ensure => directory,
+  }
+  file { '/var/website-blog-2/.workdirs':
+    ensure => directory,
+  }
 
   $default = {
     access_log           => 'absent',
diff --git a/manifests/instance.pp b/manifests/instance.pp
index 4481d3b..e727b70 100644
--- a/manifests/instance.pp
+++ b/manifests/instance.pp
@@ -2,7 +2,6 @@ define blog::instance (
   String $author,
   String $blog_title = $name,
   Boolean $has_comments = false,
-  String $engine_version = '8.0',
   String $subtitle = '',
   Optional[Struct[{ url => String, ref => String}]] $vcs_repo = undef,
 ) {
@@ -10,14 +9,22 @@ define blog::instance (
   $root = "${blog::blog_root}/${title}"
   $safe_title = base64('encode', $blog_title)
 
-  # Download source
-  vcsrepo { $root:
-    ensure   => latest,
-    provider => git,
-    source   => 'https://github.com/HugoNikanor/website-blog-2.git',
-    revision => $engine_version,
-    group    => 'www-data',
-    # keep_local_changes => true,
+  $upperdir = "/var/website-blog-2/${title}"
+  $workdir = "/var/website-blog-2/.workdirs/${title}"
+  file { [ $upperdir, $workdir ]:
+    ensure => directory,
+  }
+
+  mount { $root:
+    ensure  => mounted,
+    atboot  => true,
+    device  => 'overlay',
+    fstype  => 'overlay',
+    options => [
+    'lowerdir=/usr/share/website-blog-2',
+    "upperdir=${upperdir}",
+    "workdir=${workdir}",
+    ].join(',')
   }
 
   # Manage entries directory
-- 
cgit v1.2.3