From 37964fc0afae1b377a06ef57ee880480f02be595 Mon Sep 17 00:00:00 2001
From: Magnus Toneby <magnus.toneby@liu.se>
Date: Wed, 28 Feb 2024 09:25:28 +0100
Subject: [PATCH 01/14] fix the class names to follow what the class does (and
 make them unique

---
 manifests/init.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index a889fda..a6aa89c 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -28,17 +28,17 @@ class vlc {
   }
 
   # Känner firewall till servicen syncthing ??
-  firewalld_service {'Allow http in the public Zone':
+  firewalld_service {'Allow syncthing in the liu Zone':
     ensure  => present,
     zone    => 'public',
     service => 'syncthing',
   }
-  firewalld_service {'Allow https in the public Zone':
+  firewalld_service {'Allow syncthing in the liu Zone':
     ensure  => present,
     zone    => 'liu',
     service => 'syncthing',
   }
-  firewalld_service {'Allow https in the public Zone':
+  firewalld_service {'Allow syncthing-gui in the liu Zone':
     ensure  => present,
     zone    => 'liu',
     service => 'syncthing-gui',
-- 
GitLab


From d3ca9a05e405b7eaf18fdfe393d33bc27fb4fbc5 Mon Sep 17 00:00:00 2001
From: Magnus Toneby <magnus.toneby@liu.se>
Date: Wed, 28 Feb 2024 09:29:00 +0100
Subject: [PATCH 02/14] pdk update

---
 .gitignore             |   2 +-
 .gitlab-ci.yml         |   4 +
 .pdkignore             |   9 +-
 .rubocop.yml           | 216 +++++++++++++++++++++++++++++++++++++++--
 Gemfile                |  47 +++++----
 Rakefile               |   9 +-
 metadata.json          |   4 +-
 pdk.yaml               |   2 +
 spec/default_facts.yml |   7 +-
 spec/spec_helper.rb    |   4 +-
 10 files changed, 260 insertions(+), 44 deletions(-)
 create mode 100644 pdk.yaml

diff --git a/.gitignore b/.gitignore
index a996532..c817477 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,7 @@
 /log/
 /pkg/
 /spec/fixtures/manifests/
-/spec/fixtures/modules/
+/spec/fixtures/modules/*
 /tmp/
 /vendor/
 /convert_report.txt
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d49a282..97ebb8b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,3 +2,7 @@
 include:
   - project: 'puppet-infra/shared-ci-piplines'
     file: '/puppet-module-pipeline.yaml'
+  - local: .local-ci.yml
+    rules:
+      - exists:
+          - .local-ci.yml
diff --git a/.pdkignore b/.pdkignore
index f962996..8bbed40 100644
--- a/.pdkignore
+++ b/.pdkignore
@@ -16,7 +16,7 @@
 /log/
 /pkg/
 /spec/fixtures/manifests/
-/spec/fixtures/modules/
+/spec/fixtures/modules/*
 /tmp/
 /vendor/
 /convert_report.txt
@@ -29,20 +29,17 @@
 *~
 \#*\#
 .\#*
-/appveyor.yml
-/.editorconfig
 /.fixtures.yml
 /Gemfile
 /.gitattributes
+/.github/
 /.gitignore
-/.gitlab-ci.yml
 /.pdkignore
 /.puppet-lint.rc
 /Rakefile
 /rakelib/
 /.rspec
-/.rubocop.yml
-/.travis.yml
+/..yml
 /.yardopts
 /spec/
 /.vscode/
diff --git a/.rubocop.yml b/.rubocop.yml
index 8f782e7..5be1f9f 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,7 +4,7 @@ require:
 - rubocop-rspec
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: '2.4'
+  TargetRubyVersion: '2.6'
   Include:
   - "**/*.rb"
   Exclude:
@@ -111,8 +111,14 @@ Style/MethodCalledOnDoEndBlock:
   Enabled: true
 Style/StringMethods:
   Enabled: true
+Bundler/GemFilename:
+  Enabled: false
 Bundler/InsecureProtocolSource:
   Enabled: false
+Capybara/CurrentPathExpectation:
+  Enabled: false
+Capybara/VisibilityMatcher:
+  Enabled: false
 Gemspec/DuplicatedAssignment:
   Enabled: false
 Gemspec/OrderedDependencies:
@@ -287,11 +293,9 @@ Performance/UriDefaultParser:
   Enabled: false
 RSpec/Be:
   Enabled: false
-RSpec/Capybara/CurrentPathExpectation:
-  Enabled: false
 RSpec/Capybara/FeatureMethods:
   Enabled: false
-RSpec/Capybara/VisibilityMatcher:
+RSpec/ContainExactly:
   Enabled: false
 RSpec/ContextMethod:
   Enabled: false
@@ -331,6 +335,8 @@ RSpec/LeakyConstantDeclaration:
   Enabled: false
 RSpec/LetBeforeExamples:
   Enabled: false
+RSpec/MatchArray:
+  Enabled: false
 RSpec/MissingExampleGroupArgument:
   Enabled: false
 RSpec/MultipleExpectations:
@@ -373,8 +379,6 @@ Style/AccessModifierDeclarations:
   Enabled: false
 Style/AccessorGrouping:
   Enabled: false
-Style/AsciiComments:
-  Enabled: false
 Style/BisectedAttrAccessor:
   Enabled: false
 Style/CaseLikeIf:
@@ -485,35 +489,235 @@ Style/TrailingMethodEndStatement:
   Enabled: false
 Style/UnpackFirst:
   Enabled: false
+Capybara/MatchStyle:
+  Enabled: false
+Capybara/NegationMatcher:
+  Enabled: false
+Capybara/SpecificActions:
+  Enabled: false
+Capybara/SpecificFinders:
+  Enabled: false
+Capybara/SpecificMatcher:
+  Enabled: false
+Gemspec/DeprecatedAttributeAssignment:
+  Enabled: false
+Gemspec/DevelopmentDependencies:
+  Enabled: false
+Gemspec/RequireMFA:
+  Enabled: false
+Layout/LineContinuationLeadingSpace:
+  Enabled: false
+Layout/LineContinuationSpacing:
+  Enabled: false
+Layout/LineEndStringConcatenationIndentation:
+  Enabled: false
+Layout/SpaceBeforeBrackets:
+  Enabled: false
+Lint/AmbiguousAssignment:
+  Enabled: false
+Lint/AmbiguousOperatorPrecedence:
+  Enabled: false
+Lint/AmbiguousRange:
+  Enabled: false
+Lint/ConstantOverwrittenInRescue:
+  Enabled: false
+Lint/DeprecatedConstants:
+  Enabled: false
 Lint/DuplicateBranch:
   Enabled: false
+Lint/DuplicateMagicComment:
+  Enabled: false
 Lint/DuplicateRegexpCharacterClassElement:
   Enabled: false
 Lint/EmptyBlock:
   Enabled: false
 Lint/EmptyClass:
   Enabled: false
+Lint/EmptyInPattern:
+  Enabled: false
+Lint/IncompatibleIoSelectWithFiberScheduler:
+  Enabled: false
+Lint/LambdaWithoutLiteralBlock:
+  Enabled: false
 Lint/NoReturnInBeginEndBlocks:
   Enabled: false
+Lint/NonAtomicFileOperation:
+  Enabled: false
+Lint/NumberedParameterAssignment:
+  Enabled: false
+Lint/OrAssignmentToConstant:
+  Enabled: false
+Lint/RedundantDirGlobSort:
+  Enabled: false
+Lint/RefinementImportMethods:
+  Enabled: false
+Lint/RequireRangeParentheses:
+  Enabled: false
+Lint/RequireRelativeSelfPath:
+  Enabled: false
+Lint/SymbolConversion:
+  Enabled: false
 Lint/ToEnumArguments:
   Enabled: false
+Lint/TripleQuotes:
+  Enabled: false
 Lint/UnexpectedBlockArity:
   Enabled: false
 Lint/UnmodifiedReduceAccumulator:
   Enabled: false
+Lint/UselessRescue:
+  Enabled: false
+Lint/UselessRuby2Keywords:
+  Enabled: false
+Metrics/CollectionLiteralLength:
+  Enabled: false
+Naming/BlockForwarding:
+  Enabled: false
 Performance/CollectionLiteralInLoop:
   Enabled: false
+Performance/ConcurrentMonotonicTime:
+  Enabled: false
+Performance/MapCompact:
+  Enabled: false
+Performance/RedundantEqualityComparisonBlock:
+  Enabled: false
+Performance/RedundantSplitRegexpArgument:
+  Enabled: false
+Performance/StringIdentifierArgument:
+  Enabled: false
+RSpec/BeEq:
+  Enabled: false
+RSpec/BeNil:
+  Enabled: false
+RSpec/ChangeByZero:
+  Enabled: false
+RSpec/ClassCheck:
+  Enabled: false
+RSpec/DuplicatedMetadata:
+  Enabled: false
+RSpec/ExcessiveDocstringSpacing:
+  Enabled: false
+RSpec/FactoryBot/ConsistentParenthesesStyle:
+  Enabled: false
+RSpec/FactoryBot/FactoryNameStyle:
+  Enabled: false
+RSpec/FactoryBot/SyntaxMethods:
+  Enabled: false
+RSpec/IdenticalEqualityAssertion:
+  Enabled: false
+RSpec/NoExpectationExample:
+  Enabled: false
+RSpec/PendingWithoutReason:
+  Enabled: false
+RSpec/Rails/AvoidSetupHook:
+  Enabled: false
+RSpec/Rails/HaveHttpStatus:
+  Enabled: false
+RSpec/Rails/InferredSpecType:
+  Enabled: false
+RSpec/Rails/MinitestAssertions:
+  Enabled: false
+RSpec/Rails/TravelAround:
+  Enabled: false
+RSpec/RedundantAround:
+  Enabled: false
+RSpec/SkipBlockInsideExample:
+  Enabled: false
+RSpec/SortMetadata:
+  Enabled: false
+RSpec/SubjectDeclaration:
+  Enabled: false
+RSpec/VerifiedDoubleReference:
+  Enabled: false
+Security/CompoundHash:
+  Enabled: false
+Security/IoMethods:
+  Enabled: false
 Style/ArgumentsForwarding:
   Enabled: false
+Style/ArrayIntersect:
+  Enabled: false
 Style/CollectionCompact:
   Enabled: false
+Style/ComparableClamp:
+  Enabled: false
+Style/ConcatArrayLiterals:
+  Enabled: false
+Style/DirEmpty:
+  Enabled: false
 Style/DocumentDynamicEvalDefinition:
   Enabled: false
+Style/EmptyHeredoc:
+  Enabled: false
+Style/EndlessMethod:
+  Enabled: false
+Style/EnvHome:
+  Enabled: false
+Style/FetchEnvVar:
+  Enabled: false
+Style/FileEmpty:
+  Enabled: false
+Style/FileRead:
+  Enabled: false
+Style/FileWrite:
+  Enabled: false
+Style/HashConversion:
+  Enabled: false
+Style/HashExcept:
+  Enabled: false
+Style/IfWithBooleanLiteralBranches:
+  Enabled: false
+Style/InPatternThen:
+  Enabled: false
+Style/MagicCommentFormat:
+  Enabled: false
+Style/MapCompactWithConditionalBlock:
+  Enabled: false
+Style/MapToHash:
+  Enabled: false
+Style/MapToSet:
+  Enabled: false
+Style/MinMaxComparison:
+  Enabled: false
+Style/MultilineInPatternThen:
+  Enabled: false
 Style/NegatedIfElseCondition:
   Enabled: false
+Style/NestedFileDirname:
+  Enabled: false
 Style/NilLambda:
   Enabled: false
+Style/NumberedParameters:
+  Enabled: false
+Style/NumberedParametersLimit:
+  Enabled: false
+Style/ObjectThen:
+  Enabled: false
+Style/OpenStructUse:
+  Enabled: false
+Style/OperatorMethodCall:
+  Enabled: false
+Style/QuotedSymbols:
+  Enabled: false
 Style/RedundantArgument:
   Enabled: false
+Style/RedundantConstantBase:
+  Enabled: false
+Style/RedundantDoubleSplatHashBraces:
+  Enabled: false
+Style/RedundantEach:
+  Enabled: false
+Style/RedundantHeredocDelimiterQuotes:
+  Enabled: false
+Style/RedundantInitialize:
+  Enabled: false
+Style/RedundantSelfAssignmentBranch:
+  Enabled: false
+Style/RedundantStringEscape:
+  Enabled: false
+Style/SelectByRegexp:
+  Enabled: false
+Style/StringChars:
+  Enabled: false
 Style/SwapValues:
   Enabled: false
diff --git a/Gemfile b/Gemfile
index 18272fd..ca0e773 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,28 +13,37 @@ def location_for(place_or_version, fake_version = nil)
   end
 end
 
-ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
-minor_version = ruby_version_segments[0..1].join('.')
-
 group :development do
-  gem "json", '= 2.0.4',                                         require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", '= 2.1.0',                                         require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", '= 2.3.0',                                         require: false if Gem::Requirement.create(['>= 2.7.0', '< 2.8.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "puppet-module-posix-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
-  gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0',     require: false, platforms: [:ruby]
-  gem "puppet-module-win-default-r#{minor_version}", '~> 1.0',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "puppet-lint-absolute_classname-check", '3.0.1',           require: false
-  gem "puppet-lint-absolute_template_path", '1.0.1',             require: false
-  gem "puppet-lint-empty_trailing_lines", '0.0.1',               require: false
-  gem "puppet-lint-file_ensure-check", '1.0.0',                  require: false
-  gem "puppet-lint-strict_indent-check", '2.0.8',                require: false
-  gem "puppet-lint-trailing_comma-check", '0.4.2',               require: false
-  gem "puppet-lint-unquoted_string-check", '2.1.0',              require: false
+  gem "json", '= 2.1.0',                         require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.3.0',                         require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.5.1',                         require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.6.1',                         require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.6.3',                         require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "racc", '~> 1.4.0',                        require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
+  gem "facterdb", '~> 1.18',                     require: false
+  gem "metadata-json-lint", '~> 3.0',            require: false
+  gem "puppetlabs_spec_helper", '~> 6.0',        require: false
+  gem "rspec-puppet-facts", '~> 2.0',            require: false
+  gem "codecov", '~> 0.2',                       require: false
+  gem "dependency_checker", '~> 1.0.0',          require: false
+  gem "parallel_tests", '= 3.12.1',              require: false
+  gem "pry", '~> 0.10',                          require: false
+  gem "simplecov-console", '~> 0.5',             require: false
+  gem "puppet-debugger", '~> 1.0',               require: false
+  gem "rubocop", '= 1.48.1',                     require: false
+  gem "rubocop-performance", '= 1.16.0',         require: false
+  gem "rubocop-rspec", '= 2.19.0',               require: false
+  gem "puppet-strings", '~> 4.0',                require: false
+  gem "rb-readline", '= 0.5.5',                  require: false, platforms: [:mswin, :mingw, :x64_mingw]
 end
 group :system_tests do
-  gem "puppet-module-posix-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
-  gem "puppet-module-win-system-r#{minor_version}", '~> 1.0',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]
+  gem "serverspec", '~> 2.41',   require: false
+end
+group :release_prep do
+  gem "puppet-strings", '~> 4.0',         require: false
+  gem "puppetlabs_spec_helper", '~> 6.0', require: false
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']
diff --git a/Rakefile b/Rakefile
index 0f8754e..74415a9 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
 require 'bundler'
-require 'puppet_litmus/rake_tasks' if Bundler.rubygems.find_name('puppet_litmus').any?
+require 'puppet_litmus/rake_tasks' if Gem.loaded_specs.key? 'puppet_litmus'
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-syntax/tasks/puppet-syntax'
-require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
-require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_changelog_generator').any?
-require 'puppet-strings/tasks' if Bundler.rubygems.find_name('puppet-strings').any?
+require 'github_changelog_generator/task' if Gem.loaded_specs.key? 'github_changelog_generator'
+require 'puppet-strings/tasks' if Gem.loaded_specs.key? 'puppet-strings'
 
 def changelog_user
   return unless Rake.application.top_level_tasks.include? "changelog"
@@ -44,7 +43,7 @@ end
 PuppetLint.configuration.send('disable_relative')
 
 
-if Bundler.rubygems.find_name('github_changelog_generator').any?
+if Gem.loaded_specs.key? 'github_changelog_generator'
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|
     raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?
     config.user = "#{changelog_user}"
diff --git a/metadata.json b/metadata.json
index b46ee45..2a6e3e0 100644
--- a/metadata.json
+++ b/metadata.json
@@ -59,7 +59,7 @@
       "version_requirement": ">= 6.21.0 < 8.0.0"
     }
   ],
-  "pdk-version": "2.4.0",
+  "pdk-version": "3.0.1",
   "template-url": "https://gitlab.it.liu.se/puppet-infra/pdk-templates.git#liu",
-  "template-ref": "heads/liu-0-gdb0722b"
+  "template-ref": "heads/liu-0-g522eb00"
 }
diff --git a/pdk.yaml b/pdk.yaml
new file mode 100644
index 0000000..4bef4bd
--- /dev/null
+++ b/pdk.yaml
@@ -0,0 +1,2 @@
+---
+ignore: []
diff --git a/spec/default_facts.yml b/spec/default_facts.yml
index f777abf..3346c39 100644
--- a/spec/default_facts.yml
+++ b/spec/default_facts.yml
@@ -2,7 +2,8 @@
 #
 # Facts specified here will override the values provided by rspec-puppet-facts.
 ---
-ipaddress: "172.16.254.254"
-ipaddress6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA"
+networking:
+  ip: "172.16.254.254"
+  ip6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA"
+  mac: "AA:AA:AA:AA:AA:AA"
 is_pe: false
-macaddress: "AA:AA:AA:AA:AA:AA"
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index ee9e003..3f9a6c7 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -28,8 +28,8 @@ default_fact_files.each do |f|
   next unless File.exist?(f) && File.readable?(f) && File.size?(f)
 
   begin
-    default_facts.merge!(YAML.safe_load(File.read(f), [], [], true))
-  rescue => e
+    default_facts.merge!(YAML.safe_load(File.read(f), permitted_classes: [], permitted_symbols: [], aliases: true))
+  rescue StandardError => e
     RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}"
   end
 end
-- 
GitLab


From 266d5097c7652bd3bfe58ce665f7a5b38c48b298 Mon Sep 17 00:00:00 2001
From: Magnus Toneby <magnus.toneby@liu.se>
Date: Wed, 28 Feb 2024 09:34:24 +0100
Subject: [PATCH 03/14] fix pdk warnings

---
 manifests/init.pp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index a6aa89c..4bb8365 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -6,39 +6,39 @@
 # @example
 #   none
 class vlc {
-  firewalld_service {'Allow http in the liu Zone':
+  firewalld_service { 'Allow http in the liu Zone':
     ensure  => present,
     zone    => 'liu',
     service => 'http',
   }
-  firewalld_service {'Allow https in the liu Zone':
+  firewalld_service { 'Allow https in the liu Zone':
     ensure  => present,
     zone    => 'liu',
     service => 'https',
   }
-  firewalld_service {'Allow http in the public Zone':
+  firewalld_service { 'Allow http in the public Zone':
     ensure  => present,
     zone    => 'public',
     service => 'http',
   }
-  firewalld_service {'Allow https in the public Zone':
+  firewalld_service { 'Allow https in the public Zone':
     ensure  => present,
     zone    => 'public',
     service => 'https',
   }
 
   # Känner firewall till servicen syncthing ??
-  firewalld_service {'Allow syncthing in the liu Zone':
+  firewalld_service { 'Allow syncthing in the liu Zone':
     ensure  => present,
     zone    => 'public',
     service => 'syncthing',
   }
-  firewalld_service {'Allow syncthing in the liu Zone':
+  firewalld_service { 'Allow syncthing in the liu Zone':
     ensure  => present,
     zone    => 'liu',
     service => 'syncthing',
   }
-  firewalld_service {'Allow syncthing-gui in the liu Zone':
+  firewalld_service { 'Allow syncthing-gui in the liu Zone':
     ensure  => present,
     zone    => 'liu',
     service => 'syncthing-gui',
-- 
GitLab


From 7772ec920a310d443fdb46beebd6c9697ce1d6ba Mon Sep 17 00:00:00 2001
From: Magnus Toneby <magnus.toneby@liu.se>
Date: Wed, 28 Feb 2024 13:06:11 +0100
Subject: [PATCH 04/14] fix more name conflicts

---
 manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 4bb8365..3e97df2 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -28,7 +28,7 @@ class vlc {
   }
 
   # Känner firewall till servicen syncthing ??
-  firewalld_service { 'Allow syncthing in the liu Zone':
+  firewalld_service { 'Allow syncthing in the public Zone':
     ensure  => present,
     zone    => 'public',
     service => 'syncthing',
-- 
GitLab


From 3206485cb7f4e4748ad8feb653a6947e6fc81bc4 Mon Sep 17 00:00:00 2001
From: Henry <henry.frocklin@liu.se>
Date: Tue, 30 Apr 2024 10:53:58 +0200
Subject: [PATCH 05/14] Revert "fix more name conflicts"

This reverts commit 7772ec920a310d443fdb46beebd6c9697ce1d6ba.
---
 manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 3e97df2..4bb8365 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -28,7 +28,7 @@ class vlc {
   }
 
   # Känner firewall till servicen syncthing ??
-  firewalld_service { 'Allow syncthing in the public Zone':
+  firewalld_service { 'Allow syncthing in the liu Zone':
     ensure  => present,
     zone    => 'public',
     service => 'syncthing',
-- 
GitLab


From 9e61080e9189e888bfe3519882a7383faf2b76bf Mon Sep 17 00:00:00 2001
From: Henry <henry.frocklin@liu.se>
Date: Tue, 30 Apr 2024 10:55:02 +0200
Subject: [PATCH 06/14] Revert "fix pdk warnings"

This reverts commit 266d5097c7652bd3bfe58ce665f7a5b38c48b298.
---
 manifests/init.pp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 4bb8365..a6aa89c 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -6,39 +6,39 @@
 # @example
 #   none
 class vlc {
-  firewalld_service { 'Allow http in the liu Zone':
+  firewalld_service {'Allow http in the liu Zone':
     ensure  => present,
     zone    => 'liu',
     service => 'http',
   }
-  firewalld_service { 'Allow https in the liu Zone':
+  firewalld_service {'Allow https in the liu Zone':
     ensure  => present,
     zone    => 'liu',
     service => 'https',
   }
-  firewalld_service { 'Allow http in the public Zone':
+  firewalld_service {'Allow http in the public Zone':
     ensure  => present,
     zone    => 'public',
     service => 'http',
   }
-  firewalld_service { 'Allow https in the public Zone':
+  firewalld_service {'Allow https in the public Zone':
     ensure  => present,
     zone    => 'public',
     service => 'https',
   }
 
   # Känner firewall till servicen syncthing ??
-  firewalld_service { 'Allow syncthing in the liu Zone':
+  firewalld_service {'Allow syncthing in the liu Zone':
     ensure  => present,
     zone    => 'public',
     service => 'syncthing',
   }
-  firewalld_service { 'Allow syncthing in the liu Zone':
+  firewalld_service {'Allow syncthing in the liu Zone':
     ensure  => present,
     zone    => 'liu',
     service => 'syncthing',
   }
-  firewalld_service { 'Allow syncthing-gui in the liu Zone':
+  firewalld_service {'Allow syncthing-gui in the liu Zone':
     ensure  => present,
     zone    => 'liu',
     service => 'syncthing-gui',
-- 
GitLab


From 32357857df4b49a06e0905fbb152ffe5e76a932f Mon Sep 17 00:00:00 2001
From: Henry <henry.frocklin@liu.se>
Date: Tue, 30 Apr 2024 10:55:24 +0200
Subject: [PATCH 07/14] Revert "pdk update"

This reverts commit d3ca9a05e405b7eaf18fdfe393d33bc27fb4fbc5.
---
 .gitignore             |   2 +-
 .gitlab-ci.yml         |   4 -
 .pdkignore             |   9 +-
 .rubocop.yml           | 216 ++---------------------------------------
 Gemfile                |  47 ++++-----
 Rakefile               |   9 +-
 metadata.json          |   4 +-
 pdk.yaml               |   2 -
 spec/default_facts.yml |   7 +-
 spec/spec_helper.rb    |   4 +-
 10 files changed, 44 insertions(+), 260 deletions(-)
 delete mode 100644 pdk.yaml

diff --git a/.gitignore b/.gitignore
index c817477..a996532 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,7 @@
 /log/
 /pkg/
 /spec/fixtures/manifests/
-/spec/fixtures/modules/*
+/spec/fixtures/modules/
 /tmp/
 /vendor/
 /convert_report.txt
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 97ebb8b..d49a282 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,3 @@
 include:
   - project: 'puppet-infra/shared-ci-piplines'
     file: '/puppet-module-pipeline.yaml'
-  - local: .local-ci.yml
-    rules:
-      - exists:
-          - .local-ci.yml
diff --git a/.pdkignore b/.pdkignore
index 8bbed40..f962996 100644
--- a/.pdkignore
+++ b/.pdkignore
@@ -16,7 +16,7 @@
 /log/
 /pkg/
 /spec/fixtures/manifests/
-/spec/fixtures/modules/*
+/spec/fixtures/modules/
 /tmp/
 /vendor/
 /convert_report.txt
@@ -29,17 +29,20 @@
 *~
 \#*\#
 .\#*
+/appveyor.yml
+/.editorconfig
 /.fixtures.yml
 /Gemfile
 /.gitattributes
-/.github/
 /.gitignore
+/.gitlab-ci.yml
 /.pdkignore
 /.puppet-lint.rc
 /Rakefile
 /rakelib/
 /.rspec
-/..yml
+/.rubocop.yml
+/.travis.yml
 /.yardopts
 /spec/
 /.vscode/
diff --git a/.rubocop.yml b/.rubocop.yml
index 5be1f9f..8f782e7 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,7 +4,7 @@ require:
 - rubocop-rspec
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: '2.6'
+  TargetRubyVersion: '2.4'
   Include:
   - "**/*.rb"
   Exclude:
@@ -111,14 +111,8 @@ Style/MethodCalledOnDoEndBlock:
   Enabled: true
 Style/StringMethods:
   Enabled: true
-Bundler/GemFilename:
-  Enabled: false
 Bundler/InsecureProtocolSource:
   Enabled: false
-Capybara/CurrentPathExpectation:
-  Enabled: false
-Capybara/VisibilityMatcher:
-  Enabled: false
 Gemspec/DuplicatedAssignment:
   Enabled: false
 Gemspec/OrderedDependencies:
@@ -293,9 +287,11 @@ Performance/UriDefaultParser:
   Enabled: false
 RSpec/Be:
   Enabled: false
+RSpec/Capybara/CurrentPathExpectation:
+  Enabled: false
 RSpec/Capybara/FeatureMethods:
   Enabled: false
-RSpec/ContainExactly:
+RSpec/Capybara/VisibilityMatcher:
   Enabled: false
 RSpec/ContextMethod:
   Enabled: false
@@ -335,8 +331,6 @@ RSpec/LeakyConstantDeclaration:
   Enabled: false
 RSpec/LetBeforeExamples:
   Enabled: false
-RSpec/MatchArray:
-  Enabled: false
 RSpec/MissingExampleGroupArgument:
   Enabled: false
 RSpec/MultipleExpectations:
@@ -379,6 +373,8 @@ Style/AccessModifierDeclarations:
   Enabled: false
 Style/AccessorGrouping:
   Enabled: false
+Style/AsciiComments:
+  Enabled: false
 Style/BisectedAttrAccessor:
   Enabled: false
 Style/CaseLikeIf:
@@ -489,235 +485,35 @@ Style/TrailingMethodEndStatement:
   Enabled: false
 Style/UnpackFirst:
   Enabled: false
-Capybara/MatchStyle:
-  Enabled: false
-Capybara/NegationMatcher:
-  Enabled: false
-Capybara/SpecificActions:
-  Enabled: false
-Capybara/SpecificFinders:
-  Enabled: false
-Capybara/SpecificMatcher:
-  Enabled: false
-Gemspec/DeprecatedAttributeAssignment:
-  Enabled: false
-Gemspec/DevelopmentDependencies:
-  Enabled: false
-Gemspec/RequireMFA:
-  Enabled: false
-Layout/LineContinuationLeadingSpace:
-  Enabled: false
-Layout/LineContinuationSpacing:
-  Enabled: false
-Layout/LineEndStringConcatenationIndentation:
-  Enabled: false
-Layout/SpaceBeforeBrackets:
-  Enabled: false
-Lint/AmbiguousAssignment:
-  Enabled: false
-Lint/AmbiguousOperatorPrecedence:
-  Enabled: false
-Lint/AmbiguousRange:
-  Enabled: false
-Lint/ConstantOverwrittenInRescue:
-  Enabled: false
-Lint/DeprecatedConstants:
-  Enabled: false
 Lint/DuplicateBranch:
   Enabled: false
-Lint/DuplicateMagicComment:
-  Enabled: false
 Lint/DuplicateRegexpCharacterClassElement:
   Enabled: false
 Lint/EmptyBlock:
   Enabled: false
 Lint/EmptyClass:
   Enabled: false
-Lint/EmptyInPattern:
-  Enabled: false
-Lint/IncompatibleIoSelectWithFiberScheduler:
-  Enabled: false
-Lint/LambdaWithoutLiteralBlock:
-  Enabled: false
 Lint/NoReturnInBeginEndBlocks:
   Enabled: false
-Lint/NonAtomicFileOperation:
-  Enabled: false
-Lint/NumberedParameterAssignment:
-  Enabled: false
-Lint/OrAssignmentToConstant:
-  Enabled: false
-Lint/RedundantDirGlobSort:
-  Enabled: false
-Lint/RefinementImportMethods:
-  Enabled: false
-Lint/RequireRangeParentheses:
-  Enabled: false
-Lint/RequireRelativeSelfPath:
-  Enabled: false
-Lint/SymbolConversion:
-  Enabled: false
 Lint/ToEnumArguments:
   Enabled: false
-Lint/TripleQuotes:
-  Enabled: false
 Lint/UnexpectedBlockArity:
   Enabled: false
 Lint/UnmodifiedReduceAccumulator:
   Enabled: false
-Lint/UselessRescue:
-  Enabled: false
-Lint/UselessRuby2Keywords:
-  Enabled: false
-Metrics/CollectionLiteralLength:
-  Enabled: false
-Naming/BlockForwarding:
-  Enabled: false
 Performance/CollectionLiteralInLoop:
   Enabled: false
-Performance/ConcurrentMonotonicTime:
-  Enabled: false
-Performance/MapCompact:
-  Enabled: false
-Performance/RedundantEqualityComparisonBlock:
-  Enabled: false
-Performance/RedundantSplitRegexpArgument:
-  Enabled: false
-Performance/StringIdentifierArgument:
-  Enabled: false
-RSpec/BeEq:
-  Enabled: false
-RSpec/BeNil:
-  Enabled: false
-RSpec/ChangeByZero:
-  Enabled: false
-RSpec/ClassCheck:
-  Enabled: false
-RSpec/DuplicatedMetadata:
-  Enabled: false
-RSpec/ExcessiveDocstringSpacing:
-  Enabled: false
-RSpec/FactoryBot/ConsistentParenthesesStyle:
-  Enabled: false
-RSpec/FactoryBot/FactoryNameStyle:
-  Enabled: false
-RSpec/FactoryBot/SyntaxMethods:
-  Enabled: false
-RSpec/IdenticalEqualityAssertion:
-  Enabled: false
-RSpec/NoExpectationExample:
-  Enabled: false
-RSpec/PendingWithoutReason:
-  Enabled: false
-RSpec/Rails/AvoidSetupHook:
-  Enabled: false
-RSpec/Rails/HaveHttpStatus:
-  Enabled: false
-RSpec/Rails/InferredSpecType:
-  Enabled: false
-RSpec/Rails/MinitestAssertions:
-  Enabled: false
-RSpec/Rails/TravelAround:
-  Enabled: false
-RSpec/RedundantAround:
-  Enabled: false
-RSpec/SkipBlockInsideExample:
-  Enabled: false
-RSpec/SortMetadata:
-  Enabled: false
-RSpec/SubjectDeclaration:
-  Enabled: false
-RSpec/VerifiedDoubleReference:
-  Enabled: false
-Security/CompoundHash:
-  Enabled: false
-Security/IoMethods:
-  Enabled: false
 Style/ArgumentsForwarding:
   Enabled: false
-Style/ArrayIntersect:
-  Enabled: false
 Style/CollectionCompact:
   Enabled: false
-Style/ComparableClamp:
-  Enabled: false
-Style/ConcatArrayLiterals:
-  Enabled: false
-Style/DirEmpty:
-  Enabled: false
 Style/DocumentDynamicEvalDefinition:
   Enabled: false
-Style/EmptyHeredoc:
-  Enabled: false
-Style/EndlessMethod:
-  Enabled: false
-Style/EnvHome:
-  Enabled: false
-Style/FetchEnvVar:
-  Enabled: false
-Style/FileEmpty:
-  Enabled: false
-Style/FileRead:
-  Enabled: false
-Style/FileWrite:
-  Enabled: false
-Style/HashConversion:
-  Enabled: false
-Style/HashExcept:
-  Enabled: false
-Style/IfWithBooleanLiteralBranches:
-  Enabled: false
-Style/InPatternThen:
-  Enabled: false
-Style/MagicCommentFormat:
-  Enabled: false
-Style/MapCompactWithConditionalBlock:
-  Enabled: false
-Style/MapToHash:
-  Enabled: false
-Style/MapToSet:
-  Enabled: false
-Style/MinMaxComparison:
-  Enabled: false
-Style/MultilineInPatternThen:
-  Enabled: false
 Style/NegatedIfElseCondition:
   Enabled: false
-Style/NestedFileDirname:
-  Enabled: false
 Style/NilLambda:
   Enabled: false
-Style/NumberedParameters:
-  Enabled: false
-Style/NumberedParametersLimit:
-  Enabled: false
-Style/ObjectThen:
-  Enabled: false
-Style/OpenStructUse:
-  Enabled: false
-Style/OperatorMethodCall:
-  Enabled: false
-Style/QuotedSymbols:
-  Enabled: false
 Style/RedundantArgument:
   Enabled: false
-Style/RedundantConstantBase:
-  Enabled: false
-Style/RedundantDoubleSplatHashBraces:
-  Enabled: false
-Style/RedundantEach:
-  Enabled: false
-Style/RedundantHeredocDelimiterQuotes:
-  Enabled: false
-Style/RedundantInitialize:
-  Enabled: false
-Style/RedundantSelfAssignmentBranch:
-  Enabled: false
-Style/RedundantStringEscape:
-  Enabled: false
-Style/SelectByRegexp:
-  Enabled: false
-Style/StringChars:
-  Enabled: false
 Style/SwapValues:
   Enabled: false
diff --git a/Gemfile b/Gemfile
index ca0e773..18272fd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,37 +13,28 @@ def location_for(place_or_version, fake_version = nil)
   end
 end
 
+ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
+minor_version = ruby_version_segments[0..1].join('.')
+
 group :development do
-  gem "json", '= 2.1.0',                         require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", '= 2.3.0',                         require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", '= 2.5.1',                         require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", '= 2.6.1',                         require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", '= 2.6.3',                         require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "racc", '~> 1.4.0',                        require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
-  gem "facterdb", '~> 1.18',                     require: false
-  gem "metadata-json-lint", '~> 3.0',            require: false
-  gem "puppetlabs_spec_helper", '~> 6.0',        require: false
-  gem "rspec-puppet-facts", '~> 2.0',            require: false
-  gem "codecov", '~> 0.2',                       require: false
-  gem "dependency_checker", '~> 1.0.0',          require: false
-  gem "parallel_tests", '= 3.12.1',              require: false
-  gem "pry", '~> 0.10',                          require: false
-  gem "simplecov-console", '~> 0.5',             require: false
-  gem "puppet-debugger", '~> 1.0',               require: false
-  gem "rubocop", '= 1.48.1',                     require: false
-  gem "rubocop-performance", '= 1.16.0',         require: false
-  gem "rubocop-rspec", '= 2.19.0',               require: false
-  gem "puppet-strings", '~> 4.0',                require: false
-  gem "rb-readline", '= 0.5.5',                  require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "json", '= 2.0.4',                                         require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.1.0',                                         require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.3.0',                                         require: false if Gem::Requirement.create(['>= 2.7.0', '< 2.8.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "puppet-module-posix-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
+  gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0',     require: false, platforms: [:ruby]
+  gem "puppet-module-win-default-r#{minor_version}", '~> 1.0',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "puppet-lint-absolute_classname-check", '3.0.1',           require: false
+  gem "puppet-lint-absolute_template_path", '1.0.1',             require: false
+  gem "puppet-lint-empty_trailing_lines", '0.0.1',               require: false
+  gem "puppet-lint-file_ensure-check", '1.0.0',                  require: false
+  gem "puppet-lint-strict_indent-check", '2.0.8',                require: false
+  gem "puppet-lint-trailing_comma-check", '0.4.2',               require: false
+  gem "puppet-lint-unquoted_string-check", '2.1.0',              require: false
 end
 group :system_tests do
-  gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]
-  gem "serverspec", '~> 2.41',   require: false
-end
-group :release_prep do
-  gem "puppet-strings", '~> 4.0',         require: false
-  gem "puppetlabs_spec_helper", '~> 6.0', require: false
+  gem "puppet-module-posix-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
+  gem "puppet-module-win-system-r#{minor_version}", '~> 1.0',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']
diff --git a/Rakefile b/Rakefile
index 74415a9..0f8754e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 require 'bundler'
-require 'puppet_litmus/rake_tasks' if Gem.loaded_specs.key? 'puppet_litmus'
+require 'puppet_litmus/rake_tasks' if Bundler.rubygems.find_name('puppet_litmus').any?
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-syntax/tasks/puppet-syntax'
-require 'github_changelog_generator/task' if Gem.loaded_specs.key? 'github_changelog_generator'
-require 'puppet-strings/tasks' if Gem.loaded_specs.key? 'puppet-strings'
+require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
+require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_changelog_generator').any?
+require 'puppet-strings/tasks' if Bundler.rubygems.find_name('puppet-strings').any?
 
 def changelog_user
   return unless Rake.application.top_level_tasks.include? "changelog"
@@ -43,7 +44,7 @@ end
 PuppetLint.configuration.send('disable_relative')
 
 
-if Gem.loaded_specs.key? 'github_changelog_generator'
+if Bundler.rubygems.find_name('github_changelog_generator').any?
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|
     raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?
     config.user = "#{changelog_user}"
diff --git a/metadata.json b/metadata.json
index 2a6e3e0..b46ee45 100644
--- a/metadata.json
+++ b/metadata.json
@@ -59,7 +59,7 @@
       "version_requirement": ">= 6.21.0 < 8.0.0"
     }
   ],
-  "pdk-version": "3.0.1",
+  "pdk-version": "2.4.0",
   "template-url": "https://gitlab.it.liu.se/puppet-infra/pdk-templates.git#liu",
-  "template-ref": "heads/liu-0-g522eb00"
+  "template-ref": "heads/liu-0-gdb0722b"
 }
diff --git a/pdk.yaml b/pdk.yaml
deleted file mode 100644
index 4bef4bd..0000000
--- a/pdk.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-ignore: []
diff --git a/spec/default_facts.yml b/spec/default_facts.yml
index 3346c39..f777abf 100644
--- a/spec/default_facts.yml
+++ b/spec/default_facts.yml
@@ -2,8 +2,7 @@
 #
 # Facts specified here will override the values provided by rspec-puppet-facts.
 ---
-networking:
-  ip: "172.16.254.254"
-  ip6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA"
-  mac: "AA:AA:AA:AA:AA:AA"
+ipaddress: "172.16.254.254"
+ipaddress6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA"
 is_pe: false
+macaddress: "AA:AA:AA:AA:AA:AA"
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 3f9a6c7..ee9e003 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -28,8 +28,8 @@ default_fact_files.each do |f|
   next unless File.exist?(f) && File.readable?(f) && File.size?(f)
 
   begin
-    default_facts.merge!(YAML.safe_load(File.read(f), permitted_classes: [], permitted_symbols: [], aliases: true))
-  rescue StandardError => e
+    default_facts.merge!(YAML.safe_load(File.read(f), [], [], true))
+  rescue => e
     RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}"
   end
 end
-- 
GitLab


From 50d814dfdde2cbf251c99a3cbc8c36600497f324 Mon Sep 17 00:00:00 2001
From: Henry <henry.frocklin@liu.se>
Date: Tue, 30 Apr 2024 10:55:40 +0200
Subject: [PATCH 08/14] Revert "fix the class names to follow what the class
 does (and make them unique"

This reverts commit 37964fc0afae1b377a06ef57ee880480f02be595.
---
 manifests/init.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index a6aa89c..a889fda 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -28,17 +28,17 @@ class vlc {
   }
 
   # Känner firewall till servicen syncthing ??
-  firewalld_service {'Allow syncthing in the liu Zone':
+  firewalld_service {'Allow http in the public Zone':
     ensure  => present,
     zone    => 'public',
     service => 'syncthing',
   }
-  firewalld_service {'Allow syncthing in the liu Zone':
+  firewalld_service {'Allow https in the public Zone':
     ensure  => present,
     zone    => 'liu',
     service => 'syncthing',
   }
-  firewalld_service {'Allow syncthing-gui in the liu Zone':
+  firewalld_service {'Allow https in the public Zone':
     ensure  => present,
     zone    => 'liu',
     service => 'syncthing-gui',
-- 
GitLab


From fc999dabc1d14c8ba93fa4961c32e386926e6adc Mon Sep 17 00:00:00 2001
From: Magnus Toneby <magnus.toneby@liu.se>
Date: Tue, 7 May 2024 07:59:28 +0200
Subject: [PATCH 09/14] fix the venv rule for vlcinv

---
 manifests/vlcinv.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/vlcinv.pp b/manifests/vlcinv.pp
index 046d5b8..1cfcc4f 100644
--- a/manifests/vlcinv.pp
+++ b/manifests/vlcinv.pp
@@ -1,6 +1,6 @@
 #Creates virtual environment, clones repo and installs python dependencies for vlcinv applications
 class vlc::vlcinv {
-  exec { 'creat_venv':
+  exec { 'creat_venv_vlcinv':
     command => 'python3.11 -m venv venv-django-vlcinv',
     path    => ['/usr/bin', '/bin'],
     cwd     => '/home/henfr13',
-- 
GitLab


From b7be779e97246a22ad6500b6c0cccc9fd8d6a1ec Mon Sep 17 00:00:00 2001
From: Magnus Toneby <magnus.toneby@liu.se>
Date: Tue, 7 May 2024 08:06:36 +0200
Subject: [PATCH 10/14] add path to the exec commands

---
 manifests/vlc.pp    | 2 +-
 manifests/vlcinv.pp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/vlc.pp b/manifests/vlc.pp
index 19dd35e..5900f02 100644
--- a/manifests/vlc.pp
+++ b/manifests/vlc.pp
@@ -18,7 +18,7 @@ class vlc::vlc {
   }
 
   exec { 'install_vlc_requirements':
-    command     => 'pip install -r /home/henfr13/django-base/requirements.txt',
+    command     => '/usr/local/bin/pip install -r /home/henfr13/django-base/requirements.txt',
     refreshonly => true,
   }
 }
diff --git a/manifests/vlcinv.pp b/manifests/vlcinv.pp
index 1cfcc4f..78307e3 100644
--- a/manifests/vlcinv.pp
+++ b/manifests/vlcinv.pp
@@ -18,7 +18,7 @@ class vlc::vlcinv {
   }
 
   exec { 'install_vlcinv_requirements':
-    command     => 'pip install -r /home/henfr13/vlcinv/requirements.txt',
+    command     => '/usr/local/bin/pip install -r /home/henfr13/vlcinv/requirements.txt',
     refreshonly => true,
   }
 }
-- 
GitLab


From 2ea20705c4bbddaf95c73e44db7cb99bc8f17583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henry=20Fr=C3=B6cklin?= <henry.frocklin@liu.se>
Date: Thu, 12 Sep 2024 11:43:00 +0000
Subject: [PATCH 11/14] Revert "add path to the exec commands"

This reverts commit b7be779e97246a22ad6500b6c0cccc9fd8d6a1ec
---
 manifests/vlc.pp    | 2 +-
 manifests/vlcinv.pp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/vlc.pp b/manifests/vlc.pp
index 5900f02..19dd35e 100644
--- a/manifests/vlc.pp
+++ b/manifests/vlc.pp
@@ -18,7 +18,7 @@ class vlc::vlc {
   }
 
   exec { 'install_vlc_requirements':
-    command     => '/usr/local/bin/pip install -r /home/henfr13/django-base/requirements.txt',
+    command     => 'pip install -r /home/henfr13/django-base/requirements.txt',
     refreshonly => true,
   }
 }
diff --git a/manifests/vlcinv.pp b/manifests/vlcinv.pp
index 78307e3..1cfcc4f 100644
--- a/manifests/vlcinv.pp
+++ b/manifests/vlcinv.pp
@@ -18,7 +18,7 @@ class vlc::vlcinv {
   }
 
   exec { 'install_vlcinv_requirements':
-    command     => '/usr/local/bin/pip install -r /home/henfr13/vlcinv/requirements.txt',
+    command     => 'pip install -r /home/henfr13/vlcinv/requirements.txt',
     refreshonly => true,
   }
 }
-- 
GitLab


From 116f8fc78769587a682d9514fe53304791f178f8 Mon Sep 17 00:00:00 2001
From: Nils Olof Paulsson <nils.olof.paulsson@liu.se>
Date: Wed, 13 Nov 2024 19:33:49 +0000
Subject: [PATCH 12/14] Update init.pp

---
 manifests/init.pp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/manifests/init.pp b/manifests/init.pp
index edd6390..e96775e 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -33,4 +33,10 @@ class vlc {
     family  => 'ipv4',
     zone    => 'liu',
   }
+
+  users::liu_user { 'mange61':
+    commonname => 'Mans Gezelius',
+    shell      => '/bin/bash',
+    sshkey     => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQDHsZ1q+e4nD2SAx659Kv1vf3tmhQmQJ/KOe4zOk4FyJt2OUoHsv82RD4rYVXxcnGojwFjTAtYTW2B4q/f334IGY9aezow/b39kkg977bJ7AC/OU1enkWFK3nkDtkP7htVbsSeogvyHf32niyosDvW8VCTNe9DZctyJ5Eu9AB0z/tuAr++/z+9sWYtiG0sGn/rUnrAvOqWHkTR2ShZHZPyXq+UCrJXHfbJ+P9EzzgFjr2uPoFgBiCqd0Ov2/zWP3k+chGcbSSKtJ3I3Ylh49jAxB1/srct4R0o7sNOKQBnrXXTAIkDLma2ilu0dAksPjD22ZYvWgRt03u7qxQR6lOB/', #lint:ignore:140chars
+  }
 }
-- 
GitLab


From a771c2a4c6f3bb42bff38b39c2ab1ba7ee99c3b6 Mon Sep 17 00:00:00 2001
From: Nils Olof Paulsson <nils.olof.paulsson@liu.se>
Date: Wed, 13 Nov 2024 19:36:37 +0000
Subject: [PATCH 13/14] Revert "Update init.pp"

This reverts commit 116f8fc78769587a682d9514fe53304791f178f8
---
 manifests/init.pp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index e96775e..edd6390 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -33,10 +33,4 @@ class vlc {
     family  => 'ipv4',
     zone    => 'liu',
   }
-
-  users::liu_user { 'mange61':
-    commonname => 'Mans Gezelius',
-    shell      => '/bin/bash',
-    sshkey     => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQDHsZ1q+e4nD2SAx659Kv1vf3tmhQmQJ/KOe4zOk4FyJt2OUoHsv82RD4rYVXxcnGojwFjTAtYTW2B4q/f334IGY9aezow/b39kkg977bJ7AC/OU1enkWFK3nkDtkP7htVbsSeogvyHf32niyosDvW8VCTNe9DZctyJ5Eu9AB0z/tuAr++/z+9sWYtiG0sGn/rUnrAvOqWHkTR2ShZHZPyXq+UCrJXHfbJ+P9EzzgFjr2uPoFgBiCqd0Ov2/zWP3k+chGcbSSKtJ3I3Ylh49jAxB1/srct4R0o7sNOKQBnrXXTAIkDLma2ilu0dAksPjD22ZYvWgRt03u7qxQR6lOB/', #lint:ignore:140chars
-  }
 }
-- 
GitLab


From cca2f92679552c5835bb765f1bd6992bd6414174 Mon Sep 17 00:00:00 2001
From: Nils Olof Paulsson <nils.olof.paulsson@liu.se>
Date: Thu, 14 Nov 2024 09:27:27 +0000
Subject: [PATCH 14/14] Update init.pp

---
 manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index edd6390..37a67a5 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,7 +1,7 @@
 # @summary A short summary of the purpose of this class
 #
 # A description of what this class does
-# init vlc-server
+# init vlc server
 #
 # @example
 #   none
-- 
GitLab