Skip to content

Commit

Permalink
Merge pull request #7 from genaumann/retry
Browse files Browse the repository at this point in the history
Retry option in acme_sh.cert
  • Loading branch information
genaumann authored Oct 14, 2024
2 parents c031c65 + 25f81f1 commit d731298
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 5 deletions.
17 changes: 13 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,27 @@ on:
- completed
branches:
- main
status:
- success

jobs:
release:
runs-on: ubuntu-latest
permissions:
contents: write
issues: write
pull-requests: write
steps:
- name: Generate token
id: generate_token
uses: tibdex/github-app-token@v2
with:
app_id: ${{ secrets.RELEASE_APP_ID }}
private_key: ${{ secrets.RELEASE_PRIVATE_KEY }}
- name: Checkout
uses: actions/checkout@v4
with:
persist-credentials: false
- name: Semantic Release
token: ${{ steps.generate_token.outputs.token }}
- name: Run semantic-release
uses: cycjimmy/semantic-release-action@v4
with:
extra_plugins: |
Expand All @@ -31,4 +40,4 @@ jobs:
@semantic-release/github
conventional-changelog-conventionalcommits
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
3 changes: 3 additions & 0 deletions acme_sh/cert.sls
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ acme_sh_cert_{{ user }}_{{ domain }}:
{%- if cert_config.get('insecure') %}
- insecure: {{ cert_config['insecure'] }}
{%- endif %}
{%- if cert_config.get('retry') %}
- retry: {{ cert_config['retry'] }}
{%- endif %}
{%- endfor %}
{%- endif %}
{%- endfor %}
5 changes: 4 additions & 1 deletion test/salt/pillar/acme_sh.sls
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
---
{%- set os = grains['os'] | lower %}
{%- set osrelease = grains['osrelease'] | regex_replace('(\.)', '') | lower %}
{%- set release_str = os + osrelease %}
{%- set saltrelease = grains['saltversion'] | regex_replace('(\.)', '') %}
{%- set release_str = os + osrelease + saltrelease %}
_release_str: {{ release_str }}
acme_sh:
vagrant:
Expand All @@ -13,6 +14,8 @@ acme_sh:
keysize: '4096'
server: letsencrypt_test
cert_path: /home/vagrant/crt
retry:
attempts: 3
standalone.gn98.de:
acme_mode: standalone
server: https://localhost:14000/dir
Expand Down

0 comments on commit d731298

Please sign in to comment.