2023_07_14_1689360910

ComposeFiles/capybara.yml

@@ -151,6 +151,7 @@ services:
       - TZ=Etc/UTC
 #      - JELLYFIN_PublishedServerUrl=192.168.0.5 #optional
     volumes:
+      - /dev/dri:/dev/dri
       - /media/84ce114f-86be-490d-94d7-746dccf337d0/config:/config
       - /media/84ce114f-86be-490d-94d7-746dccf337d0/TV:/data/tvshows
       - /media/84ce114f-86be-490d-94d7-746dccf337d0/Movies:/data/movies

ComposeFiles/home.yml

@@ -51,6 +51,40 @@ services:
       placement:
         constraints: [ node.role == worker ]
 
+  nginx:
+    image: linuxserver/nginx:latest
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Etc/UTC
+    volumes:
+      - /home/user/docker-main/562_DtN/Data:/config
+    ports:
+      - 30562:80
+#      - 443:443
+    deploy:
+      replicas: 1
+      placement:
+        constraints: [ node.role == worker ]
+
+  traggo:
+    image: traggo/server:latest
+    ports:
+      - 30563:3030
+    environment:
+      TRAGGO_DEFAULT_USER_NAME: ${HOME_Traggo_def_user}
+      TRAGGO_DEFAULT_USER_PASS: ${HOME_Traggo_def_pass}
+    volumes:
+      - /home/user/docker-main/563_Traggo/Data:/opt/traggo/data
+    deploy:
+      replicas: 1
+      placement:
+        constraints: [ node.role == worker ]
+
+
+
+
+
 #  changedetection:
 #    image: linuxserver/changedetection.io:latest
 #    environment:

ComposeFiles/inters.yml

@@ -19,6 +19,8 @@ services:
       - "300:300"          # Syncthing
       - "331:331"          # Swarmpit
       - "335:335"          # Kanboard
+      - "336:336"          # Dokuwiki       < add
+      - "339:339"          # Ntfy
       - "500:500"          # Librespeed
       - "515:515"          # Searx
       - "520:520"          # Piwigo
@@ -29,6 +31,7 @@ services:
       - "555:555"          # Bazarr
       - "556:556"          # Ombi
       - "557:557"          # Jellyfin
+      - "562:562"          # DtN            < ADD
     volumes:
       - /home/user/docker-inters/000_NginxHA/Data:/config
     deploy:

ComposeFiles/marie.yml

@@ -103,6 +103,44 @@ services:
 
 
 
+  dokuwiki:
+    image: linuxserver/dokuwiki:latest
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Etc/UTC
+    volumes:
+      - /home/user/docker-main/336_DokuWiki/Data:/config
+    ports:
+      - 30336:80
+#      - 443:443 #optional
+    deploy:
+      replicas: 1
+      placement:
+        constraints: [ node.role == worker ]
+
+
+
+  ntfy:
+    image: binwiederhier/ntfy
+    command:
+      - serve
+    environment:
+      - TZ=UTC    # optional: Change to your desired timezone
+      - UID=1000
+      - GID=1000
+    volumes:
+      - /home/user/docker-main/339_Ntfy/Cache:/var/cache/ntfy
+      - /home/user/docker-main/339_Ntfy/Data:/etc/ntfy
+    ports:
+      - 30339:80
+    deploy:
+      replicas: 1
+      placement:
+        constraints: [ node.role == worker ]
+
+
+
 networks:
 #  host:
 #    external: true

ComposeFiles/tset.yml

@@ -3,23 +3,35 @@ version: '3.8'
 # sudo docker stack rm capybara && sudo docker stack deploy -c ComposeFiles/capybara.yml --prune=true capybara
 
 services:
-  gitqlient:
-    image: linuxserver/gitqlient:latest
-#    security_opt:
-#      - seccomp:unconfined #optional
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Etc/UTC
-#    volumes:
-#      - /path/to/config:/config
+#  whoami:
+#    image: traefik/whoami
+#    networks:
+#      - net
+#    ports:
+#      - "30050:80"
+#    deploy:
+#      replicas: 1
+#      placement:
+#        constraints: [ node.role == worker ]
+
+
+
+  traggo:
+    image: traggo/server:latest
     ports:
-      - 30048:9000
-      - 30049:3001
+      - 30563:3030
+    environment:
+      TRAGGO_DEFAULT_USER_NAME: ${HOME_Traggo_def_user}
+      TRAGGO_DEFAULT_USER_PASS: ${HOME_Traggo_def_pass}
+    volumes:
+      - /home/user/docker-main/563_Traggo/Data:/opt/traggo/data
     deploy:
       replicas: 1
       placement:
-        constraints: [ node.hostname == NURP-01 ]
+        constraints: [ node.role == worker ]
+
+
+
 
 
 

deploy.sh

@@ -1,7 +1,10 @@
 #!/bin/sh
 #sudo docker stack rm tset && sudo docker stack deploy -c ComposeFiles/tset.tml --prune=true tset
+
+
 docker stack rm $1
 
-export $(cat .env) > /dev/null 2>&1
-
-docker stack deploy -c ComposeFiles/$1.yml --prune=true $1
+if [[ "$2" != "stop" ]]; then
+	export $(cat .env) > /dev/null 2>&1
+	docker stack deploy -c ComposeFiles/$1.yml --prune=true $1
+fi

mapping.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+GRP=""
+ICOs=""
+
+XXX=1
+YYY=0
+
+
+for i in $(ls -1 ComposeFiles/); do
+	if [[ "$i" != "template.yml" ]]; then
+		if [[ "$i" != "tset.yml" ]]; then
+			echo "$i"
+#			cat "ComposeFiles/$i" | grep -Ev '(    .*|#|version:|services:|net*)' | sort | uniq
+			NAMES=$(cat "ComposeFiles/$i" | grep -Ev '(    .*|#|version:|services:|net*)' | sort | uniq | tr ':' ' ' | tr -d ' ' | tr '\n' ',' | sed 's/.$//g' | sed 's/^.//g')
+			for xena in $(echo "$NAMES" | tr ',' ' '); do
+				if [[ $(($YYY % 3)) == 0 ]]; then
+#					XXX=$(())
+					XXX=$(($XXX+1))
+				fi
+				ICOs="$ICOs"$(echo -e "\n  "$xena": {<<: *defaults, x: "$XXX", y: "$YYY", iconFill: green}")
+
+				YYY=$((YYY+1))
+			done
+			GRP="$GRP"$(echo -e "\n  - { <<: *group, name: "$i", members: ["$NAMES"] }")
+			echo -e "\n============="
+		fi
+	fi
+
+done
+
+
+
+GRPE="group: &group
+  - { color: \"white\", stroke: \"lightgrey\", fill: \"rgba(0, 0, 0, 0.3)\" }"
+
+
+
+echo -e "icons:$ICOs"
+echo -e "$GRPE\ngroups:$GRP"