From bee1ce689c8a9337cd9a6bff5038d708086258a6 Mon Sep 17 00:00:00 2001 From: Anupam Kumar Date: Wed, 12 Feb 2025 17:03:28 +0530 Subject: [PATCH 1/6] enh: add harp config Signed-off-by: Anupam Kumar --- .../vhost.d/nextcloud.local_location_override | 8 ++++++++ docker-compose.yml | 14 ++++++++++++++ 2 files changed, 22 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 d6258be2..df56bba6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1106,6 +1106,20 @@ services: - EX_APPS_NET=${EX_APPS_NET:-ipv4@localhost} - EX_APPS_COUNT=${EX_APPS_COUNT:-50} + 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: From 8ed76a6011ad772b7b77e988f0888eb1f2bf862c Mon Sep 17 00:00:00 2001 From: Anupam Kumar Date: Wed, 12 Feb 2025 19:41:03 +0530 Subject: [PATCH 2/6] 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 df56bba6..f48887db 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1107,19 +1107,24 @@ services: - EX_APPS_COUNT=${EX_APPS_COUNT:-50} 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 6ba6eb3e228404d220b99ccbe35954602388b0dd Mon Sep 17 00:00:00 2001 From: Anupam Kumar Date: Tue, 25 Feb 2025 17:10:15 +0530 Subject: [PATCH 3/6] 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 f48887db..78e990c8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1120,9 +1120,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 e1233ca5115db1f726a630cbdc2cc4ed1b99912f Mon Sep 17 00:00:00 2001 From: Anupam Kumar Date: Thu, 27 Feb 2025 17:49:31 +0530 Subject: [PATCH 4/6] 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 78e990c8..ab103fa0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1106,12 +1106,13 @@ services: - EX_APPS_NET=${EX_APPS_NET:-ipv4@localhost} - EX_APPS_COUNT=${EX_APPS_COUNT:-50} - 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 b056aad089b71fdf81d9a171cf4e664ecab15c8f Mon Sep 17 00:00:00 2001 From: Anupam Kumar Date: Thu, 27 Feb 2025 19:18:03 +0530 Subject: [PATCH 5/6] 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 ab103fa0..ae0411fc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1126,6 +1126,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 c2058958b1a7e1e355411bedbffde5cca970380e Mon Sep 17 00:00:00 2001 From: Anupam Kumar Date: Mon, 3 Mar 2025 20:24:42 +0530 Subject: [PATCH 6/6] 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 ae0411fc..1b5effc4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1108,7 +1108,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