More work on lint errors

mergwyn · Dec 30, 2024 · ec374f9 · ec374f9
1 parent f5b0505
commit ec374f9
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/.puppet-lint.rc b/.puppet-lint.rc
@@ -6,5 +6,4 @@
 --no-autoloader_layout-check
 --no-documentation-check
 --no-single_quote_string_with_variables-check
---no-param-docs-check
 --ignore-paths=.vendor/**/*.pp,.bundle/**/*.pp,pkg/**/*.pp,spec/**/*.pp,tests/**/*.pp,types/**/*.pp,vendor/**/*.pp
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -75,7 +75,6 @@ Style/SymbolArray:
 RSpec/MessageSpies:
   EnforcedStyle: receive
 Style/Documentation:
-  Enabled: false
   Exclude:
   - lib/puppet/parser/functions/**/*
   - spec/**/*

diff --git a/.sync.yml b/.sync.yml
@@ -26,14 +26,18 @@ appveyor.yml:
 #      on_success: change # default: change
 #      on_failure: always # default: always
 
+Rakefile:
+  extra_disabled_lint_checks:
+    - strict_indent
+
 Gemfile:
   required:
     ':development':
 #      - gem: rake
 #      - gem: r10k
 #      - gem: ra10ke
       - gem: onceover
-      - gem: CFPropertyList
+#      - gem: CFPropertyList
       - gem: rspec-puppet-utils
       - gem: github_changelog_generator
   optional:

diff --git a/Gemfile b/Gemfile
@@ -36,7 +36,6 @@ group :development do
   gem "rb-readline", '= 0.5.5',                  require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "rexml", '>= 3.0.0', '< 3.2.7',            require: false
   gem "onceover",                                require: false
-  gem "CFPropertyList", '< 3.0.7', require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "rspec-puppet-utils",                      require: false
   gem "github_changelog_generator",              require: false
   gem "generate-puppetfile", '~> 1.0',           require: false

diff --git a/site-modules/profile/manifests/platform/baseline/debian/systemd_timers.pp b/site-modules/profile/manifests/platform/baseline/debian/systemd_timers.pp
@@ -5,11 +5,12 @@
   if $facts['os']['family'] != 'Debian' {
     fail("${name} can only be called on Debian")
   }
+  # lint:ignore:strict_indent
   systemd::timer { 'hourly.timer':
     active        => true,
     enable        => true,
     timer_content => @("EOT"/),
-                                             [Timer]
+                     [Timer]
                      OnCalendar=hourly
                      RandomizedDelaySec=30m
                      | EOT
@@ -19,7 +20,7 @@
     active        => true,
     enable        => true,
     timer_content => @("EOT"/),
-                                             [Timer]
+                     [Timer]
                      OnCalendar=daily
                      RandomizedDelaySec=30m
                      | EOT
@@ -29,7 +30,7 @@
     active        => true,
     enable        => true,
     timer_content => @("EOT"/),
-                                             [Timer]
+                     [Timer]
                      OnCalendar=weekly
                      RandomizedDelaySec=30m
                      | EOT
@@ -39,9 +40,10 @@
     active        => true,
     enable        => true,
     timer_content => @("EOT"/),
-                                             [Timer]
+                     [Timer]
                      OnCalendar=monthly
                      RandomizedDelaySec=30m
                      | EOT
   }
+  # lint:endignore
 }
diff --git a/site-modules/profile/manifests/platform/baseline/debian/zfs/reporting.pp b/site-modules/profile/manifests/platform/baseline/debian/zfs/reporting.pp
@@ -8,12 +8,14 @@
     mode   => '0775',
   }
 
+  # lint:ignore:strict_indent
   file { '/etc/cron.monthly/zfs-montly-report':
     ensure  => file,
     mode    => '0775',
     content => @("EOT"/),
-                                       #!/bin/sh
+               #!/bin/sh
                /usr/local/bin/zfs_report.sh
                | EOT
   }
+# lint:endignore
 }