From 82286cb4ba028e268c12ebc979028e9b871701c7 Mon Sep 17 00:00:00 2001
From: Dan Foster <dan@zem.org.uk>
Date: Tue, 10 Feb 2026 22:53:35 +0000
Subject: [PATCH 1/3] Dont add force

---
 .github/workflows/ci.yml   | 6 ++++++
 manifests/init.pp          | 1 -
 spec/classes/sysfs_spec.rb | 3 +--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d591d35..2bbd33e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,6 +14,7 @@ jobs:
       matrix:
         ruby: ["3.1", "3.2", "3.3"]
         puppet: ["~> 7.0", "~> 8.0"]
+        concat: ["4.2.1", "v7.0.0", "v9.0.2"]
         exclude:
           - ruby: "3.3"
             puppet: "~> 7.0"
@@ -21,6 +22,8 @@ jobs:
     env:
       PUPPET_VERSION: ${{ matrix.puppet }}
 
+    name: "Ruby ${{ matrix.ruby }} / Puppet ${{ matrix.puppet }} / Concat ${{ matrix.concat }}"
+
     steps:
       - uses: actions/checkout@v4
 
@@ -30,6 +33,9 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
 
+      - name: Set concat version
+        run: sed -i 's/ref: v9.0.2/ref: ${{ matrix.concat }}/' .fixtures.yml
+
       - name: Run tests
         run: bundle exec rake spec
 
diff --git a/manifests/init.pp b/manifests/init.pp
index b5f61d1..6faf252 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -56,7 +56,6 @@
     owner   => 'root',
     group   => 'root',
     mode    => '0644',
-    force   => true,
     require => Package['sysfsutils'],
   }
 
diff --git a/spec/classes/sysfs_spec.rb b/spec/classes/sysfs_spec.rb
index ff98d4d..b977e3a 100644
--- a/spec/classes/sysfs_spec.rb
+++ b/spec/classes/sysfs_spec.rb
@@ -14,7 +14,6 @@
         'owner' => 'root',
         'group' => 'root',
         'mode'  => '0644',
-        'force' => true,
       )
     end
 
@@ -93,7 +92,7 @@
         'source' => 'puppet:///modules/sysfs/sysfsutils.service',
         'owner'  => 'root',
         'group'  => 'root',
-        'mode'   => '0700',
+        'mode'   => '0444',
       )
     end
 

From ca1875d4597f8417d5a9c7e90480eb4a5d3d6247 Mon Sep 17 00:00:00 2001
From: Dan Foster <dan@zem.org.uk>
Date: Tue, 10 Feb 2026 22:57:14 +0000
Subject: [PATCH 2/3] Dont add force

---
 .github/workflows/ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2bbd33e..cf3ba73 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,6 +21,7 @@ jobs:
 
     env:
       PUPPET_VERSION: ${{ matrix.puppet }}
+      CONCAT_VERSION: ${{ matrix.concat }}
 
     name: "Ruby ${{ matrix.ruby }} / Puppet ${{ matrix.puppet }} / Concat ${{ matrix.concat }}"
 
@@ -34,7 +35,7 @@ jobs:
           bundler-cache: true
 
       - name: Set concat version
-        run: sed -i 's/ref: v9.0.2/ref: ${{ matrix.concat }}/' .fixtures.yml
+        run: sed -i "s/ref: v9.0.2/ref: $CONCAT_VERSION/" .fixtures.yml
 
       - name: Run tests
         run: bundle exec rake spec

From 6a95f9994062d80271f424ba2eaee2125b19533e Mon Sep 17 00:00:00 2001
From: Dan Foster <dan@zem.org.uk>
Date: Tue, 10 Feb 2026 23:07:00 +0000
Subject: [PATCH 3/3] Fix YAML syntax in CI workflow and puppet-lint warnings

- Use block scalar for sed command to avoid parsing issues
- Fix puppet-lint warnings in setting.pp
---
 .github/workflows/ci.yml | 5 +++--
 manifests/setting.pp     | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cf3ba73..15cd54e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
       PUPPET_VERSION: ${{ matrix.puppet }}
       CONCAT_VERSION: ${{ matrix.concat }}
 
-    name: "Ruby ${{ matrix.ruby }} / Puppet ${{ matrix.puppet }} / Concat ${{ matrix.concat }}"
+    name: Ruby ${{ matrix.ruby }} - Puppet ${{ matrix.puppet }} - Concat ${{ matrix.concat }}
 
     steps:
       - uses: actions/checkout@v4
@@ -35,7 +35,8 @@ jobs:
           bundler-cache: true
 
       - name: Set concat version
-        run: sed -i "s/ref: v9.0.2/ref: $CONCAT_VERSION/" .fixtures.yml
+        run: |
+          sed -i "s/ref: v9.0.2/ref: ${CONCAT_VERSION}/" .fixtures.yml
 
       - name: Run tests
         run: bundle exec rake spec
diff --git a/manifests/setting.pp b/manifests/setting.pp
index b24b54d..d8797ad 100644
--- a/manifests/setting.pp
+++ b/manifests/setting.pp
@@ -1,6 +1,6 @@
 define sysfs::setting($value) {
-  concat::fragment { "${name}":
-    target => "/etc/sysfs.conf",
+  concat::fragment { $name:
+    target  => '/etc/sysfs.conf',
     content => "${name}=${value}\n";
   }
 }