Update grafana and minecraft

grafana/docker-compose.yml.blanked

@@ -1,8 +1,7 @@
-version: "3"
-
 networks:
   grafana-network:
     driver: bridge
+    name: grafana
   traefik:
     external: true
   minecraft:
@@ -14,14 +13,14 @@ volumes:
 services:
   grafana:
     image: grafana/grafana
-    user: "[USER_ID]"
+    user: "USER:GROUP"
     container_name: grafana
     restart: unless-stopped
     networks:
       - grafana-network
       - traefik
     volumes:
-      - ./olomana.ini:/etc/grafana/grafana.ini
+      - ./grafana.ini:/etc/grafana/grafana.ini
       - /pwspool/software/grafana:/var/lib/grafana
     labels:
       - traefik.http.routers.grafana.rule=Host(`SITE_URL`)
@@ -35,7 +34,7 @@ services:
   node_exporter:
     image: quay.io/prometheus/node-exporter:latest
     container_name: node_exporter
-    user: "[USER_ID]:[GROUP_ID]"
+    user: "USER:GROUP"
     restart: unless-stopped
     networks:
       - grafana-network
@@ -62,3 +61,4 @@ services:
       - "--storage.tsdb.path=/prometheus"
       - "--web.console.libraries=/usr/share/prometheus/console_libraries"
       - "--web.console.templates=/usr/share/prometheus/consoles"
+

minecraft/docker-compose.yml.blanked

@@ -3,6 +3,7 @@ version: "3"
 networks:
   minecraft:
     driver: bridge
+    name: minecraft
   grafana:
     external: true
   traefik:

nordvpn/.gitignore

@@ -1,3 +0,0 @@
-docker-compose.yml
-plugins/
-

nordvpn/README.md

@@ -1,13 +0,0 @@
-# NordVPN
-
-## Instructions
-
-### Files
-Create `nordvpn/token.txt` with NordVPN token which is generated from NordVPN website.
-
-### Notes
-Can use either nordlynx or nordvpn in nordlynx configuration.
-
-## References
-https://github.com/bubuntux/nordvpn  
-https://github.com/bubuntux/nordlynx

nordvpn/docker-compose.yml.NORDLYNX

@@ -1,38 +0,0 @@
-version: "3"
-
-services:
-  nordlynx:
-    image: ghcr.io/bubuntux/nordlynx:latest
-    container_name: nordlynx
-    restart: unless-stopped
-    cap_add:
-      - NET_ADMIN
-    environment:
-      - TOKEN=e9f2ab4999032b61f29845afdc0067aa389827546411b4891ff0ec4368ab6cc1
-      - PRIVATE_KEY=mDnVa4EMbnlSF8Sg/i657hf+NRyWQxQjKTwkImD/HWE=
-      - NET_LOCAL=192.168.1.0/24
-      - TZ=America/Los_Angeles
-      - QUERY=filters\[country_id\]=202
-    ports:
-      - "8888:8888"
-    labels:
-      - traefik.enable=false
-
-  qb:
-    image: ghcr.io/linuxserver/qbittorrent:latest
-    container_name: qb
-    restart: unless-stopped
-    network_mode: service:nordlynx
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - WEBUI_PORT=8888
-    volumes:
-      - /data/write/qb/appdata/config:/config
-      - /data/write/qb/downloads:/downloads
-      - ./plugins:/plugins
-    depends_on:
-      - nordlynx
-    labels:
-      - traefik.enable=false
-

nordvpn/docker-compose.yml.blanked

@@ -1,33 +0,0 @@
-version: "3"
-
-services:
-  nordlynx:
-    image: ghcr.io/bubuntux/nordlynx
-    container_name: nordlynx
-    restart: unless-stopped
-    cap_add:
-      - NET_ADMIN
-    environment:
-      - PRIVATE_KEY=[PRIVATE_KEY]
-      - NET_LOCAL=192.168.1.0/24
-      - TZ=America/Los_Angeles
-      - QUERY=filters\[country_id\]=202
-    ports:
-      - "[HOST_URL]:8888"
-    labels:
-      - traefik.enable=false
-
-  qb:
-    image: ghcr.io/linuxserver/qbittorrent:latest
-    container_name: qb
-    restart: unless-stopped
-    network_mode: service:nordlynx
-    environment:
-      - WEBUI_PORT=[HOST_URL]
-    volumes:
-      - /data/write/qb/appdata/config:/config
-      - /data/write/qb/downloads:/downloads
-    depends_on:
-      - nordlynx
-    labels:
-      - traefik.enable=false