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

Commit 020ff96d authored by Thomas G.'s avatar Thomas G.
Browse files

chore(env): update S3 configuration variables to OBJECTSTORE naming convention... 

chore(env): update S3 configuration variables to OBJECTSTORE naming convention in .env.example and docker-compose.yml, restore data/
parent 0ed97837

.env.example

+8 −31
Original line number Diff line number Diff line
@@ -41,40 +41,17 @@ NGINX_DOCKER_IMG=registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/nginx:lat 
# 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

OBJECTSTORE_S3_BUCKET=

OBJECTSTORE_S3_REGION=main

OBJECTSTORE_S3_HOST=fsn1.your-objectstorage.com

OBJECTSTORE_S3_PORT=443



# S3 Credentials (sensitive - keep secure)

S3_ACCESS_KEY=your_access_key_here

S3_SECRET_KEY=your_secret_key_here

OBJECTSTORE_S3_KEY=your_access_key_here

OBJECTSTORE_S3_SECRET=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

OBJECTSTORE_S3_SSL=true

OBJECTSTORE_S3_USEPATH_STYLE=true

# Production Environment (hel1 - Helsinki)

# S3_BUCKET_NAME=murena-prod-instance-name

# S3_HOST=hel1.your-objectstorage.com

# S3_REGION=main

docker-compose.yml

+18 −12
Original line number Diff line number Diff line
@@ -23,19 +23,19 @@ services: 
      - SENTRY_DSN=${SENTRY_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_BUCKET=${OBJECTSTORE_S3_BUCKET}

      - OBJECTSTORE_S3_REGION=${OBJECTSTORE_S3_REGION}

      - OBJECTSTORE_S3_HOST=${OBJECTSTORE_S3_HOST}

      - OBJECTSTORE_S3_PORT=${OBJECTSTORE_S3_PORT}

      - OBJECTSTORE_S3_KEY=${OBJECTSTORE_S3_KEY}

      - OBJECTSTORE_S3_SECRET=${OBJECTSTORE_S3_SECRET}

      - OBJECTSTORE_S3_SSL=${OBJECTSTORE_S3_SSL}

      - OBJECTSTORE_S3_USEPATH_STYLE=${OBJECTSTORE_S3_USEPATH_STYLE}

      - OBJECTSTORE_S3_OBJECT_PREFIX=

      - OBJECTSTORE_S3_AUTOCREATE=false

    volumes:

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

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

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

    networks:

      - worker-network

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

    volumes:

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

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

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

    networks:

      - worker-network

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

      NEXTCLOUD_ADDR: ${DB_USER}-nextcloud:9000

      DOMAIN: ${DOMAIN}

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

    volumes:

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

    networks:

      - proxy-network

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

      o: bind

      device: "${SHARED_STORAGE_PATH}/config"

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

    driver: local

    driver_opts:

      type: none

      o: bind

      device: "${SHARED_STORAGE_PATH}/data"