From 60070001aed4dd5af9e5a9d06f8b54b8c2017c33 Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 18 Mar 2024 16:41:34 -0400 Subject: [PATCH] Converted Remmina's repo for a Send fork --- docker-compose.production.yml | 6 +- docker-compose.staging.yml | 6 +- docker/redis/.gitkeep | 1 + docker/remmina/Dockerfile | 1 - docker/send/Dockerfile | 1 + .../{remmina => send}/Dockerfile.production | 0 stack.production.yml | 12 +++- stack.staging.yml | 67 +++++++++++++------ 8 files changed, 62 insertions(+), 32 deletions(-) create mode 100644 docker/redis/.gitkeep delete mode 100644 docker/remmina/Dockerfile create mode 100644 docker/send/Dockerfile rename docker/{remmina => send}/Dockerfile.production (100%) diff --git a/docker-compose.production.yml b/docker-compose.production.yml index ef90a2e..116fade 100644 --- a/docker-compose.production.yml +++ b/docker-compose.production.yml @@ -1,7 +1,7 @@ version: "3.9" services: - remmina: + send: build: - context: docker/remmina + context: docker/send dockerfile: Dockerfile.production - image: git.nixc.us/nixius/remmina:production + image: git.nixc.us/nixius/send:production diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml index 9b9cfc9..bb306c9 100644 --- a/docker-compose.staging.yml +++ b/docker-compose.staging.yml @@ -1,6 +1,6 @@ version: "3.9" services: - remmina: + send: build: - context: docker/remmina - image: git.nixc.us/nixius/remmina:staging + context: docker/send + image: git.nixc.us/nixius/send:staging diff --git a/docker/redis/.gitkeep b/docker/redis/.gitkeep new file mode 100644 index 0000000..076fde5 --- /dev/null +++ b/docker/redis/.gitkeep @@ -0,0 +1 @@ +# TODO: Deploy a static version of redis maybe for what its worth. \ No newline at end of file diff --git a/docker/remmina/Dockerfile b/docker/remmina/Dockerfile deleted file mode 100644 index 525c4df..0000000 --- a/docker/remmina/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -FROM lscr.io/linuxserver/remmina:latest \ No newline at end of file diff --git a/docker/send/Dockerfile b/docker/send/Dockerfile new file mode 100644 index 0000000..2d9721e --- /dev/null +++ b/docker/send/Dockerfile @@ -0,0 +1 @@ +FROM registry.gitlab.com/timvisee/send:latest \ No newline at end of file diff --git a/docker/remmina/Dockerfile.production b/docker/send/Dockerfile.production similarity index 100% rename from docker/remmina/Dockerfile.production rename to docker/send/Dockerfile.production diff --git a/stack.production.yml b/stack.production.yml index 3868417..d387f71 100644 --- a/stack.production.yml +++ b/stack.production.yml @@ -5,7 +5,7 @@ networks: default: services: web: - image: registry.gitlab.com/timvisee/send:latest + image: git.nixc.us/nixius/send:staging-web depends_on: - redis environment: @@ -20,17 +20,20 @@ services: DEFAULT_DOWNLOADS: "1" DEFAULT_EXPIRE_SECONDS: "86400" volumes: - - /mnt/tank/persist/aenow.com/send/staging/uploads:/uploads + - /mnt/tank/persist/nixc.us/send/staging/uploads:/uploads networks: - default - traefik deploy: replicas: 1 + placement: + constraints: + - node.hostname == macmini8 labels: - "traefik.enable=true" - "traefik.http.routers.production_send_web.tls=true" - "traefik.http.services.production_send_web.loadbalancer.server.port=1443" - - "traefik.http.routers.production_send_web.rule=Host(`send.aenow.com`)" + - "traefik.http.routers.production_send_web.rule=Host(`send.nixc.us`)" - "traefik.http.routers.production_send_web.entrypoints=websecure" - "traefik.http.routers.production_send_web.tls.certresolver=letsencryptresolver" - "traefik.http.routers.production_send_web.service=production_send_web" @@ -46,6 +49,9 @@ services: image: redis deploy: replicas: 1 + placement: + constraints: + - node.hostname == macmini8 labels: - traefik.enable=false volumes: diff --git a/stack.staging.yml b/stack.staging.yml index 6eb8f6c..7ae6869 100644 --- a/stack.staging.yml +++ b/stack.staging.yml @@ -1,32 +1,55 @@ -version: '3.7' - +version: "3.7" networks: traefik: external: true - + default: services: - remmina: - image: git.nixc.us/nixius/remmina:staging + web: + image: git.nixc.us/nixius/send:staging-web + depends_on: + - redis environment: - - PUID=1000 - - PGID=1000 - # - REMMINA_PASSWORD=your_password - - REMMINA_PORT=5900 + REDIS_HOST: send_redis + FILE_DIR: /uploads + DETECT_BASE_URL: "true" + MAX_FILE_SIZE: 4294967296 # 2147483648 #4,294,967,296 + MAX_FILES_PER_ARCHIVE: 64 + MAX_DOWNLOADS: 20 + DOWNLOAD_COUNTS: "2,1,2,5,10,15,25,50,100,1000" + EXPIRE_TIMES_SECONDS: "3600,86400,604800,2592000,31536000" + DEFAULT_DOWNLOADS: "1" + DEFAULT_EXPIRE_SECONDS: "86400" + # volumes: + # - /mnt/tank/persist/aenow.com/send/staging/uploads:/uploads networks: + - default - traefik deploy: replicas: 1 - placement: - constraints: - - node.hostname == ingress.nixc.us labels: - traefik.docker.network: traefik - traefik.enable: "true" - traefik.http.routers.staging_remmina.entrypoints: websecure - traefik.http.routers.staging_remmina.rule: Host(`staging.remmina.nixc.us`) - traefik.http.routers.staging_remmina.service: staging_remmina - traefik.http.routers.staging_remmina.tls: "true" - traefik.http.routers.staging_remmina.tls.certresolver: letsencryptresolver - traefik.http.services.staging_remmina.loadbalancer.server.port: '5900' - traefik.tags: traefik - traefik.http.routers.staging_remmina.middlewares: authelia_authelia@docker + - "traefik.enable=true" + - "traefik.http.routers.staging_send_web.tls=true" + - "traefik.http.services.staging_send_web.loadbalancer.server.port=1443" + - "traefik.http.routers.staging_send_web.rule=Host(`staging.send.aenow.com`)" + - "traefik.http.routers.staging_send_web.entrypoints=websecure" + - "traefik.http.routers.staging_send_web.tls.certresolver=letsencryptresolver" + - "traefik.http.routers.staging_send_web.service=staging_send_web" + - "traefik.docker.network=traefik" + networks: + - traefik + - default + redis: + image: redis:alpine + networks: + - default + redis: + image: redis + deploy: + replicas: 1 + labels: + - traefik.enable=false + # volumes: + # - /mnt/tank/persist/nixc.us/send/staging/db:/data + networks: + - default + entrypoint: redis-server \ No newline at end of file