mike/infrastructure
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge conflict

Browse Source
This commit is contained in:
Mike Wilson
2023-08-13 10:23:08 -04:00
parent 77eb1eaddd 639a143083
commit ee0e6182e8
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ansible/main.yml
View File

@@ -24,8 +24,13 @@
- barassistant - barassistant
- mealie - mealie
- searxng - searxng
<<<<<<< HEAD
- firefly3 - firefly3
- name: qbittorrent - name: qbittorrent
=======
- sabnzbd
- name: firefly3
>>>>>>> refs/remotes/origin/master
tags: test tags: test
- unifi-controller - unifi-controller
- slskd - slskd

4
ansible/roles/firefly3/templates/docker-compose.yml
View File

@@ -9,7 +9,7 @@ networks:
services: services:
app: app:
image: fireflyiii/core:latest image: fireflyiii/core:latest
container_name: firefly3 container_name: firefly_iii_core
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- "{{ data_dir }}/firefly3/upload:/var/www/html/storage/upload" - "{{ data_dir }}/firefly3/upload:/var/www/html/storage/upload"
@@ -60,7 +60,7 @@ services:
image: alpine image: alpine
restart: always restart: always
container_name: firefly_iii_cron container_name: firefly_iii_cron
command: sh -c "echo \"0 3 * * * wget -qO- http://app:8080/api/v1/cron/Y5uNSbJoK4FKUC9gVE5hq8YFEbFmc6BK\" | crontab - && crond -f -L /dev/stdout" command: sh -c "echo \"0 3 * * * wget -qO- https://firefly.local.{{ personal_domain }}/api/v1/cron/Y5uNSbJoK4FKUC9gVE5hq8YFEbFmc6BK\" | crontab - && crond -f -L /dev/stdout"
networks: networks:
- firefly_iii - firefly_iii
- default - default