From 67ebfa4d7b573a93c511749cd1bbe0fdb9779ad5 Mon Sep 17 00:00:00 2001 From: Anupam Kumar Date: Wed, 12 Feb 2025 17:03:28 +0530 Subject: [PATCH 1/7] enh: add harp config Signed-off-by: Anupam Kumar --- .../vhost.d/nextcloud.local_location_override | 8 ++++++++ docker-compose.yml | 15 +++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 data/nginx/vhost.d/nextcloud.local_location_override diff --git a/data/nginx/vhost.d/nextcloud.local_location_override b/data/nginx/vhost.d/nextcloud.local_location_override new file mode 100644 index 00000000..b93e3d24 --- /dev/null +++ b/data/nginx/vhost.d/nextcloud.local_location_override @@ -0,0 +1,8 @@ +location / { + proxy_pass http://nextcloud.local; +} + +location /exapps/ { + proxy_pass http://appapi-dsp-harp:8780; +} + diff --git a/docker-compose.yml b/docker-compose.yml index 7d783267..97ac8d19 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1404,6 +1404,21 @@ services: - ./authentik-custom-templates:/templates - ./authentik-certs:/certs + appapi-dsp-harp: + # todo + image: nextcloud-appapi-harp:latest + container_name: nextcloud-appapi-harp + network_mode: ${NETWORK_MODE:-master_default} + ports: + - "${EXAPPS_HTTP_PORT:-8780}:8780" + - "${EXAPPS_FRP_PORT:-8782}:8782" + volumes: + - /var/run/docker.sock:/var/run/docker.sock + environment: + - NC_HARP_SHARED_KEY=${NC_HAPROXY_SHARED_KEY:-some_very_secure_password} + - NC_INSTANCE_URL=${NC_INSTANCE_URL:-http://nextcloud.local} + - HP_FRP_DISABLE_TLS=${HP_FRP_DISABLE_TLS:-true} + volumes: data: config: From 88e3d897f1089b52ad8cceea4c2fa1a8593e8a97 Mon Sep 17 00:00:00 2001 From: Anupam Kumar Date: Wed, 12 Feb 2025 19:41:03 +0530 Subject: [PATCH 2/7] env var changes Signed-off-by: Anupam Kumar --- docker-compose.yml | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 97ac8d19..1a0963a8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1405,19 +1405,24 @@ services: - ./authentik-certs:/certs appapi-dsp-harp: - # todo - image: nextcloud-appapi-harp:latest + image: ghcr.io/nextcloud/nextcloud-appapi-harp:latest container_name: nextcloud-appapi-harp - network_mode: ${NETWORK_MODE:-master_default} - ports: - - "${EXAPPS_HTTP_PORT:-8780}:8780" - - "${EXAPPS_FRP_PORT:-8782}:8782" + network_mode: ${HP_NETWORK_MODE:-master_default} volumes: - /var/run/docker.sock:/var/run/docker.sock + ports: + - "8780:8780" + - "8781:8781" + - "8782:8782" environment: - - NC_HARP_SHARED_KEY=${NC_HAPROXY_SHARED_KEY:-some_very_secure_password} - - NC_INSTANCE_URL=${NC_INSTANCE_URL:-http://nextcloud.local} - - HP_FRP_DISABLE_TLS=${HP_FRP_DISABLE_TLS:-true} + - HP_SHARED_KEY=${HP_SHARED_KEY:-some_very_secure_password} + - NC_INSTANCE_URL=${HP_NC_INSTANCE_URL:-http://nextcloud.local} + - HP_FRP_DISABLE_TLS=${HP_FRP_DISABLE_TLS:-false} + - HP_EXAPPS_ADDRESS=${HP_EXAPPS_ADDRESS:-"0.0.0.0:8780"} + - HP_EXAPPS_HTTPS_ADDRESS=${HP_EXAPPS_HTTPS_ADDRESS:-"0.0.0.0:8781"} + - HP_FRP_ADDRESS=${HP_FRP_ADDRESS:-"0.0.0.0:8782"} + - HP_LOG_LEVEL=${HP_LOG_LEVEL:-info} + - HP_VERBOSE_START=${HP_VERBOSE_START:-1} volumes: data: From 339bac2314fc5c2f66b95af3862a4b8c13c078d8 Mon Sep 17 00:00:00 2001 From: Anupam Kumar Date: Tue, 25 Feb 2025 17:10:15 +0530 Subject: [PATCH 3/7] vhost change to location + env fixes Signed-off-by: Anupam Kumar --- data/nginx/vhost.d/nextcloud.local_location | 5 +++++ data/nginx/vhost.d/nextcloud.local_location_override | 8 -------- docker-compose.yml | 6 +++--- 3 files changed, 8 insertions(+), 11 deletions(-) create mode 100644 data/nginx/vhost.d/nextcloud.local_location delete mode 100644 data/nginx/vhost.d/nextcloud.local_location_override diff --git a/data/nginx/vhost.d/nextcloud.local_location b/data/nginx/vhost.d/nextcloud.local_location new file mode 100644 index 00000000..f9ad1838 --- /dev/null +++ b/data/nginx/vhost.d/nextcloud.local_location @@ -0,0 +1,5 @@ +location /exapps/ { + set $harp_addr 192.168.21.7:8780; + proxy_pass http://$harp_addr; +} + diff --git a/data/nginx/vhost.d/nextcloud.local_location_override b/data/nginx/vhost.d/nextcloud.local_location_override deleted file mode 100644 index b93e3d24..00000000 --- a/data/nginx/vhost.d/nextcloud.local_location_override +++ /dev/null @@ -1,8 +0,0 @@ -location / { - proxy_pass http://nextcloud.local; -} - -location /exapps/ { - proxy_pass http://appapi-dsp-harp:8780; -} - diff --git a/docker-compose.yml b/docker-compose.yml index 1a0963a8..9afc5fb4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1418,9 +1418,9 @@ services: - HP_SHARED_KEY=${HP_SHARED_KEY:-some_very_secure_password} - NC_INSTANCE_URL=${HP_NC_INSTANCE_URL:-http://nextcloud.local} - HP_FRP_DISABLE_TLS=${HP_FRP_DISABLE_TLS:-false} - - HP_EXAPPS_ADDRESS=${HP_EXAPPS_ADDRESS:-"0.0.0.0:8780"} - - HP_EXAPPS_HTTPS_ADDRESS=${HP_EXAPPS_HTTPS_ADDRESS:-"0.0.0.0:8781"} - - HP_FRP_ADDRESS=${HP_FRP_ADDRESS:-"0.0.0.0:8782"} + - HP_EXAPPS_ADDRESS=${HP_EXAPPS_ADDRESS:-0.0.0.0:8780} + - HP_EXAPPS_HTTPS_ADDRESS=${HP_EXAPPS_HTTPS_ADDRESS:-0.0.0.0:8781} + - HP_FRP_ADDRESS=${HP_FRP_ADDRESS:-0.0.0.0:8782} - HP_LOG_LEVEL=${HP_LOG_LEVEL:-info} - HP_VERBOSE_START=${HP_VERBOSE_START:-1} From 2fdfba04a6146b6d3ccd7b6ae24e0168d79e763c Mon Sep 17 00:00:00 2001 From: Anupam Kumar Date: Thu, 27 Feb 2025 17:49:31 +0530 Subject: [PATCH 4/7] updates Signed-off-by: Anupam Kumar --- data/nginx/vhost.d/nextcloud.local_location | 2 +- data/ssl/harp/.gitkeep | 0 docker-compose.yml | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 data/ssl/harp/.gitkeep diff --git a/data/nginx/vhost.d/nextcloud.local_location b/data/nginx/vhost.d/nextcloud.local_location index f9ad1838..c78d616e 100644 --- a/data/nginx/vhost.d/nextcloud.local_location +++ b/data/nginx/vhost.d/nextcloud.local_location @@ -1,5 +1,5 @@ location /exapps/ { - set $harp_addr 192.168.21.7:8780; + set $harp_addr nextcloud-appapi-harp:8780; proxy_pass http://$harp_addr; } diff --git a/data/ssl/harp/.gitkeep b/data/ssl/harp/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/docker-compose.yml b/docker-compose.yml index 9afc5fb4..0ea247a0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1404,12 +1404,13 @@ services: - ./authentik-custom-templates:/templates - ./authentik-certs:/certs - appapi-dsp-harp: + appapi-harp: image: ghcr.io/nextcloud/nextcloud-appapi-harp:latest container_name: nextcloud-appapi-harp network_mode: ${HP_NETWORK_MODE:-master_default} volumes: - /var/run/docker.sock:/var/run/docker.sock + - ${CERT_PATH:-./data/ssl/harp/}:/certs ports: - "8780:8780" - "8781:8781" From 5d24fd03b307a93e64ed73431b92394fda30a839 Mon Sep 17 00:00:00 2001 From: Anupam Kumar Date: Thu, 27 Feb 2025 19:18:03 +0530 Subject: [PATCH 5/7] add env HP_SESSION_LIFETIME Signed-off-by: Anupam Kumar --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 0ea247a0..3bb8cdb3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1424,6 +1424,7 @@ services: - HP_FRP_ADDRESS=${HP_FRP_ADDRESS:-0.0.0.0:8782} - HP_LOG_LEVEL=${HP_LOG_LEVEL:-info} - HP_VERBOSE_START=${HP_VERBOSE_START:-1} + - HP_SESSION_LIFETIME=${HP_SESSION_LIFETIME:-3} volumes: data: From 0c56460a4086b25506eb2f639031290a55e1027e Mon Sep 17 00:00:00 2001 From: Anupam Kumar Date: Mon, 3 Mar 2025 20:24:42 +0530 Subject: [PATCH 6/7] change name to appapi-harp Signed-off-by: Anupam Kumar --- data/nginx/vhost.d/nextcloud.local_location | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/nginx/vhost.d/nextcloud.local_location b/data/nginx/vhost.d/nextcloud.local_location index c78d616e..91cf5901 100644 --- a/data/nginx/vhost.d/nextcloud.local_location +++ b/data/nginx/vhost.d/nextcloud.local_location @@ -1,5 +1,5 @@ location /exapps/ { - set $harp_addr nextcloud-appapi-harp:8780; + set $harp_addr appapi-harp:8780; proxy_pass http://$harp_addr; } diff --git a/docker-compose.yml b/docker-compose.yml index 3bb8cdb3..29dafd58 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1406,7 +1406,7 @@ services: appapi-harp: image: ghcr.io/nextcloud/nextcloud-appapi-harp:latest - container_name: nextcloud-appapi-harp + container_name: appapi-harp network_mode: ${HP_NETWORK_MODE:-master_default} volumes: - /var/run/docker.sock:/var/run/docker.sock From 4335801c76cd7b8659f97e6ceba2c119c2671156 Mon Sep 17 00:00:00 2001 From: Anupam Kumar Date: Wed, 9 Sep 2026 08:36:30 +0530 Subject: [PATCH 7/7] chore: adjust to the new changes Signed-off-by: Anupam Kumar --- data/nginx/vhost.d/nextcloud.local_location | 8 +++++++- docker-compose.yml | 6 +++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/data/nginx/vhost.d/nextcloud.local_location b/data/nginx/vhost.d/nextcloud.local_location index 91cf5901..fd16d2fa 100644 --- a/data/nginx/vhost.d/nextcloud.local_location +++ b/data/nginx/vhost.d/nextcloud.local_location @@ -1,5 +1,11 @@ location /exapps/ { + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_read_timeout 1800s; + set $harp_addr appapi-harp:8780; - proxy_pass http://$harp_addr; + proxy_pass http://$harp_addr/exapps/; } diff --git a/docker-compose.yml b/docker-compose.yml index 29dafd58..f48f51c6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1417,6 +1417,7 @@ services: - "8782:8782" environment: - HP_SHARED_KEY=${HP_SHARED_KEY:-some_very_secure_password} + - HP_TRUSTED_PROXY_IPS={HP_TRUSTED_PROXY_IPS:-${DOCKER_SUBNET:-192.168.21.0/24}} - NC_INSTANCE_URL=${HP_NC_INSTANCE_URL:-http://nextcloud.local} - HP_FRP_DISABLE_TLS=${HP_FRP_DISABLE_TLS:-false} - HP_EXAPPS_ADDRESS=${HP_EXAPPS_ADDRESS:-0.0.0.0:8780} @@ -1424,7 +1425,10 @@ services: - HP_FRP_ADDRESS=${HP_FRP_ADDRESS:-0.0.0.0:8782} - HP_LOG_LEVEL=${HP_LOG_LEVEL:-info} - HP_VERBOSE_START=${HP_VERBOSE_START:-1} - - HP_SESSION_LIFETIME=${HP_SESSION_LIFETIME:-3} + - HP_WATCHDOG_ENABLED=${HP_WATCHDOG_ENABLED:-true} + - HP_BLACKLIST_COUNT=${HP_BLACKLIST_COUNT:-10} + - HP_TIMEOUT_CLIENT=${HP_TIMEOUT_CLIENT:-30s} + - HP_TIMEOUT_SERVER=${HP_TIMEOUT_SERVER:-1800s} volumes: data: