From 2bd3c22b153c0c893809e275f620f441af2ac69a Mon Sep 17 00:00:00 2001
From: Klas Arvidsson <klas.arvidsson@liu.se>
Date: Wed, 2 Oct 2019 22:38:51 +0200
Subject: [PATCH] corrected module structure
---
manifests/init.pp | 2 ++
manifests/squid_filter.pp | 5 ++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/manifests/init.pp b/manifests/init.pp
index 46e9466..77bdf90 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,4 +1,5 @@
class aes {
+ include aes::squid_filter
include ::liurepo::centos_sclo_rh
package {
@@ -40,4 +41,5 @@ class aes {
end policy
|-EOF
}
+
}
diff --git a/manifests/squid_filter.pp b/manifests/squid_filter.pp
index 438bbdb..adcaa5e 100644
--- a/manifests/squid_filter.pp
+++ b/manifests/squid_filter.pp
@@ -1,4 +1,4 @@
-class squid_filter {
+class aes::squid_filter {
package { "squid" :
ensure => "present",
@@ -19,7 +19,7 @@ class squid_filter {
mode => '0644',
owner => root,
group => root,
- content => file("${module_name}/squid/helpers"),
+ source => "puppet:///modules/${module_name}/squid/helpers",
}
file { '/var/cache/squid' :
@@ -47,4 +47,3 @@ class squid_filter {
}
}
-
--
GitLab