Merge branch 'main' into dev

docker-compose.yml

@@ -10,8 +10,58 @@ networks:
     name: shoko
   arr:
     name: arr
+  bookstack:
+    name: bookstack
 
 services:
+  bookstack:
+    image: lscr.io/linuxserver/bookstack
+    container_name: bookstack
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=America/Chicago
+      - APP_URL=https://bookstack.mintyserver.net
+      - DB_HOST=bookstack_db
+      - DB_PORT=3306
+      - DB_USER=bookstack
+      - DB_PASS=${PASS}
+      - DB_DATABASE=bookstackapp
+    volumes:
+      - bookstack:/config
+      #ports:
+      #- 6875:80
+    restart: unless-stopped
+    depends_on:
+      - bookstack_db
+    networks:
+      - swag
+      - bookstack
+  
+  bookstack_db:
+    image: lscr.io/linuxserver/mariadb
+    container_name: bookstack_db
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=America/Chicago
+      - MYSQL_ROOT_PASSWORD=${PASS}
+      - MYSQL_DATABASE=bookstackapp
+      - MYSQL_USER=bookstack
+      - MYSQL_PASSWORD=${PASS}
+    volumes:
+      - bookstack_db:/config
+    restart: unless-stopped
+    networks:
+      - bookstack
+
+
+  maigret:
+    image: soxoj/maigret:latest
+    container_name: maigret
+    volumes:
+      - /mnt/nextcloud/poslop/Maigret:/app/reports
+
   gluetun:
     image: ghcr.io/qdm12/gluetun
     cap_add:
@@ -20,7 +70,7 @@ services:
     environment:
       - VPN_SERVICE_PROVIDER=mullvad
       - VPN_TYPE=wireguard
-      - WIREGUARD_PRIVATE_KEY=+Jm+OLkBDUag9JrezhsNJy59qzCECI9uHl0QQtneolw=
+      - WIREGUARD_PRIVATE_KEY=${MULLKEY}
       - WIREGUARD_ADDRESSES=10.64.21.169/32
       - SERVER_CITIES=Chicago IL
         #- LOG_LEVEL=debug
@@ -275,6 +325,7 @@ services:
    image: gitea/gitea:latest
    container_name: gitea
    environment:
+     - GITEA__service__DISABLE_REGISTRATION=true
      - USER_UID=1000
      - USER_GID=1000
    restart: always
@@ -408,3 +459,7 @@ volumes:
     name: firefox
   gluetun:
     name: gluetun
+  bookstack:
+    name: bookstack
+  bookstack_db:
+    name: booksstack_db