chore(koillection): remove redundant "https enabled" env var
This commit is contained in:
Nicolas Meienberger
parent
9121195828
commit
4a74dcc624
|
|
@ -1,36 +1,33 @@
|
|||
{
|
||||
"name": "Koillection",
|
||||
"available": true,
|
||||
"port": 8050,
|
||||
"exposable": true,
|
||||
"id": "koillection",
|
||||
"description": "Koillection is a self-hosted service allowing users to manage any kind of collections.",
|
||||
"tipi_version": 1,
|
||||
"version": "1.4.11",
|
||||
"categories": ["utilities"],
|
||||
"short_desc": "Koillection allow you to manage any kind of collections.",
|
||||
"author": "https://github.com/benjaminjonard",
|
||||
"source": "https://github.com/benjaminjonard/koillection",
|
||||
"website": "https://koillection.github.io/",
|
||||
"form_fields": [
|
||||
{
|
||||
"type": "boolean",
|
||||
"label": "https enable",
|
||||
"env_variable": "KOILLECTION_HTTPS_ENABLED"
|
||||
},
|
||||
{
|
||||
"type": "random",
|
||||
"label": "database user",
|
||||
"min": 15,
|
||||
"max": 15,
|
||||
"env_variable": "KOILLECTION_DB_USER"
|
||||
},
|
||||
{
|
||||
"type": "random",
|
||||
"label": "database password",
|
||||
"min": 30,
|
||||
"max": 30,
|
||||
"env_variable": "KOILLECTION_DB_PASSWORD"
|
||||
}
|
||||
]
|
||||
}
|
||||
"$schema": "../schema.json",
|
||||
"name": "Koillection",
|
||||
"available": true,
|
||||
"port": 8050,
|
||||
"exposable": true,
|
||||
"id": "koillection",
|
||||
"description": "Koillection is a self-hosted service allowing users to manage any kind of collections.",
|
||||
"tipi_version": 1,
|
||||
"version": "1.4.11",
|
||||
"categories": ["utilities"],
|
||||
"short_desc": "Koillection allow you to manage any kind of collections.",
|
||||
"author": "https://github.com/benjaminjonard",
|
||||
"source": "https://github.com/benjaminjonard/koillection",
|
||||
"website": "https://koillection.github.io/",
|
||||
"supported_architectures": ["amd64", "arm64"],
|
||||
"form_fields": [
|
||||
{
|
||||
"type": "random",
|
||||
"label": "database user",
|
||||
"min": 15,
|
||||
"max": 15,
|
||||
"env_variable": "KOILLECTION_DB_USER"
|
||||
},
|
||||
{
|
||||
"type": "random",
|
||||
"label": "database password",
|
||||
"min": 30,
|
||||
"max": 30,
|
||||
"env_variable": "KOILLECTION_DB_PASSWORD"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,71 +1,71 @@
|
|||
version: '3'
|
||||
|
||||
services:
|
||||
koillection:
|
||||
image: koillection/koillection:1.4.11
|
||||
container_name: koillection
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- ${APP_PORT}:80
|
||||
depends_on:
|
||||
- koillection-db
|
||||
volumes:
|
||||
- ${APP_DATA_DIR}/data/uploads:/uploads
|
||||
environment:
|
||||
- APP_DEBUG=0
|
||||
- APP_ENV=prod
|
||||
- HTTPS_ENABLED={KOILLECTION_HTTPS_ENABLED}
|
||||
- UPLOAD_MAX_FILESIZE=20M
|
||||
- PHP_MEMORY_LIMIT=512M
|
||||
- PHP_TZ=${TZ}
|
||||
- CORS_ALLOW_ORIGIN=*
|
||||
- JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private.pem
|
||||
- JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public.pem
|
||||
- DB_DRIVER=pdo_pgsql
|
||||
- DB_NAME=koillection
|
||||
- DB_HOST=koillection-db
|
||||
- DB_PORT=5432
|
||||
- DB_USER={KOILLECTION_DB_USER}
|
||||
- DB_PASSWORD={KOILLECTION_DB_PASSWORD}
|
||||
- DB_VERSION=15
|
||||
networks:
|
||||
- tipi_main_network
|
||||
labels:
|
||||
# Main
|
||||
traefik.enable: true
|
||||
traefik.http.middlewares.koillection-web-redirect.redirectscheme.scheme: https
|
||||
traefik.http.services.koillection.loadbalancer.server.port: 8080
|
||||
# Web
|
||||
traefik.http.routers.koillection-insecure.rule: Host(`${APP_DOMAIN}`)
|
||||
traefik.http.routers.koillection-insecure.entrypoints: web
|
||||
traefik.http.routers.koillection-insecure.service: koillection
|
||||
traefik.http.routers.koillection-insecure.middlewares: koillection-web-redirect
|
||||
# Websecure
|
||||
traefik.http.routers.koillection.rule: Host(`${APP_DOMAIN}`)
|
||||
traefik.http.routers.koillection.entrypoints: websecure
|
||||
traefik.http.routers.koillection.service: koillection
|
||||
traefik.http.routers.koillection.tls.certresolver: myresolver
|
||||
# Local domain
|
||||
traefik.http.routers.koillection-local-insecure.rule: Host(`koillection.${LOCAL_DOMAIN}`)
|
||||
traefik.http.routers.koillection-local-insecure.entrypoints: web
|
||||
traefik.http.routers.koillection-local-insecure.service: koillection
|
||||
traefik.http.routers.koillection-local-insecure.middlewares: koillection-web-redirect
|
||||
# Local domain secure
|
||||
traefik.http.routers.koillection-local.rule: Host(`koillection.${LOCAL_DOMAIN}`)
|
||||
traefik.http.routers.koillection-local.entrypoints: websecure
|
||||
traefik.http.routers.koillection-local.service: koillection
|
||||
traefik.http.routers.koillection-local.tls: true
|
||||
koillection:
|
||||
image: koillection/koillection:1.4.11
|
||||
container_name: koillection
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- ${APP_PORT}:80
|
||||
depends_on:
|
||||
- koillection-db
|
||||
volumes:
|
||||
- ${APP_DATA_DIR}/data/uploads:/uploads
|
||||
environment:
|
||||
- APP_DEBUG=0
|
||||
- APP_ENV=prod
|
||||
- HTTPS_ENABLED={APP_EXPOSED}
|
||||
- UPLOAD_MAX_FILESIZE=20M
|
||||
- PHP_MEMORY_LIMIT=512M
|
||||
- PHP_TZ=${TZ}
|
||||
- CORS_ALLOW_ORIGIN=*
|
||||
- JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private.pem
|
||||
- JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public.pem
|
||||
- DB_DRIVER=pdo_pgsql
|
||||
- DB_NAME=koillection
|
||||
- DB_HOST=koillection-db
|
||||
- DB_PORT=5432
|
||||
- DB_USER={KOILLECTION_DB_USER}
|
||||
- DB_PASSWORD={KOILLECTION_DB_PASSWORD}
|
||||
- DB_VERSION=15
|
||||
networks:
|
||||
- tipi_main_network
|
||||
labels:
|
||||
# Main
|
||||
traefik.enable: true
|
||||
traefik.http.middlewares.koillection-web-redirect.redirectscheme.scheme: https
|
||||
traefik.http.services.koillection.loadbalancer.server.port: 8080
|
||||
# Web
|
||||
traefik.http.routers.koillection-insecure.rule: Host(`${APP_DOMAIN}`)
|
||||
traefik.http.routers.koillection-insecure.entrypoints: web
|
||||
traefik.http.routers.koillection-insecure.service: koillection
|
||||
traefik.http.routers.koillection-insecure.middlewares: koillection-web-redirect
|
||||
# Websecure
|
||||
traefik.http.routers.koillection.rule: Host(`${APP_DOMAIN}`)
|
||||
traefik.http.routers.koillection.entrypoints: websecure
|
||||
traefik.http.routers.koillection.service: koillection
|
||||
traefik.http.routers.koillection.tls.certresolver: myresolver
|
||||
# Local domain
|
||||
traefik.http.routers.koillection-local-insecure.rule: Host(`koillection.${LOCAL_DOMAIN}`)
|
||||
traefik.http.routers.koillection-local-insecure.entrypoints: web
|
||||
traefik.http.routers.koillection-local-insecure.service: koillection
|
||||
traefik.http.routers.koillection-local-insecure.middlewares: koillection-web-redirect
|
||||
# Local domain secure
|
||||
traefik.http.routers.koillection-local.rule: Host(`koillection.${LOCAL_DOMAIN}`)
|
||||
traefik.http.routers.koillection-local.entrypoints: websecure
|
||||
traefik.http.routers.koillection-local.service: koillection
|
||||
traefik.http.routers.koillection-local.tls: true
|
||||
|
||||
koillection-db:
|
||||
image: postgres:15
|
||||
container_name: koillection-db
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
- POSTGRES_DB=koillection
|
||||
- POSTGRES_USER={KOILLECTION_DB_USER}
|
||||
- POSTGRES_PASSWORD={KOILLECTION_DB_PASSWORD}
|
||||
|
||||
volumes:
|
||||
- ${APP_DATA_DIR}/data/volumes/postgresql:/var/lib/postgresql/data
|
||||
networks:
|
||||
- tipi_main_network
|
||||
koillection-db:
|
||||
image: postgres:15
|
||||
container_name: koillection-db
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
- POSTGRES_DB=koillection
|
||||
- POSTGRES_USER={KOILLECTION_DB_USER}
|
||||
- POSTGRES_PASSWORD={KOILLECTION_DB_PASSWORD}
|
||||
|
||||
volumes:
|
||||
- ${APP_DATA_DIR}/data/volumes/postgresql:/var/lib/postgresql/data
|
||||
networks:
|
||||
- tipi_main_network
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user