From e0df4ae947ee5d7512379f5467750f77a34ababd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Mon, 3 Jan 2022 22:53:06 +0100
Subject: Fix blog.

---
 manifests/site.pp                       | 2 +-
 modules/blog/manifests/blog.pp          | 6 ------
 modules/blog/manifests/init.pp          | 6 ++++++
 modules/blog/manifests/instance.pp      | 2 +-
 modules/blog/templates/settings.php.epp | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 modules/blog/manifests/blog.pp
 create mode 100644 modules/blog/manifests/init.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index 1097af3..92c907b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -159,6 +159,7 @@ node 'hornquist.se' {
 
   # https://buddy.works/blog/how-deploy-projects-with-git
   include ::blog
+
   nsupdate { 'hornquist.se':
     ensure     => present,
     nameserver => 'ns2.adrift.space',
@@ -171,7 +172,6 @@ node 'hornquist.se' {
 
   $certname = 'hornquist'
 
-
   service { 'php7.4-fpm':
     ensure => running,
     enable => true,
diff --git a/modules/blog/manifests/blog.pp b/modules/blog/manifests/blog.pp
deleted file mode 100644
index 9b5f050..0000000
--- a/modules/blog/manifests/blog.pp
+++ /dev/null
@@ -1,6 +0,0 @@
-class blog (
-  String $blog_root,
-  Hash[String,Hash] $blogs = {}
-) {
-  create_resources(blog::instance, $blogs)
-}
diff --git a/modules/blog/manifests/init.pp b/modules/blog/manifests/init.pp
new file mode 100644
index 0000000..9b5f050
--- /dev/null
+++ b/modules/blog/manifests/init.pp
@@ -0,0 +1,6 @@
+class blog (
+  String $blog_root,
+  Hash[String,Hash] $blogs = {}
+) {
+  create_resources(blog::instance, $blogs)
+}
diff --git a/modules/blog/manifests/instance.pp b/modules/blog/manifests/instance.pp
index dfe95be..9fd793a 100644
--- a/modules/blog/manifests/instance.pp
+++ b/modules/blog/manifests/instance.pp
@@ -5,7 +5,7 @@ define blog::instance (
   String $subtitle = '',
   Optional[String] $vcs_repo = undef,
   Optional[String] $domain = undef,
-  Optional[String] $domain_aliases = undef,
+  Optional[Array[String]] $domain_aliases = undef,
 ) {
 
   $root = "${blog::blog_root}/${title}"
diff --git a/modules/blog/templates/settings.php.epp b/modules/blog/templates/settings.php.epp
index 8f2e62d..c1ed2d7 100644
--- a/modules/blog/templates/settings.php.epp
+++ b/modules/blog/templates/settings.php.epp
@@ -2,8 +2,8 @@
       String $title,
       String $subtitle,
       Boolean $has_comments = false,
--%>
-<?php
+| -%>
+<%= '<?php' %>
 # FILE MANAGED BY PUPPET
 $author = "<%= $author %>";
 $blog_title = "<%= $title %>";
-- 
cgit v1.2.3