From 4b33109350d06a0f0d8a8ebf6f1345309938a724 Mon Sep 17 00:00:00 2001 From: Jordi Prats Date: Mon, 18 May 2020 09:31:17 +0200 Subject: [PATCH 1/2] github actions --- .github/workflows/puppet-lint.yml | 39 ++++++++++++++++++++++ .github/workflows/puppet-metadata-lint.yml | 39 ++++++++++++++++++++++ .github/workflows/puppet-validate.yml | 39 ++++++++++++++++++++++ 3 files changed, 117 insertions(+) create mode 100644 .github/workflows/puppet-lint.yml create mode 100644 .github/workflows/puppet-metadata-lint.yml create mode 100644 .github/workflows/puppet-validate.yml diff --git a/.github/workflows/puppet-lint.yml b/.github/workflows/puppet-lint.yml new file mode 100644 index 0000000..31687fa --- /dev/null +++ b/.github/workflows/puppet-lint.yml @@ -0,0 +1,39 @@ +name: puppet-lint + +# Controls when the action will run. Triggers the workflow on push or pull request +# events but only for the master branch +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + build: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + + - name: Set up Ruby + # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby, + # change this to (see https://github.com/ruby/setup-ruby#versioning): + # uses: ruby/setup-ruby@v1 + uses: ruby/setup-ruby@ec106b438a1ff6ff109590de34ddc62c540232e0 + with: + ruby-version: 2.6 + + - name: Install dependencies + run: bundle install + + - name: Run tests + run: bundle exec rake + + # Runs a single command using the runners shell + - name: puppet-lint + run: bundle exec rake lint diff --git a/.github/workflows/puppet-metadata-lint.yml b/.github/workflows/puppet-metadata-lint.yml new file mode 100644 index 0000000..a3b0f2e --- /dev/null +++ b/.github/workflows/puppet-metadata-lint.yml @@ -0,0 +1,39 @@ +name: puppet-metadata-lint + +# Controls when the action will run. Triggers the workflow on push or pull request +# events but only for the master branch +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + build: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + + - name: Set up Ruby + # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby, + # change this to (see https://github.com/ruby/setup-ruby#versioning): + # uses: ruby/setup-ruby@v1 + uses: ruby/setup-ruby@ec106b438a1ff6ff109590de34ddc62c540232e0 + with: + ruby-version: 2.6 + + - name: Install dependencies + run: bundle install + + - name: Run tests + run: bundle exec rake + + # Runs a single command using the runners shell + - name: puppet-lint + run: bundle exec rake metadata_lint diff --git a/.github/workflows/puppet-validate.yml b/.github/workflows/puppet-validate.yml new file mode 100644 index 0000000..c6124a9 --- /dev/null +++ b/.github/workflows/puppet-validate.yml @@ -0,0 +1,39 @@ +name: puppet-validate + +# Controls when the action will run. Triggers the workflow on push or pull request +# events but only for the master branch +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + build: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + + - name: Set up Ruby + # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby, + # change this to (see https://github.com/ruby/setup-ruby#versioning): + # uses: ruby/setup-ruby@v1 + uses: ruby/setup-ruby@ec106b438a1ff6ff109590de34ddc62c540232e0 + with: + ruby-version: 2.6 + + - name: Install dependencies + run: bundle install + + - name: Run tests + run: bundle exec rake + + # Runs a single command using the runners shell + - name: puppet-lint + run: bundle exec rake validate From bc9d17cde3908f473c2ea0ecf06ac07d72194b74 Mon Sep 17 00:00:00 2001 From: Jordi Prats Date: Thu, 4 Jun 2020 11:12:25 +0200 Subject: [PATCH 2/2] ubuntu 20 support --- CHANGELOG.md | 4 ++++ manifests/params.pp | 6 ++++++ metadata.json | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 744c7f7..dfc0afd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## 0.2.43 + +* added **Ubuntu 20.04** support + ## 0.2.42 * setting sha256 as default digest for self signed certificates diff --git a/manifests/params.pp b/manifests/params.pp index 0c64e15..658e55b 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -130,6 +130,12 @@ $postfix_ver='3.3.0' $compatibility_level_default=2 } + /^20.*$/: + { + $daemon_directory_default='/usr/lib/postfix/sbin' + $postfix_ver='3.4.10' + $compatibility_level_default=2 + } default: { fail("Unsupported Ubuntu version! - ${::operatingsystemrelease}") } } } diff --git a/metadata.json b/metadata.json index ebf7146..5f433cf 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "eyp-postfix", - "version": "0.2.42", + "version": "0.2.43", "author": "eyp", "summary": "postfix management - relay or multidomain mailserver", "license": "Apache-2.0", @@ -36,7 +36,7 @@ }, { "operatingsystem": "Ubuntu", - "operatingsystemrelease": [ "14.04", "16.04", "18.04" ] + "operatingsystemrelease": [ "14.04", "16.04", "18.04", "20.04" ] }, { "operatingsystem": "SLES",