From 1faef5701b31d70d7dfa276cd9ced1d91f51adad Mon Sep 17 00:00:00 2001 From: Ben Ford Date: Tue, 9 Jan 2024 16:48:48 -0800 Subject: [PATCH 1/2] whoops, forgot to add the CI workflow --- .github/workflows/ci.yml | 17 +++++++++++++++++ .sync.yml | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..a5738ad --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,17 @@ +name: "ci" + +on: + pull_request: + branches: + - "main" + workflow_dispatch: + +jobs: + Spec: + uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main" + secrets: "inherit" + + Acceptance: + needs: Spec + uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main" + secrets: "inherit" diff --git a/.sync.yml b/.sync.yml index b006145..1a6f676 100644 --- a/.sync.yml +++ b/.sync.yml @@ -6,6 +6,8 @@ appveyor.yml: unmanaged: false .github/workflows/release.yml: unmanaged: false +.github/workflows/ci.yml: + unmanaged: false Gemfile: optional: From 3ffa812782304b5f4823c5c3643054bbb6db56f4 Mon Sep 17 00:00:00 2001 From: Ben Ford Date: Wed, 10 Jan 2024 13:18:14 -0800 Subject: [PATCH 2/2] some random lint fixes to make CI pass --- manifests/get.pp | 1 - manifests/repo.pp | 1 - manifests/server.pp | 1 - manifests/server/module.pp | 3 +-- 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/manifests/get.pp b/manifests/get.pp index 2d205db..3794869 100644 --- a/manifests/get.pp +++ b/manifests/get.pp @@ -151,7 +151,6 @@ $onlyif_real = $onlyif } - exec { "rsync ${name}": command => "rsync -q ${rsync_options}", path => ['/bin', '/usr/bin', '/usr/local/bin'], diff --git a/manifests/repo.pp b/manifests/repo.pp index 2b88f9e..b494fcd 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -6,7 +6,6 @@ # class rsync::server # class rsync::repo { - include rsync::server $base = '/data/rsync' diff --git a/manifests/server.pp b/manifests/server.pp index 9496706..57c45c7 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -79,5 +79,4 @@ } create_resources(rsync::server::module, $modules) - } diff --git a/manifests/server/module.pp b/manifests/server/module.pp index 972e4d6..2de94d5 100644 --- a/manifests/server/module.pp +++ b/manifests/server/module.pp @@ -77,8 +77,7 @@ $exclude = undef, $exclude_from = undef, $dont_compress = undef, - $ignore_nonreadable = undef) { - + $ignore_nonreadable = undef) { concat::fragment { "frag-${name}": content => template('rsync/module.erb'), target => $rsync::server::conf_file,