Tailscale app

.gitignore

@@ -13,4 +13,10 @@ state/*
 tipi.config.json
 
 # Commit empty directories
-!nignx/.gitkeep
+!nignx/.gitkeep
+
+media/data/movies/*
+!media/data/movies/.gitkeep
+
+media/torrents/*
+!media/torrents/.gitkeep

ansible/templates/avahi/tipi.service

@@ -7,10 +7,10 @@
     <port>80</port>
   </service>
 </service-group>
-<service-group>
+<!-- <service-group>
   <name replace-wildcards="yes">%h</name>
   <service>
     <type>_http._tcp</type>
     <port>443</port>
   </service>
-</service-group>
+</service-group> -->

apps/filerun/docker-compose.yml

@@ -1,6 +1,7 @@
 services:
   filerun-db:
     container_name: filerun-db
+    user: 1000:1000
     image: mariadb:10.1
     environment:
       MYSQL_ROOT_PASSWORD: tipi
@@ -21,8 +22,8 @@ services:
       FR_DB_NAME: tipi
       FR_DB_USER: tipi
       FR_DB_PASS: tipi
-      APACHE_RUN_USER: ${PUID}
-      APACHE_RUN_GROUP: ${PGID}
+      APACHE_RUN_USER: 1000
+      APACHE_RUN_GROUP: 1000
       APACHE_RUN_USER_ID: 33
       APACHE_RUN_GROUP_ID: 33
     depends_on:
@@ -32,7 +33,6 @@ services:
     ports:
       - ${APP_PORT}:80
     volumes:
-      - ${APP_DATA_DIR}/data/html:/var/www/html
-      - ${ROOT_FOLDER}/app-data:/user-files
+      - ${ROOT_FOLDER}/app-data/medias:/user-files
     networks:
       - tipi_main_network

apps/jellyfin/docker-compose.yml

@@ -6,7 +6,7 @@ services:
     container_name: jellyfin
     volumes:
       - ${APP_DATA_DIR}/data/config:/config
-      - ${APP_DATA_DIR}/data/media:/data/media
+      - ${ROOT_FOLDER}/media/data/movies:/data/media
     environment:
       - PUID=1000
       - PGID=1000

apps/radarr/docker-compose.yml

@@ -9,8 +9,8 @@ services:
       - TZ=${TZ}
       - AUTO_UPDATE=true
     volumes:
-      - ${APP_DATA_DIR}/data/config:/config
-      - ${APP_DATA_DIR}/data/downloads:/downloads
+      - ${APP_DATA_DIR}/data/jackett:/config
+      - ${ROOT_FOLDER}/media/torrents:/downloads
     ports:
       - 9117:9117
     restart: unless-stopped
@@ -25,9 +25,9 @@ services:
       - PGID=1000
       - TZ=${TZ}
     volumes:
-      - ${APP_DATA_DIR}/data/config:/config
-      - ${APP_DATA_DIR}/data/movies:/movies #optional
-      - ${ROOT_FOLDER}/app-data/${TORRENT_CLIENT}/data/downloads:/downloads #optional
+      - ${APP_DATA_DIR}/data/radarr:/config
+      - ${ROOT_FOLDER}/media/data/movies:/movies #optional
+      - ${ROOT_FOLDER}/media/torrents:/downloads #optional
     ports:
       - ${APP_PORT}:7878
     restart: unless-stopped

apps/transmission/docker-compose.yml

@@ -14,8 +14,7 @@ services:
       # - HOST_WHITELIST=dnsnane list #optional
     volumes:
       - ${APP_DATA_DIR}/data/config:/config
-      - ${APP_DATA_DIR}/data/downloads:/downloads
-      - ${APP_DATA_DIR}/data/watch:/watch
+      - ${ROOT_FOLDER}/media/torrents:/downloads
     ports:
       - ${APP_PORT}:9091
       - 51413:51413

docker-compose.yml

@@ -1,39 +1,19 @@
 version: "3.7"
 
 services:
-  # gluetun:
-  #   container_name: gluetun
-  #   image: qmcgaw/gluetun
-  #   cap_add:
-  #     - NET_ADMIN
-  #   environment:
-  #     - VPN_SERVICE_PROVIDER=mullvad
-  #     - VPN_TYPE=wireguard
-  #     - WIREGUARD_PRIVATE_KEY=${WIREGUARD_PRIVATE_KEY}
-  #     - WIREGUARD_ADDRESSES=${WIREGUARD_ADDRESSES}
-  #     - SERVER_COUNTRIES=Switzerland
-  #     - OWNED_ONLY=yes
-  #   ports:
-  #     - 80:80
-  #     - 8080:8080
-  #   networks:
-  #     - tipi_main_network
-
-  # reverse-proxy:
-  #   container_name: reverse-proxy
-  #   image: traefik:v2.6
-  #   restart: always
-  #   ports:
-  #     - 80:80
-  #     - 443:443
-  #     - 8080:8080
-  #   security_opt:
-  #     - no-new-privileges:true
-  #   volumes:
-  #     - /var/run/docker.sock:/var/run/docker.sock:ro
-  #     - ${PWD}/traefik:/root/.config
-  #   networks:
-  #     - tipi_main_network
+  reverse-proxy:
+    container_name: reverse-proxy
+    image: traefik:v2.6
+    restart: always
+    ports:
+      - 80:80
+      - 8080:8080
+    command: --api.insecure=true --providers.docker
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - ${PWD}/traefik:/root/.config
+    networks:
+      - tipi_main_network
 
   dashboard:
     build:
@@ -48,13 +28,12 @@ services:
       - 3000:3000
     networks:
       - tipi_main_network
-    # labels:
-    #   traefik.enable: true
-    #   traefik.http.routers.dashboard.rule: Host(`tipi.local`)
-    #   # traefik.http.routers.dashboard.tls: true
-    #   traefik.http.routers.dashboard.entrypoints: webinsecure
-    #   traefik.http.routers.dashboard.service: dashboard
-    #   traefik.http.services.dashboard.loadbalancer.server.port: 3000
+    labels:
+      traefik.enable: true
+      traefik.http.routers.dashboard.rule: PathPrefix("/") # Host(`tipi.local`) &&
+      traefik.http.routers.dashboard.entrypoints: webinsecure
+      traefik.http.routers.dashboard.service: dashboard
+      traefik.http.services.dashboard.loadbalancer.server.port: 3000
 
 networks:
   tipi_main_network:

scripts/start.sh

@@ -106,7 +106,7 @@ cat << "EOF"
            ()`     
 EOF
 echo ""
-echo "Visit http://${INTERNAL_IP}:3000 to view the dashboard"
+echo "Visit http://${INTERNAL_IP}/ to view the dashboard"
 echo ""
 
 

traefik/traefik.yml

@@ -2,7 +2,6 @@ api:
   dashboard: true
   insecure: true
 
-
 providers:
   docker:
     endpoint: "unix:///var/run/docker.sock"
@@ -23,8 +22,8 @@ entryPoints:
     #     entryPoint:
     #       to: websecure
     #       scheme: https
-  websecure:
-    address: ":443"
+  # websecure:
+  #   address: ":443"
 
 log:
   level: DEBUG