From b79b7785718ed7f6cddd80719ab943196b1eb5be Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Sun, 28 Jan 2024 01:44:51 +0100 Subject: [PATCH 1/2] add grpc port --- conf/woodpecker-server.conf | 2 +- manifest.toml | 47 +++++++++++++++++++------------------ 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/conf/woodpecker-server.conf b/conf/woodpecker-server.conf index d6ad5cf..f3f15b0 100644 --- a/conf/woodpecker-server.conf +++ b/conf/woodpecker-server.conf @@ -41,7 +41,7 @@ WOODPECKER_SERVER_ADDR=:__PORT__ # Configures the gRPC listener port. # Default: :9000 -#WOODPECKER_GRPC_ADDR= +WOODPECKER_GRPC_ADDR=:__GRPC_PORT__ # Comma-separated list of admin accounts. # Default: empty diff --git a/manifest.toml b/manifest.toml index 35536f6..49dc6d8 100644 --- a/manifest.toml +++ b/manifest.toml @@ -9,7 +9,7 @@ description.fr = "Outil d'intégration continue extensible intégrable avec GitH version = "1.0.5~ynh2" -maintainers = ["Salamandar"] +maintainers = [ "Salamandar" ] [upstream] license = "Apache-2.0" @@ -23,7 +23,7 @@ fund = "https://opencollective.com/woodpecker-ci" [integration] yunohost = ">= 11.2" -architectures = ["amd64", "arm64"] +architectures = [ "amd64", "arm64" ] multi_instance = true ldap = false @@ -78,34 +78,35 @@ ram.runtime = "200M" [resources] [resources.sources] - [resources.sources.main] - amd64.url = "https://github.com/woodpecker-ci/woodpecker/releases/download/v1.0.5/woodpecker-server_linux_amd64.tar.gz" - amd64.sha256 = "99ccffae1795b561d72850400383771ccf105a8fee8c74e524654d26262420ef" + [resources.sources.main] + amd64.url = "https://github.com/woodpecker-ci/woodpecker/releases/download/v1.0.5/woodpecker-server_linux_amd64.tar.gz" + amd64.sha256 = "99ccffae1795b561d72850400383771ccf105a8fee8c74e524654d26262420ef" - arm64.url = "https://github.com/woodpecker-ci/woodpecker/releases/download/v1.0.5/woodpecker-server_linux_arm64.tar.gz" - arm64.sha256 = "a2b20b569daac3f9c4ebc5fb17026a2679f30d3ee7004bd6f09d63d1f102361c" + arm64.url = "https://github.com/woodpecker-ci/woodpecker/releases/download/v1.0.5/woodpecker-server_linux_arm64.tar.gz" + arm64.sha256 = "a2b20b569daac3f9c4ebc5fb17026a2679f30d3ee7004bd6f09d63d1f102361c" - autoupdate.strategy = "latest_github_release" - autoupdate.asset.amd64 = "woodpecker-server_linux_amd64.tar.gz" - autoupdate.asset.arm64 = "woodpecker-server_linux_arm64.tar.gz" + autoupdate.strategy = "latest_github_release" + autoupdate.asset.amd64 = "woodpecker-server_linux_amd64.tar.gz" + autoupdate.asset.arm64 = "woodpecker-server_linux_arm64.tar.gz" - in_subdir = false + in_subdir = false - [resources.system_user] +[resources.system_user] - [resources.install_dir] +[resources.install_dir] - [resources.data_dir] +[resources.data_dir] - [resources.permissions] - main.url = "/" +[resources.permissions] +main.url = "/" - [resources.ports] +[resources.ports] - [resources.apt] - packages = [ - "postgresql" - ] +main.default = 8000 +grpc.default = 9000 - [resources.database] - type = "postgresql" +[resources.apt] +packages = [ "postgresql" ] + +[resources.database] +type = "postgresql" From ab166b2d37ef9c3e2a236dbaaaa135033cb2f0d4 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Sun, 28 Jan 2024 01:52:35 +0100 Subject: [PATCH 2/2] fix variable name --- conf/woodpecker-server.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/woodpecker-server.conf b/conf/woodpecker-server.conf index f3f15b0..0254e2d 100644 --- a/conf/woodpecker-server.conf +++ b/conf/woodpecker-server.conf @@ -41,7 +41,7 @@ WOODPECKER_SERVER_ADDR=:__PORT__ # Configures the gRPC listener port. # Default: :9000 -WOODPECKER_GRPC_ADDR=:__GRPC_PORT__ +WOODPECKER_GRPC_ADDR=:__PORT_GRPC__ # Comma-separated list of admin accounts. # Default: empty