diff --git a/.env.sample b/.env.sample index 7af8c01813767a06cc60ddf7ea77f1107757b4a4..857acc7c2ae85c90dc053d5eaf4f2accfc35f3b0 100644 --- a/.env.sample +++ b/.env.sample @@ -1,19 +1,19 @@ # For prod -# COMPOSE_FILE=docker-compose.yml:traefik.yml +COMPOSE_FILE=docker-compose.yml:traefik.yml # For local -COMPOSE_FILE=docker-compose.yml:ports.yml +# COMPOSE_FILE=docker-compose.yml:ports.yml -NAME=hammelig +NAME=hemmelig HOST=some-host.fqdn # For local deployment PORT=3000 - +RESTART=always # Variable to change -SECRET_ROOT_USER= # User as the root admin user -SECRET_ROOT_EMAIL= # The email for the admin user -SECRET_JWT_SECRET= # Override this for the secret signin JWT tokens for log in +SECRET_ROOT_USER= # User as the root admin user +SECRET_ROOT_EMAIL= # The email for the admin user +SECRET_JWT_SECRET= # Override this for the secret signin JWT tokens for log in # Instance variable SECRET_LOCAL_HOSTNAME=0.0.0.0 # The local hostname for the fastify instance diff --git a/README.md b/README.md index 1a206d76f1ad4161461ff9153e7d01c680c0ea57..8dd67da528747578206121334bcd94406305e945 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ cp .env.sample .env # create volumes directories mkdir -p data/hemmelig database -touch database/hammelig.db +touch database/hemmelig.db # set permissions (Node user has UID 1000 within the container) chown 1000:1000 data/hemmelig database diff --git a/docker-compose.yml b/docker-compose.yml index d1b1c33f040b882419b4eb110e24c1f52f415463..d996213f0ddeb56005481cc0f0f3feb94f925226 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,9 +2,9 @@ version: "3" services: hemmelig: - image: hemmeligapp/hemmelig:v5.19.25 # https://github.com/HemmeligOrg/Hemmelig.app/tags + image: hemmeligapp/hemmelig:latest hostname: hemmelig - init: true + init: false volumes: - ./data/hemmelig/:/var/tmp/hemmelig/upload/files - ./database/:/home/node/hemmelig/database/ @@ -16,7 +16,7 @@ services: - SECRET_ROOT_EMAIL=${SECRET_ROOT_EMAIL} - SECRET_FORCED_LANGUAGE=${SECRET_FORCED_LANGUAGE} - SECRET_JWT_SECRET=${SECRET_JWT_SECRET} - restart: unless-stopped + restart: ${RESTART} volumes: data: diff --git a/traefik.yml b/traefik.yml index 3f384fb3c3669d362ce39479d5a2c9d4b9ed1f07..43105078480020289291b2811096964d3c24fa30 100644 --- a/traefik.yml +++ b/traefik.yml @@ -11,7 +11,6 @@ services: - "traefik.http.routers.${NAME}.rule=Host(`${HOST}`)" - "traefik.http.routers.${NAME}.tls.certresolver=myresolver" - "traefik.http.routers.${NAME}.entrypoints=web,websecure" - - "traefik.http.services.${NAME}.loadbalancer.server.port=${PORT}" - "traefik.http.services.${NAME}.loadbalancer.server.scheme=http" networks: