From c557edb6dc5d116289f54c901013bd5e25b37f6c Mon Sep 17 00:00:00 2001 From: BhasherBEL Date: Thu, 12 Oct 2023 19:37:11 +0200 Subject: [PATCH 1/2] joplin --- bxl-shp/apps/docker-compose.joplin.yaml | 35 +++++++++++++++++++++++ bxl-shp/config/borg/borg.service | 14 --------- bxl-shp/config/borg/borg.timer | 9 ------ bxl-shp/system/docker-compose.backup.yaml | 20 ++++++++++++- 4 files changed, 54 insertions(+), 24 deletions(-) create mode 100644 bxl-shp/apps/docker-compose.joplin.yaml delete mode 100644 bxl-shp/config/borg/borg.service delete mode 100644 bxl-shp/config/borg/borg.timer diff --git a/bxl-shp/apps/docker-compose.joplin.yaml b/bxl-shp/apps/docker-compose.joplin.yaml new file mode 100644 index 0000000..41c09b9 --- /dev/null +++ b/bxl-shp/apps/docker-compose.joplin.yaml @@ -0,0 +1,35 @@ +services: + joplin-server: + container_name: joplin + image: joplin/server:latest + restart: unless-stopped + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro + environment: + - APP_PORT=22300 + - APP_BASE_URL=https://joplin.bhasher.com + - DB_CLIENT=pg + - POSTGRES_USER=postgres + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} + - POSTGRES_DATABASE=joplin + - POSTGRES_HOST=postgres + - TZ=Europe/Paris + ports: + - 22300:22300/tcp + labels: + - "traefik.enable=true" + - "traefik.http.routers.joplin.rule=Host(`joplin.bhasher.com`)" + - "traefik.http.services.joplin.loadbalancer.server.port=22300" + - "traefik.http.routers.joplin.tls=true" + - "traefik.http.routers.joplin.tls.certresolver=http" + - "traefik.http.routers.joplin.entrypoints=internalsecure" + networks: + - storage + - external + +networks: + storage: + external: true + external: + external: true diff --git a/bxl-shp/config/borg/borg.service b/bxl-shp/config/borg/borg.service deleted file mode 100644 index 0d9d71b..0000000 --- a/bxl-shp/config/borg/borg.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Start Borg Backup Container -After=docker.service -ConditionPathExists=/mnt/borg - -[Service] -Type=oneshot -ExecStart=/usr/bin/docker start borg -User=pi -Group=pi -Restart=no - -[Install] -WantedBy=multi-user.target diff --git a/bxl-shp/config/borg/borg.timer b/bxl-shp/config/borg/borg.timer deleted file mode 100644 index 17763b3..0000000 --- a/bxl-shp/config/borg/borg.timer +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Run Borg Backup at 4 a.m. every day - -[Timer] -OnCalendar=*-*-* 04:00:00 -Persistent=true - -[Install] -WantedBy=timers.target diff --git a/bxl-shp/system/docker-compose.backup.yaml b/bxl-shp/system/docker-compose.backup.yaml index 5a048ce..0f49ab9 100644 --- a/bxl-shp/system/docker-compose.backup.yaml +++ b/bxl-shp/system/docker-compose.backup.yaml @@ -5,7 +5,7 @@ services: restart: unless-stopped volumes: - $DATA:/mnt/source:ro - - $BACKUP:/mnt/borg-repository:rw + - $BACKUP/shp:/mnt/borg-repository:rw - $CONFIG/borgmatic/etc:/etc/borgmatic.d - $DATA/borgmatic/borg:/root/.config/borg - $DATA/borgmatic/ssh:/root/.ssh @@ -19,3 +19,21 @@ services: networks: - storage + borgmatic-vps: + container_name: borgmatic-vps + image: ghcr.io/borgmatic-collective/borgmatic:latest + restart: unless-stopped + volumes: + - /mnt/vps:/mnt/source:ro + - $BACKUP/vps:/mnt/borg-repository:rw + - $CONFIG/borgmatic/etc:/etc/borgmatic.d + - $DATA/borgmatic-vps/borg:/root/.config/borg + - $DATA/borgmatic-vps/ssh:/root/.ssh + - $DATA/borgmatic-vps/cache:/root/.cache/borg + - /etc/localtime:/etc/localtime:ro + environment: + - TZ=Europe/Paris + - BORG_PASSPHRASE=none + - BACKUP_CRON=0 5 * * * + - RUN_ON_STARTUP=true + From 39e1aad5d89bad11e257e591709c45ddad4c6b74 Mon Sep 17 00:00:00 2001 From: BhasherBEL Date: Fri, 13 Oct 2023 15:03:14 +0200 Subject: [PATCH 2/2] vault & monica --- bxl-shp/apps/docker-compose.monica.yaml | 28 ++++++++++++++++ bxl-shp/apps/docker-compose.vaultwarden.yaml | 34 ++++++++++++++++++++ bxl-shp/config/dashy/config.yml | 24 +++++++------- 3 files changed, 74 insertions(+), 12 deletions(-) create mode 100644 bxl-shp/apps/docker-compose.monica.yaml create mode 100644 bxl-shp/apps/docker-compose.vaultwarden.yaml diff --git a/bxl-shp/apps/docker-compose.monica.yaml b/bxl-shp/apps/docker-compose.monica.yaml new file mode 100644 index 0000000..da522ad --- /dev/null +++ b/bxl-shp/apps/docker-compose.monica.yaml @@ -0,0 +1,28 @@ +services: + app: + container_name: monica + image: monica + environment: + - APP_KEY=${MONICA_APPKEY} + - DB_HOST=mariadb + - DB_USERNAME=root + - DB_PASSWORD=${MARIADB_ROOT} + labels: + - "traefik.enable=true" + - "traefik.http.routers.monica.rule=Host(`monica.bhasher.com`)" + - "traefik.http.services.monica.loadbalancer.server.port=80" + - "traefik.http.routers.monica.tls=true" + - "traefik.http.routers.monica.tls.certresolver=http" + - "traefik.http.routers.monica.entrypoints=internalsecure" + volumes: + - $DATA/monica:/var/www/html/storage + restart: unless-stopped + networks: + - storage + - external + +networks: + external: + external: true + storage: + external: true diff --git a/bxl-shp/apps/docker-compose.vaultwarden.yaml b/bxl-shp/apps/docker-compose.vaultwarden.yaml new file mode 100644 index 0000000..bc0ac14 --- /dev/null +++ b/bxl-shp/apps/docker-compose.vaultwarden.yaml @@ -0,0 +1,34 @@ +services: + vaultwarden: + image: vaultwarden/server:1.26.0-alpine + container_name: vaultwarden + restart: unless-stopped + volumes: + - $DATA/vaultwarden:/data + environment: + - DATABASE_URL=${VAULT_DATABASE_URL} + - SIGNUPS_ALLOWED=false + - DOMAIN=https://vault.bhasher.com + - ADMIN_TOKEN=${VAULT_ADMIN} + - SMTP_HOST=bdubois.io + - SMTP_FROM=no-reply@bhasher.com + - SMTP_PORT=587 + - SMTP_SECURITY=starttls + - SMTP_USERNAME=${SMTP_USER} + - SMTP_PASSWORD=${SMTP_PASSWORD} + labels: + - "traefik.enable=true" + - "traefik.http.routers.vaultwarden.rule=Host(`vault.bhasher.com`)" + - "traefik.http.routers.vaultwarden.entrypoints=internalsecure" + - "traefik.http.services.vaultwarden.loadbalancer.server.port=80" + - "traefik.http.routers.vaultwarden.tls=true" + - "traefik.http.routers.vaultwarden.tls.certresolver=http" + networks: + - external + - storage + +networks: + external: + external: true + storage: + external: true diff --git a/bxl-shp/config/dashy/config.yml b/bxl-shp/config/dashy/config.yml index 324fb18..a6e8e0f 100644 --- a/bxl-shp/config/dashy/config.yml +++ b/bxl-shp/config/dashy/config.yml @@ -46,11 +46,6 @@ sections: url: https://element.bhasher.com statusCheckUrl: http://matrix-riot id: 4_1507_elementweb - - title: Shlink - icon: hl-shlink - url: https://shlink.bhasher.com - statusCheckUrl: https://shlink_ui - id: 5_1507_shlink - name: Private services displayData: sortBy: most-used @@ -118,25 +113,30 @@ sections: icon: hl-portainer url: https://portainer.vps.bhasher.com id: 11_1631_portainervps - - title: Portainer (LLN) - icon: hl-portainer - url: https://portainer.lln.bhasher.com - id: 12_1631_portainerlln - title: Home assistant icon: hl-home-assistant url: https://hass.bhasher.com statusCheckUrl: http://hass:8123 - id: 13_1631_homeassistant + id: 12_1631_homeassistant - title: Node-red icon: hl-node-red url: https://nodered.bhasher.com statusCheckUrl: http://nodered:1880 - id: 14_1631_nodered + id: 13_1631_nodered - title: Planka icon: hl-planka url: https://planka.bhasher.com statusCheckUrl: http://planka:1337 - id: 15_1631_planka + id: 14_1631_planka + - title: Monica + icon: hl-monica + url: https://monica.bhasher.com + statusCheck: true + id: 15_1631_monica + - title: Vaultwarden + icon: hl-vaultwarden + url: https://vault.bhasher.com + id: 16_1631_vaultwarden - name: System services displayData: sortBy: most-used