From 0769c014c202c11f7b0f0045a55e4bba530e55bd Mon Sep 17 00:00:00 2001 From: Kuba <78603704+jakub-tldr@users.noreply.github.com> Date: Wed, 15 Apr 2026 14:21:46 +0200 Subject: [PATCH 01/10] bump submodule (#2711) --- web/src/shared/defguard-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/shared/defguard-ui b/web/src/shared/defguard-ui index 82eef0626..99fc954a0 160000 --- a/web/src/shared/defguard-ui +++ b/web/src/shared/defguard-ui @@ -1 +1 @@ -Subproject commit 82eef0626e8c0f54dc8ecadfc112ae54314925e8 +Subproject commit 99fc954a0d25b5b2771f6876c98b82c2d55572b6 From aa2c2132d4f1bbed6da1af9adb63cb7278007d89 Mon Sep 17 00:00:00 2001 From: Kuba <78603704+jakub-tldr@users.noreply.github.com> Date: Wed, 15 Apr 2026 18:27:58 +0200 Subject: [PATCH 02/10] remove unused variables, add comments --- .env-template | 37 ------------------------------------- .env.example | 17 +++++++++++++++++ docker-compose.e2e.yaml | 15 ++++++++------- docker-compose.ldap.yaml | 15 +++------------ docker-compose.yaml | 29 +++++++++++++++-------------- 5 files changed, 43 insertions(+), 70 deletions(-) delete mode 100644 .env-template create mode 100644 .env.example diff --git a/.env-template b/.env-template deleted file mode 100644 index c21dbcb07..000000000 --- a/.env-template +++ /dev/null @@ -1,37 +0,0 @@ -### Core configuration ### -DEFGUARD_AUTH_SECRET=defguard-auth-secret -DEFGUARD_GATEWAY_SECRET=defguard-gateway-secret -DEFGUARD_YUBIBRIDGE_SECRET=defguard-yubibridge-secret -DEFGUARD_SECRET_KEY=defguard-secret-key -DEFGUARD_URL=http://localhost:8000 -# For localhost only: -DEFGUARD_COOKIE_INSECURE=true -# How long auth session lives in seconds -DEFGUARD_AUTH_SESSION_LIFETIME=604800 -# Optional. Generated based on DEFGUARD_URL if not provided. -# DEFGUARD_WEBAUTHN_RP_ID=localhost -DEFGUARD_ADMIN_GROUPNAME=admin -DEFGUARD_DEFAULT_ADMIN_PASSWORD=pass123 - -### Logging ### -DEFGUARD_LOG_LEVEL=info - -### Proxy configuration ### -# Optional. URL of proxy gRPC server -# DEFGUARD_PROXY_URL=http://localhost:50051 - -### LDAP configuration ### -DEFGUARD_LDAP_URL=ldap://localhost:389 -DEFGUARD_LDAP_SERVICE_PASSWORD=adminpassword -DEFGUARD_LDAP_USER_SEARCH_BASE="ou=users,dc=example,dc=org" -DEFGUARD_LDAP_GROUP_SEARCH_BASE="ou=groups,dc=example,dc=org" -DEFGUARD_LDAP_DEVICE_SEARCH_BASE="ou=devices,dc=example,dc=org" - -### DB configuration ### -DEFGUARD_DB_HOST="localhost" -DEFGUARD_DB_PORT=5432 -DEFGUARD_DB_NAME="defguard" -DEFGUARD_DB_USER="defguard" -DEFGUARD_DB_PASSWORD="defguard" -# for SQLX CLI -DATABASE_URL="postgresql://defguard:defguard@localhost/defguard" diff --git a/.env.example b/.env.example new file mode 100644 index 000000000..cac562d65 --- /dev/null +++ b/.env.example @@ -0,0 +1,17 @@ +### DB configuration ### +DEFGUARD_DB_HOST="localhost" +DEFGUARD_DB_PORT=5432 +DEFGUARD_DB_NAME="defguard" +DEFGUARD_DB_USER="defguard" +DEFGUARD_DB_PASSWORD="defguard" +# for SQLX CLI +DATABASE_URL="postgresql://defguard:defguard@localhost/defguard" + +### GRPC Port ### +DEFGUARD_GRPC_PORT=50055 + +### Logging ### +DEFGUARD_LOG_LEVEL=info + +# For localhost only: +# DEFGUARD_COOKIE_INSECURE=true diff --git a/docker-compose.e2e.yaml b/docker-compose.e2e.yaml index 5cc1ea118..b016134ea 100644 --- a/docker-compose.e2e.yaml +++ b/docker-compose.e2e.yaml @@ -2,28 +2,26 @@ services: core: image: ghcr.io/defguard/defguard:${IMAGE_TAG} environment: - DEFGUARD_DEFAULT_ADMIN_PASSWORD: pass123 DEFGUARD_COOKIE_INSECURE: true DEFGUARD_COOKIE_DOMAIN: localhost DEFGUARD_LOG_LEVEL: debug - DEFGUARD_SECRET_KEY: aa5a506b11d719dd7170f57f5d9947faf8eb0bc2be1325e42aa0237c3dcfd26456e73dff9eef3b12c7bcf8711b45e3e703d8e21ee1c08520f5e12e3f5772da94 - DEFGUARD_AUTH_SECRET: defguard-auth-secret - DEFGUARD_GATEWAY_SECRET: defguard-gateway-secret - DEFGUARD_YUBIBRIDGE_SECRET: defguard-yubibridge-secret DEFGUARD_DB_HOST: db DEFGUARD_DB_PORT: 5432 DEFGUARD_DB_USER: defguard DEFGUARD_DB_PASSWORD: defguard DEFGUARD_DB_NAME: defguard - DEFGUARD_URL: http://localhost:8000 + DEFGUARD_GRPC_PORT: 50055 RUST_BACKTRACE: 1 ports: + # REST API - "8000:8000" + # Default Core GRPC port + - "50055:50055" depends_on: - db db: - image: public.ecr.aws/docker/library/postgres:17-alpine + image: postgres:18-alpine environment: POSTGRES_DB: defguard POSTGRES_USER: defguard @@ -40,7 +38,10 @@ services: proxy: image: ghcr.io/defguard/defguard-proxy:${IMAGE_TAG} ports: + # REST API - "8080:8080" + # Default Edge GRPC port + - "50051:50051" environment: DEFGUARD_PROXY_GRPC_PORT: 50051 RUST_BACKTRACE: 1 diff --git a/docker-compose.ldap.yaml b/docker-compose.ldap.yaml index abee0c9bc..4a53876f3 100644 --- a/docker-compose.ldap.yaml +++ b/docker-compose.ldap.yaml @@ -5,17 +5,11 @@ services: context: . dockerfile: Dockerfile environment: - DEFGUARD_COOKIE_INSECURE: "true" - DEFGUARD_SECRET_KEY: aa5a506b11d719dd7170f57f5d9947faf8eb0bc2be1325e42aa0237c3dcfd26456e73dff9eef3b12c7bcf8711b45e3e703d8e21ee1c08520f5e12e3f5772da94 - DEFGUARD_AUTH_SECRET: defguard-auth-secret - DEFGUARD_GATEWAY_SECRET: defguard-gateway-secret - DEFGUARD_YUBIBRIDGE_SECRET: defguard-yubibridge-secret DEFGUARD_DB_HOST: db DEFGUARD_DB_PORT: 5432 DEFGUARD_DB_USER: defguard DEFGUARD_DB_PASSWORD: defguard DEFGUARD_DB_NAME: defguard - DEFGUARD_URL: http://localhost:8000 RUST_BACKTRACE: 1 ports: # rest api @@ -27,21 +21,18 @@ services: gateway: image: ghcr.io/defguard/gateway:latest - environment: - DEFGUARD_GRPC_URL: http://core:50055 - DEFGUARD_STATS_PERIOD: 60 - DEFGUARD_TOKEN: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJEZWZHdWFyZCIsInN1YiI6IlRlc3ROZXQiLCJjbGllbnRfaWQiOiIiLCJleHAiOjU5NjE3NDcwNzYsIm5iZiI6MTY2Njc3OTc4MSwicm9sZXMiOltdfQ.uEUMnw_gO23W0K2q3N1lToeP0D2zAY1swr8N-84sRHA - RUST_LOG: debug ports: # WireGuard endpoint - "50051:50051/udp" + # Default gateway GRPC port + - "50066:50066" depends_on: - core cap_add: - NET_ADMIN db: - image: postgres:17-alpine + image: postgres:18-alpine environment: POSTGRES_DB: defguard POSTGRES_USER: defguard diff --git a/docker-compose.yaml b/docker-compose.yaml index 96034653c..81f663566 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -5,44 +5,45 @@ services: context: . dockerfile: Dockerfile environment: - DEFGUARD_COOKIE_INSECURE: "true" - DEFGUARD_SECRET_KEY: aa5a506b11d719dd7170f57f5d9947faf8eb0bc2be1325e42aa0237c3dcfd26456e73dff9eef3b12c7bcf8711b45e3e703d8e21ee1c08520f5e12e3f5772da94 - DEFGUARD_AUTH_SECRET: defguard-auth-secret - DEFGUARD_GATEWAY_SECRET: defguard-gateway-secret - DEFGUARD_YUBIBRIDGE_SECRET: defguard-yubibridge-secret DEFGUARD_DB_HOST: db DEFGUARD_DB_PORT: 5432 DEFGUARD_DB_USER: defguard DEFGUARD_DB_PASSWORD: defguard DEFGUARD_DB_NAME: defguard - DEFGUARD_URL: http://localhost:8000 RUST_BACKTRACE: 1 ports: - # rest api + # REST API - "8000:8000" - # grpc + # Default GRPC port - "50055:50055" depends_on: - db gateway: image: ghcr.io/defguard/gateway - environment: - DEFGUARD_GRPC_URL: http://core:50055 - DEFGUARD_STATS_PERIOD: 60 - DEFGUARD_TOKEN: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJEZWZHdWFyZCIsInN1YiI6IlRlc3ROZXQiLCJjbGllbnRfaWQiOiIiLCJleHAiOjU5NjE3NDcwNzYsIm5iZiI6MTY2Njc3OTc4MSwicm9sZXMiOltdfQ.uEUMnw_gO23W0K2q3N1lToeP0D2zAY1swr8N-84sRHA - RUST_LOG: debug ports: # WireGuard endpoint - "50051:50051/udp" + # Default gateway GRPC port - "50066:50066" depends_on: - core cap_add: - NET_ADMIN + proxy: + image: ghcr.io/defguard/defguard-proxy:${IMAGE_TAG} + ports: + # REST API + - "8080:8080" + # Default GRPC port + - "50051:50051" + environment: + DEFGUARD_PROXY_GRPC_PORT: 50051 + RUST_BACKTRACE: 1 + db: - image: postgres:17-alpine + image: postgres:18-alpine environment: POSTGRES_DB: defguard POSTGRES_USER: defguard From 7933cf931e88661ed7c82c07feb05dbaf01b1f56 Mon Sep 17 00:00:00 2001 From: Kuba <78603704+jakub-tldr@users.noreply.github.com> Date: Wed, 15 Apr 2026 18:55:47 +0200 Subject: [PATCH 03/10] fix comments, add image_tag, delete mysterious "device" --- .env.example | 15 ++++++++++ docker-compose.ldap.yaml | 61 ++++++++++++++++--------------------- docker-compose.yaml | 65 ++++++++++++++++++---------------------- 3 files changed, 70 insertions(+), 71 deletions(-) diff --git a/.env.example b/.env.example index cac562d65..641b2932c 100644 --- a/.env.example +++ b/.env.example @@ -7,11 +7,26 @@ DEFGUARD_DB_PASSWORD="defguard" # for SQLX CLI DATABASE_URL="postgresql://defguard:defguard@localhost/defguard" +### HTTP Port ### +DEFGUARD_HTTP_PORT=8000 + ### GRPC Port ### DEFGUARD_GRPC_PORT=50055 +# DEFGUARD_GRPC_BIND_ADDRESS= +# DEFGUARD_HTTP_BIND_ADDRESS= + +### GRPC TLS (optional) ### +# DEFGUARD_GRPC_CERT= +# DEFGUARD_GRPC_KEY= ### Logging ### DEFGUARD_LOG_LEVEL=info +### OpenID Connect ### +# DEFGUARD_OPENID_KEY= + # For localhost only: # DEFGUARD_COOKIE_INSECURE=true + +### Docker-compose images ### +IMAGE_TAG=dev \ No newline at end of file diff --git a/docker-compose.ldap.yaml b/docker-compose.ldap.yaml index 4a53876f3..8b5fbd370 100644 --- a/docker-compose.ldap.yaml +++ b/docker-compose.ldap.yaml @@ -1,6 +1,6 @@ services: core: - image: ghcr.io/defguard/defguard:latest + image: ghcr.io/defguard/defguard:${IMAGE_TAG} build: context: . dockerfile: Dockerfile @@ -12,19 +12,19 @@ services: DEFGUARD_DB_NAME: defguard RUST_BACKTRACE: 1 ports: - # rest api + # REST API - "8000:8000" - # grpc + # Default Core GRPC port - "50055:50055" depends_on: - db gateway: - image: ghcr.io/defguard/gateway:latest + image: ghcr.io/defguard/gateway:${IMAGE_TAG} ports: # WireGuard endpoint - "50051:50051/udp" - # Default gateway GRPC port + # Default Gateway GRPC port - "50066:50066" depends_on: - core @@ -42,37 +42,28 @@ services: ports: - "5432:5432" - device: - build: - context: . - dockerfile: Dockerfile.device - depends_on: - - gateway - cap_add: - - NET_ADMIN + # vector: + # image: timberio/vector:latest-alpine + # profiles: + # - observability + # container_name: vector + # volumes: + # - ./configs/vector.yaml:/etc/vector/vector.yaml:ro + # - ./configs/key.pem:/etc/vector/key.pem:ro + # - ./configs/cert.pem:/etc/vector/cert.pem:ro + # command: ["--config", "/etc/vector/vector.yaml"] + # ports: + # - "8686:8686" + # - "8001:8001" - vector: - image: timberio/vector:latest-alpine - profiles: - - observability - container_name: vector - volumes: - - ./configs/vector.yaml:/etc/vector/vector.yaml:ro - - ./configs/key.pem:/etc/vector/key.pem:ro - - ./configs/cert.pem:/etc/vector/cert.pem:ro - command: ["--config", "/etc/vector/vector.yaml"] - ports: - - "8686:8686" - - "8001:8001" - - logstash: - image: docker.elastic.co/logstash/logstash:8.14.0 - profiles: - - observability - ports: - - "8002:8002" - volumes: - - ./configs/logstash.conf:/usr/share/logstash/pipeline/logstash.conf:ro + # logstash: + # image: docker.elastic.co/logstash/logstash:8.14.0 + # profiles: + # - observability + # ports: + # - "8002:8002" + # volumes: + # - ./configs/logstash.conf:/usr/share/logstash/pipeline/logstash.conf:ro openldap: image: bitnamilegacy/openldap:2.6 diff --git a/docker-compose.yaml b/docker-compose.yaml index 81f663566..6aaa4a53d 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,6 +1,6 @@ services: core: - image: ghcr.io/defguard/defguard + image: ghcr.io/defguard/defguard:${IMAGE_TAG} build: context: . dockerfile: Dockerfile @@ -14,29 +14,31 @@ services: ports: # REST API - "8000:8000" - # Default GRPC port + # Default Core GRPC port - "50055:50055" depends_on: - db gateway: - image: ghcr.io/defguard/gateway + image: ghcr.io/defguard/gateway:${IMAGE_TAG} ports: # WireGuard endpoint - "50051:50051/udp" - # Default gateway GRPC port + # Default Gateway GRPC port - "50066:50066" depends_on: - core + - edge + - gateway cap_add: - NET_ADMIN - proxy: + edge: image: ghcr.io/defguard/defguard-proxy:${IMAGE_TAG} ports: # REST API - "8080:8080" - # Default GRPC port + # Default Edge GRPC port - "50051:50051" environment: DEFGUARD_PROXY_GRPC_PORT: 50051 @@ -58,34 +60,25 @@ services: timeout: 5s retries: 5 - device: - build: - context: . - dockerfile: Dockerfile.device - depends_on: - - gateway - cap_add: - - NET_ADMIN - - vector: - image: timberio/vector:latest-alpine - profiles: - - observability - container_name: vector - volumes: - - ./configs/vector.yaml:/etc/vector/vector.yaml:ro - - ./configs/key.pem:/etc/vector/key.pem:ro - - ./configs/cert.pem:/etc/vector/cert.pem:ro - command: ["--config", "/etc/vector/vector.yaml"] - ports: - - "8686:8686" - - "8001:8001" + # vector: + # image: timberio/vector:latest-alpine + # profiles: + # - observability + # container_name: vector + # volumes: + # - ./configs/vector.yaml:/etc/vector/vector.yaml:ro + # - ./configs/key.pem:/etc/vector/key.pem:ro + # - ./configs/cert.pem:/etc/vector/cert.pem:ro + # command: ["--config", "/etc/vector/vector.yaml"] + # ports: + # - "8686:8686" + # - "8001:8001" - logstash: - image: docker.elastic.co/logstash/logstash:8.14.0 - profiles: - - observability - ports: - - "8002:8002" - volumes: - - ./configs/logstash.conf:/usr/share/logstash/pipeline/logstash.conf:ro + # logstash: + # image: docker.elastic.co/logstash/logstash:8.14.0 + # profiles: + # - observability + # ports: + # - "8002:8002" + # volumes: + # - ./configs/logstash.conf:/usr/share/logstash/pipeline/logstash.conf:ro From 0d004310645f813400aa9861dd097ad2c9c71106 Mon Sep 17 00:00:00 2001 From: Kuba <78603704+jakub-tldr@users.noreply.github.com> Date: Wed, 15 Apr 2026 19:04:36 +0200 Subject: [PATCH 04/10] remove depends on --- docker-compose.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 6aaa4a53d..c38368368 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -26,10 +26,6 @@ services: - "50051:50051/udp" # Default Gateway GRPC port - "50066:50066" - depends_on: - - core - - edge - - gateway cap_add: - NET_ADMIN From a9fd38b130d17a3869f4d27a69baa5b7e816356d Mon Sep 17 00:00:00 2001 From: Kuba <78603704+jakub-tldr@users.noreply.github.com> Date: Wed, 15 Apr 2026 19:18:13 +0200 Subject: [PATCH 05/10] adjust e2e --- docker-compose.e2e.yaml | 2 +- e2e/utils/globalSetup.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.e2e.yaml b/docker-compose.e2e.yaml index b016134ea..1d981cc40 100644 --- a/docker-compose.e2e.yaml +++ b/docker-compose.e2e.yaml @@ -35,7 +35,7 @@ services: retries: 5 start_period: 5s - proxy: + edge: image: ghcr.io/defguard/defguard-proxy:${IMAGE_TAG} ports: # REST API diff --git a/e2e/utils/globalSetup.ts b/e2e/utils/globalSetup.ts index 9626668da..e484e62dc 100644 --- a/e2e/utils/globalSetup.ts +++ b/e2e/utils/globalSetup.ts @@ -114,7 +114,7 @@ const runWizard = async () => { // Step 8: Edge component — fill name and IP await page.getByTestId('field-common_name').waitFor({ state: 'visible' }); await page.getByTestId('field-common_name').fill('edge-test'); - await page.getByTestId('field-ip_or_domain').fill('proxy'); + await page.getByTestId('field-ip_or_domain').fill('edge'); // Adopt Edge component await page.getByRole('button', { name: 'Adopt Edge component' }).click(); From 8c3a3003f1104c52dcb36e5dce1e7326b24b0070 Mon Sep 17 00:00:00 2001 From: Kuba <78603704+jakub-tldr@users.noreply.github.com> Date: Wed, 15 Apr 2026 19:19:49 +0200 Subject: [PATCH 06/10] add eol --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index 641b2932c..237da0815 100644 --- a/.env.example +++ b/.env.example @@ -29,4 +29,4 @@ DEFGUARD_LOG_LEVEL=info # DEFGUARD_COOKIE_INSECURE=true ### Docker-compose images ### -IMAGE_TAG=dev \ No newline at end of file +IMAGE_TAG=dev From 36aa264963b48508107ab728ad84a471354b3c2d Mon Sep 17 00:00:00 2001 From: Kuba <78603704+jakub-tldr@users.noreply.github.com> Date: Thu, 16 Apr 2026 10:46:39 +0200 Subject: [PATCH 07/10] change order --- .env.example | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.env.example b/.env.example index 237da0815..6dff2bd16 100644 --- a/.env.example +++ b/.env.example @@ -7,6 +7,12 @@ DEFGUARD_DB_PASSWORD="defguard" # for SQLX CLI DATABASE_URL="postgresql://defguard:defguard@localhost/defguard" +### For localhost only ### +# DEFGUARD_COOKIE_INSECURE=true + +### Logging ### +DEFGUARD_LOG_LEVEL=info + ### HTTP Port ### DEFGUARD_HTTP_PORT=8000 @@ -19,14 +25,8 @@ DEFGUARD_GRPC_PORT=50055 # DEFGUARD_GRPC_CERT= # DEFGUARD_GRPC_KEY= -### Logging ### -DEFGUARD_LOG_LEVEL=info - ### OpenID Connect ### # DEFGUARD_OPENID_KEY= -# For localhost only: -# DEFGUARD_COOKIE_INSECURE=true - ### Docker-compose images ### IMAGE_TAG=dev From c4bab026cb7f50695b016e58231c961dbe234e0d Mon Sep 17 00:00:00 2001 From: Kuba <78603704+jakub-tldr@users.noreply.github.com> Date: Thu, 16 Apr 2026 10:49:40 +0200 Subject: [PATCH 08/10] remove variable --- .env.example | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.env.example b/.env.example index 6dff2bd16..457538b68 100644 --- a/.env.example +++ b/.env.example @@ -21,10 +21,6 @@ DEFGUARD_GRPC_PORT=50055 # DEFGUARD_GRPC_BIND_ADDRESS= # DEFGUARD_HTTP_BIND_ADDRESS= -### GRPC TLS (optional) ### -# DEFGUARD_GRPC_CERT= -# DEFGUARD_GRPC_KEY= - ### OpenID Connect ### # DEFGUARD_OPENID_KEY= From 888d412d0cdcdb3e1c14f0a269dd5d5d2088a7aa Mon Sep 17 00:00:00 2001 From: Kuba <78603704+jakub-tldr@users.noreply.github.com> Date: Thu, 16 Apr 2026 10:57:50 +0200 Subject: [PATCH 09/10] change env-template to env.example --- .github/workflows/release.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1e5eb1157..14825e0e1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -149,7 +149,7 @@ jobs: fpm_args: "defguard-${{ env.VERSION }}-x86_64-unknown-linux-gnu=/usr/bin/defguard defguard.service=/usr/lib/systemd/system/defguard.service - .env-template=/etc/defguard/core.conf" + .env.example=/etc/defguard/core.conf" fpm_opts: "--architecture amd64 --output-type deb --version ${{ env.VERSION }} --package defguard-${{ env.VERSION }}-x86_64-unknown-linux-gnu.deb" - name: Build aarch64 DEB package @@ -158,7 +158,7 @@ jobs: fpm_args: "defguard-${{ env.VERSION }}-aarch64-unknown-linux-gnu=/usr/bin/defguard defguard.service=/usr/lib/systemd/system/defguard.service - .env-template=/etc/defguard/core.conf" + .env.example=/etc/defguard/core.conf" fpm_opts: "--architecture arm64 --output-type deb --version ${{ env.VERSION }} --package defguard-${{ env.VERSION }}-aarch64-unknown-linux-gnu.deb" - name: Build x86_64 RPM package @@ -167,7 +167,7 @@ jobs: fpm_args: "defguard-${{ env.VERSION }}-x86_64-unknown-linux-gnu=/usr/bin/defguard defguard.service=/usr/lib/systemd/system/defguard.service - .env-template=/etc/defguard/core.conf" + .env.example=/etc/defguard/core.conf" fpm_opts: "--architecture amd64 --output-type rpm --version ${{ env.VERSION }} --package defguard-${{ env.VERSION }}-x86_64-unknown-linux-gnu.rpm" - name: Build aarch64 RPM package @@ -176,7 +176,7 @@ jobs: fpm_args: "defguard-${{ env.VERSION }}-aarch64-unknown-linux-gnu=/usr/bin/defguard defguard.service=/usr/lib/systemd/system/defguard.service - .env-template=/etc/defguard/core.conf" + .env.example=/etc/defguard/core.conf" fpm_opts: "--architecture arm64 --output-type rpm --version ${{ env.VERSION }} --package defguard-${{ env.VERSION }}-aarch64-unknown-linux-gnu.rpm" - name: Build FreeBSD package @@ -185,7 +185,7 @@ jobs: fpm_args: "defguard-${{ env.VERSION }}-x86_64-unknown-freebsd=/usr/local/bin/defguard defguard.service.freebsd=/usr/local/etc/rc.d/defguard - .env-template=/etc/defguard/core.conf" + .env.example=/etc/defguard/core.conf" fpm_opts: "--architecture amd64 --output-type freebsd --version ${{ env.VERSION }} --package defguard-${{ env.VERSION }}_x86_64-unknown-freebsd.pkg --freebsd-osversion '*' --depends openssl" - name: Upload Linux x86_64 archive From 20fe8f87e8688b76c6d019d818653c012b9b388f Mon Sep 17 00:00:00 2001 From: Kuba <78603704+jakub-tldr@users.noreply.github.com> Date: Thu, 16 Apr 2026 11:21:43 +0200 Subject: [PATCH 10/10] change volume (version 18+ require other path) --- docker-compose.ldap.yaml | 2 +- docker-compose.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.ldap.yaml b/docker-compose.ldap.yaml index 8b5fbd370..207ed3ce5 100644 --- a/docker-compose.ldap.yaml +++ b/docker-compose.ldap.yaml @@ -38,7 +38,7 @@ services: POSTGRES_USER: defguard POSTGRES_PASSWORD: defguard volumes: - - ./.volumes/db:/var/lib/postgresql/data + - ./.volumes/db:/var/lib/postgresql ports: - "5432:5432" diff --git a/docker-compose.yaml b/docker-compose.yaml index c38368368..15e581593 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -47,7 +47,7 @@ services: POSTGRES_USER: defguard POSTGRES_PASSWORD: defguard volumes: - - ./.volumes/db:/var/lib/postgresql/data + - ./.volumes/db:/var/lib/postgresql ports: - "5432:5432" healthcheck: