diff --git a/.justfile b/.justfile index ed7e387..b37ae07 100644 --- a/.justfile +++ b/.justfile @@ -9,6 +9,8 @@ export ANSIBLE_DISPLAY_ARGS_TO_STDOUT := if env('CI', '') == 'true' { 'false' } play +ARGS: uv run ansible-playbook {{ ARGS }} +deploy-services: (play "./playbooks/docker/services.yaml") + ansible +ARGS: uv run ansible {{ ARGS }} @@ -21,5 +23,8 @@ encrypt +ARGS: encrypt-var NAME +CONTENT='': uv run ansible-vault encrypt_string {{ if CONTENT != "" {"--name"} else {"--stdin-name"} }} {{ NAME }} {{ CONTENT }} +decrypt-var FILE NAME: + uv run ansible localhost -m ansible.builtin.debug -e "@{{ FILE }}" -a var="{{ NAME }}" + decrypt +ARGS: uv run ansible-vault edit {{ ARGS }} diff --git a/files/docker/rss/docker-stack.yaml b/files/docker/rss/docker-stack.yaml index 94801a8..e589481 100644 --- a/files/docker/rss/docker-stack.yaml +++ b/files/docker/rss/docker-stack.yaml @@ -1,7 +1,6 @@ networks: - reverse-proxy: + reverse_proxy: external: true - miniflux: volumes: linkding_data: @@ -11,16 +10,16 @@ services: miniflux: image: miniflux/miniflux:latest restart: unless-stopped - depends_on: - - miniflux_db networks: - - miniflux - - reverse-proxy + - default + - reverse_proxy environment: - DATABASE_URL: postgres://${MF_DB_USER}:${MF_DB_PASS}@miniflux_db/miniflux?sslmode=disable + DATABASE_URL: "user=${MF_DB_USER} password=${MF_DB_PASS} dbname=miniflux host=tasks.miniflux_db sslmode=disable" RUN_MIGRATIONS: 1 BASE_URL: https://rss.alecodes.page + LOG_LEVEL: debug + OIDC_ENABLED: 1 DISABLE_LOCAL_AUTH: 1 OAUTH2_USER_CREATION: 1 @@ -42,17 +41,15 @@ services: - node.labels.services_kind==${SERVICE_KIND:-common} labels: - traefik.enable=true - - traefik.http.routers.freshrss.rule=Host(`rss.alecodes.page`) - - traefik.http.services.freshrss.loadbalancer.server.port=8080 + - traefik.http.routers.miniflux.rule=Host(`rss.alecodes.page`) + - traefik.http.services.miniflux.loadbalancer.server.port=8080 miniflux_db: - image: postgres:15 - networks: - - miniflux + image: postgres:latest environment: - - POSTGRES_USER=${MF_DB_USER} - - POSTGRES_PASSWORD=${MF_DB_PASS} - - POSTGRES_DB=miniflux + POSTGRES_USER: ${MF_DB_USER} + POSTGRES_PASSWORD: ${MF_DB_PASS} + POSTGRES_DB: miniflux volumes: - miniflux_db:/var/lib/postgresql/data healthcheck: @@ -74,7 +71,8 @@ services: image: sissbruecker/linkding:latest restart: unless-stopped networks: - - reverse-proxy + - default + - reverse_proxy volumes: - linkding_data:/etc/linkding/data" environment: