From 0e84889dc6c89e7ad579eb0b24b9114425e1268b Mon Sep 17 00:00:00 2001
From: Simen Bai <git@simenbai.no>
Date: Fri, 29 Oct 2021 13:45:20 +0200
Subject: [PATCH] Moved module and added it as local in puppetfile

---
 .gitignore                                                    | 4 +++-
 Puppetfile                                                    | 4 +++-
 .../logstash_conf/files/30-elasticsearch-output.conf          | 0
 site-modules/logstash_conf/.gitkeep                           | 0
 site-modules/logstash_conf/files/.gitkeep                     | 0
 5 files changed, 6 insertions(+), 2 deletions(-)
 rename {site-modules => modules}/logstash_conf/files/30-elasticsearch-output.conf  (100%)
 delete mode 100644 site-modules/logstash_conf/.gitkeep
 delete mode 100644 site-modules/logstash_conf/files/.gitkeep

diff --git a/.gitignore b/.gitignore
index 52146d6..fce0fd4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-modules/
+/modules/
+# Include custom module
+!/modules/logstash_conf
diff --git a/Puppetfile b/Puppetfile
index fc4e0f6..b7149ca 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -16,6 +16,8 @@ forge 'https://forge.puppet.com'
 #  git:    'https://github.com/puppetlabs/puppetlabs-apache',
 #  branch: 'docs_experiment'
 
+mod 'logstash_conf', :local => true
+
 mod 'puppetlabs-stdlib', '8.1.0'
 mod 'puppetlabs-apt', '8.3.0'
 mod 'puppet-yum', '5.3.0'
@@ -28,4 +30,4 @@ mod 'richardc-datacat', '0.6.2'
 mod 'puppetlabs-java', '7.3.0'
 mod 'puppet-nginx', '3.3.0'
 mod 'puppetlabs-concat', '7.1.1'
-mod 'puppetlabs-apache', '7.0.0'
+mod 'puppetlabs-apache', '7.0.0'
\ No newline at end of file
diff --git a/site-modules/logstash_conf/files/30-elasticsearch-output.conf  b/modules/logstash_conf/files/30-elasticsearch-output.conf 
similarity index 100%
rename from site-modules/logstash_conf/files/30-elasticsearch-output.conf 
rename to modules/logstash_conf/files/30-elasticsearch-output.conf 
diff --git a/site-modules/logstash_conf/.gitkeep b/site-modules/logstash_conf/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/site-modules/logstash_conf/files/.gitkeep b/site-modules/logstash_conf/files/.gitkeep
deleted file mode 100644
index e69de29..0000000
-- 
GitLab