From b40eb48b7c498887efee6a8adf3c3564412f2a2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Sat, 10 Sep 2022 11:33:08 +0200
Subject: Update names to match module name.

---
 manifests/init.pp     |  6 +++---
 manifests/instance.pp | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 85a6482..d01f505 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,4 +1,4 @@
-class blog (
+class website_blog_2 (
   String $blog_root,
   String $certname,
   String $domain,
@@ -32,7 +32,7 @@ class blog (
     *           => $default,
     server_name => [ $domain, ],
     index_files => [ 'index.php', 'index.html', 'index.htm', ],
-    www_root    => $blog::blog_root,
+    www_root    => $blog_root,
   }
 
   if $domain_aliases {
@@ -45,5 +45,5 @@ class blog (
     }
   }
 
-  create_resources(blog::instance, $blogs)
+  create_resources(website_blog_2::instance, $blogs)
 }
diff --git a/manifests/instance.pp b/manifests/instance.pp
index e727b70..df1df65 100644
--- a/manifests/instance.pp
+++ b/manifests/instance.pp
@@ -1,4 +1,4 @@
-define blog::instance (
+define website_blog_2::instance (
   String $author,
   String $blog_title = $name,
   Boolean $has_comments = false,
@@ -6,7 +6,7 @@ define blog::instance (
   Optional[Struct[{ url => String, ref => String}]] $vcs_repo = undef,
 ) {
 
-  $root = "${blog::blog_root}/${title}"
+  $root = "${website_blog_2::blog_root}/${title}"
   $safe_title = base64('encode', $blog_title)
 
   $upperdir = "/var/website-blog-2/${title}"
@@ -44,7 +44,7 @@ define blog::instance (
 
   file { "${root}/settings.php":
     ensure  => file,
-    content => epp('blog/settings.php.epp', {
+    content => epp("${module_name}/settings.php.epp", {
       author       => $author,
       title        => $blog_title,
       subtitle     => $subtitle,
@@ -66,14 +66,14 @@ define blog::instance (
 
   $foot_files.each |$item| {
     file { "${root}/footnote/${item[0]}":
-      source => "puppet:///modules/blog/footers/${item[0]}",
+      source => "puppet:///modules/${module_name}/footers/${item[0]}",
     }
   }
 
   file { "${root}/special-files.ini":
     ensure       => file,
     content      => epp(
-      'blog/special-files.ini.epp',
+      "${module_name}/special-files.ini.epp",
       { foot_files => $foot_files, }),
   }
 
@@ -84,7 +84,7 @@ define blog::instance (
     ssl               => true,
     ssl_only          => true,
     autoindex         => on,
-    server            => $blog::blog_server_name,
+    server            => $website_blog_2::blog_server_name,
     add_header        => {
       'Cache-Control' => "no-cache",
     },
@@ -95,7 +95,7 @@ define blog::instance (
     try_files  => [ '$uri', '=404' ],
     ssl        => true,
     ssl_only   => true,
-    server     => $blog::blog_server_name,
+    server     => $website_blog_2::blog_server_name,
     expires    => '1h',
     add_header => {
       'Cache-Control' => "no-cache",
@@ -108,7 +108,7 @@ define blog::instance (
     fastcgi        => 'unix:/run/php/php-fpm.sock',
     ssl            => true,
     ssl_only       => true,
-    server         => $blog::blog_server_name,
+    server         => $website_blog_2::blog_server_name,
   }
 
   nginx::resource::location { "${safe_title} - ht":
@@ -116,6 +116,6 @@ define blog::instance (
     location_cfg_append => { deny => 'all' },
     index_files         => [],
     ssl                 => true,
-    server              => $blog::blog_server_name,
+    server              => $website_blog_2::blog_server_name,
   }
 }
-- 
cgit v1.2.3