Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18e03565 authored by Thomas Gallois's avatar Thomas Gallois
Browse files

feat(env): add S3 object storage configuration and backup environment variables

parent 57ea69ca

.env.backup

0 → 100644
+42 −0
Original line number Original line Diff line number Diff line 
TF_HTTP_ADDRESS=https://gitlab.e.foundation/api/v4/projects/1761/terraform/state

TF_HTTP_PASSWORD=glpat-4sQmF3VAq5rKYybrjgst

TF_HTTP_USERNAME=gitlab-ci-token

HCLOUD_TOKEN=7bBOIh5OSTni0B4KHwmASkFnuHDaRv2LMq5c7Q1mASvW0qu1Z0vxd0iakBAj4Lks

GANDI_TOKEN=e17ec8f114bfb3d5f8828fad099e57f07bf9b876



SMTP_NAME=fd0af045-04cd-471d-b405-3e978bb0b313

SMTP_PASSWORD=d3d51629-f9dd-4d1b-bbb4-8998f5b9bd50

SMTP_HOST=smtp.tem.scaleway.com

SMTP_SECURE=tls

SMTP_PORT=587

MAIL_FROM_ADDRESS=no-reply

MAIL_DOMAIN=murenaworkspace.com

MAIL_USER=dev@e.email



NEXTCLOUD_DOCKERFILE=slim.Dockerfile 

NEXTCLOUD_DOCKER_IMG=registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/slim:latest

NEXTCLOUD_ADMIN_USER=admin

NEXTCLOUD_ADMIN_PASSWORD=@dm1n

NEXTCLOUD_TRUSTED_DOMAINS=nc1.dev.murenaworkspace.app



ACME_EMAIL=dev@e.email



DB_HOST=base-services_db

DB_USER=nc1_nextcloud

DB_PASSWORD=123456

DB_NAME=nc1_db



# redis

REDIS_HOST=base-services_redis

REDIS_HOST_PASSWORD=12456



# nginx

NGINX_DOCKER_IMG=registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/nginx:latest



# syslog

SYSLOG_HOST=base-services_syslog

SHARED_STORAGE_PATH=/mnt/shared_storage/nextcloud/nc1



# Docker stack deployment variables

DOMAIN=nc1.dev.murenaworkspace.app

COMPOSE_PROJECT_NAME=nc1

.env.example

+37 −0
Original line number Original line Diff line number Diff line
@@ -41,3 +41,40 @@ NGINX_DOCKER_IMG=registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/nginx:lat 
# syslog

# syslog

SYSLOG_HOST=syslog

SYSLOG_HOST=syslog







# ===========================================

# S3 Object Storage Configuration

# ===========================================



# S3 Bucket Configuration

S3_BUCKET_NAME=murena-dev-instance-name

S3_REGION=main

S3_HOST=fsn1.your-objectstorage.com

S3_PORT=443



# S3 Credentials (sensitive - keep secure)

S3_ACCESS_KEY=your_access_key_here

S3_SECRET_KEY=your_secret_key_here



# S3 Connection Settings

S3_USE_SSL=true

S3_USE_PATH_STYLE=true



# ===========================================

# S3 Configuration Examples by Environment

# ===========================================



# Development Environment (fsn1 - Francfort)

# S3_BUCKET_NAME=murena-dev-instance-name

# S3_HOST=fsn1.your-objectstorage.com

# S3_REGION=main



# Staging Environment (nbg1 - Nuremberg)

# S3_BUCKET_NAME=murena-staging-instance-name

# S3_HOST=nbg1.your-objectstorage.com

# S3_REGION=main



# Production Environment (hel1 - Helsinki)

# S3_BUCKET_NAME=murena-prod-instance-name

# S3_HOST=hel1.your-objectstorage.com

# S3_REGION=main

docker-compose.yml

+15 −10
Original line number Original line Diff line number Diff line
@@ -22,9 +22,20 @@ services: 
      - SYSLOG_HOST=${SYSLOG_HOST}

      - SYSLOG_HOST=${SYSLOG_HOST}

      - SENTRY_DSN=${SENTRY_DSN}

      - SENTRY_DSN=${SENTRY_DSN}

      - SENTRY_PUBLIC_DSN=${SENTRY_PUBLIC_DSN}

      - SENTRY_PUBLIC_DSN=${SENTRY_PUBLIC_DSN}

      # Object Storage (S3) configuration

      - OBJECTSTORE_S3_BUCKET=${S3_BUCKET_NAME}

      - OBJECTSTORE_S3_REGION=${S3_REGION}

      - OBJECTSTORE_S3_HOST=${S3_HOST}

      - OBJECTSTORE_S3_PORT=${S3_PORT}

      - OBJECTSTORE_S3_KEY=${S3_ACCESS_KEY}

      - OBJECTSTORE_S3_SECRET=${S3_SECRET_KEY}

      - OBJECTSTORE_S3_SSL=${S3_USE_SSL}

      - OBJECTSTORE_S3_USEPATH_STYLE=${S3_USE_PATH_STYLE}

      - OBJECTSTORE_S3_OBJECT_PREFIX=

      - OBJECTSTORE_S3_AUTOCREATE=false

    volumes:

    volumes:

      - nextcloud-config:/var/www/html/config

      - nextcloud-config:/var/www/html/config

      - nextcloud-data:/var/www/html/data

      # nextcloud-data supprimé - données stockées en S3

    networks:

    networks:

      - worker-network

      - worker-network

    hostname: ${DB_USER}-nextcloud

    hostname: ${DB_USER}-nextcloud
@@ -38,7 +49,7 @@ services: 
    entrypoint: /cron.sh

    entrypoint: /cron.sh

    volumes:

    volumes:

      - nextcloud-config:/var/www/html/config

      - nextcloud-config:/var/www/html/config

      - nextcloud-data:/var/www/html/data

      # nextcloud-data supprimé - données stockées en S3

    networks:

    networks:

      - worker-network

      - worker-network

    deploy:

    deploy:
@@ -51,8 +62,7 @@ services: 
    environment:

    environment:

      NEXTCLOUD_ADDR: ${DB_USER}-nextcloud:9000

      NEXTCLOUD_ADDR: ${DB_USER}-nextcloud:9000

      DOMAIN: ${DOMAIN}

      DOMAIN: ${DOMAIN}

    volumes:

    # volumes: nextcloud-data supprimé - données stockées en S3

      - nextcloud-data:/var/www/html/data

    networks:

    networks:

      - proxy-network

      - proxy-network

      - worker-network

      - worker-network
@@ -80,9 +90,4 @@ volumes: 
      type: none

      type: none

      o: bind

      o: bind

      device: "${SHARED_STORAGE_PATH}/config"

      device: "${SHARED_STORAGE_PATH}/config"

  nextcloud-data:

  # nextcloud-data supprimé - données stockées en S3
 
    driver: local

    driver_opts:

      type: none

      o: bind

      device: "${SHARED_STORAGE_PATH}/data"