diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d591d35..15cd54e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,12 +14,16 @@ 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" env: PUPPET_VERSION: ${{ matrix.puppet }} + CONCAT_VERSION: ${{ matrix.concat }} + + name: Ruby ${{ matrix.ruby }} - Puppet ${{ matrix.puppet }} - Concat ${{ matrix.concat }} steps: - uses: actions/checkout@v4 @@ -30,6 +34,10 @@ jobs: ruby-version: ${{ matrix.ruby }} bundler-cache: true + - name: Set concat version + 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/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/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"; } } 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