From 4078ab5a3962545323939bc2da2f459295559437 Mon Sep 17 00:00:00 2001 From: v Date: Mon, 10 Jun 2024 18:48:00 +0200 Subject: [PATCH] allow custom service configuration --- .github/workflows/release.yml | 2 +- src/__xtz/assets/node-tunnel.template.service | 4 ++++ src/__xtz/assets/signer-tunnel.template.service | 4 ++++ src/__xtz/assets/signer.template.service | 4 ++++ src/specs.json | 2 +- 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6736eb9..1f9fae6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,7 +31,7 @@ jobs: zip ../${{ steps.repository_info.outputs.ID }}-${{steps.repository_info.outputs.VERSION}}.zip -r * - name: Upload files to a GitHub release - uses: svenstaro/upload-release-action@2.2.1 + uses: svenstaro/upload-release-action@v2 if: ${{ steps.repository_info.outputs.NEEDS_RELEASE == 'true'}} with: repo_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/src/__xtz/assets/node-tunnel.template.service b/src/__xtz/assets/node-tunnel.template.service index f2cf8f8..5f33291 100644 --- a/src/__xtz/assets/node-tunnel.template.service +++ b/src/__xtz/assets/node-tunnel.template.service @@ -15,6 +15,10 @@ ExecStart=/usr/bin/ssh -NT -p {{{model.REMOTE_SSH_PORT}}} \ -o ServerAliveInterval=60 -o ServerAliveCountMax=10 -o ExitOnForwardFailure=yes \ -L localhost:{{{model.LOCAL_RPC_PORT}}}:{{{model.REMOTE_RPC_ENDPOINT}}} {{{model.REMOTE_NODE}}} +{{#configuration.SERVICE_CONFIGURATION_NODE_TUNNEL__ARRAY}} +{{{key}}}={{{value}}} +{{/configuration.SERVICE_CONFIGURATION_NODE_TUNNEL__ARRAY}} + Restart=always [Install] WantedBy=multi-user.target \ No newline at end of file diff --git a/src/__xtz/assets/signer-tunnel.template.service b/src/__xtz/assets/signer-tunnel.template.service index 600371a..20ddab7 100755 --- a/src/__xtz/assets/signer-tunnel.template.service +++ b/src/__xtz/assets/signer-tunnel.template.service @@ -15,6 +15,10 @@ ExecStart=/usr/bin/ssh -NT -p {{{model.REMOTE_SSH_PORT}}} \ -o ServerAliveInterval=60 -o ServerAliveCountMax=10 -o ExitOnForwardFailure=yes \ -R {{{model.SIGNER_ENDPOINT}}}:localhost:{{{model.REMOTE_SIGNER_PORT}}} {{{model.REMOTE_NODE}}} +{{#configuration.SERVICE_CONFIGURATION_SIGNER_TUNNEL__ARRAY}} +{{{key}}}={{{value}}} +{{/configuration.SERVICE_CONFIGURATION_SIGNER_TUNNEL__ARRAY}} + Restart=always [Install] WantedBy=multi-user.target \ No newline at end of file diff --git a/src/__xtz/assets/signer.template.service b/src/__xtz/assets/signer.template.service index a86bee1..d115cd7 100755 --- a/src/__xtz/assets/signer.template.service +++ b/src/__xtz/assets/signer.template.service @@ -19,5 +19,9 @@ ExecStart={{{ROOT_DIR}}}/bin/signer launch http signer -a {{{model.SIGNER_ADDR}} {{{key}}}={{{value}}} {{/model.SERVICE_CONFIGURATION_SIGNER__ARRAY}} +{{#configuration.SERVICE_CONFIGURATION_SIGNER__ARRAY}} +{{{key}}}={{{value}}} +{{/configuration.SERVICE_CONFIGURATION_SIGNER__ARRAY}} + [Install] WantedBy=default.target \ No newline at end of file diff --git a/src/specs.json b/src/specs.json index 44961fd..e64f682 100755 --- a/src/specs.json +++ b/src/specs.json @@ -1,6 +1,6 @@ { "id": "xtz.signer", - "version" : "0.23.2+20.0", + "version" : "0.23.3+20.0", "dependencies": [ { "id":"xtz.base" } ]