Merge pull request 'cleanup' (#7) from cleanup into main

Reviewed-on: #7

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "sites/rittenhop/content/themes/rh-theme-v1"]
+	path = sites/rittenhop/content/themes/rh-theme-v1
+	url = git@github.com:b7s9/rh-theme-v1.git

arr/docker-compose.yml

@@ -204,8 +204,8 @@ services:
       - TZ=Etc/UTC
       - DOCKER_MODS=linuxserver/mods:universal-calibre #optional
       - OAUTHLIB_RELAX_TOKEN_SCOPE=1 #optional
-      - VIRTUAL_HOST=calibre-web.${DOMAIN}
-      - LETSENCRYPT_HOST=calibre-web.${DOMAIN}
+      - VIRTUAL_HOST=books.${DOMAIN}
+      - LETSENCRYPT_HOST=books.${DOMAIN}
       - LETSENCRYPT_EMAIL=${EMAIL}
     volumes:
       - ${CONFIG_LOCATION}/calibre-web:/config

bluesky/docker-compose.yml

@@ -0,0 +1,20 @@
+services:
+  pds:
+    container_name: pds
+    image: ghcr.io/bluesky-social/pds:0.4
+    restart: unless-stopped
+    volumes:
+      - ./data:/pds
+    env_file:
+      - ./.env
+    environment:
+      - VIRTUAL_HOST=bluesky.${DOMAIN}
+      - VIRTUAL_PORT=3005
+      - LETSENCRYPT_HOST=bluesky.${DOMAIN}
+      - LETSENCRYPT_EMAIL=${EMAIL}
+    ports:
+      - 3005:3005
+networks:
+  default:
+    name: nginx-proxy
+    external: true

dashboard/docker-compose.yml

@@ -34,44 +34,6 @@ services:
       - 3001:3001
     volumes:
       - /:/mnt/host:ro
-  prometheus:
-    image: prom/prometheus
-    container_name: prometheus
-    user: '0'
-    command:
-      - '--config.file=/etc/prometheus/prometheus.yml'
-    ports:
-      - 9090:9090
-    restart: unless-stopped
-    volumes:
-      - ${CONFIG_LOCATION}/prometheus:/etc/prometheus
-      - ${DATA_LOCATION}/prometheus:/prometheus
-  node_exporter:
-    image: quay.io/prometheus/node-exporter:latest
-    container_name: node_exporter
-    command:
-      - '--path.rootfs=/host'
-    ports:
-      - 9100:9100
-    pid: host
-    restart: unless-stopped
-    volumes:
-      - '/:/host:ro,rslave'
-  grafana:
-    image: grafana/grafana-enterprise
-    container_name: grafana
-    restart: unless-stopped
-    user: '0'
-    environment:
-      - GF_SERVER_ROOT_URL=https://grafana.${DOMAIN}
-      - GF_INSTALL_PLUGINS=grafana-clock-panel
-      - VIRTUAL_HOST=grafana.${DOMAIN}
-      - LETSENCRYPT_HOST=grafana.${DOMAIN}
-      - LETSENCRYPT_EMAIL=${EMAIL}
-    volumes:
-      - ${CONFIG_LOCATION}/grafana:/var/lib/grafana
-    ports:
-     - '3003:3000'
 networks:
   default:
     name: nginx-proxy

docs/docker-compose.yml

@@ -6,14 +6,14 @@ services:
       - PUID=1000
       - PGID=1000
       - TZ=${TZ}
-      - APP_URL=https://wiki.${DOMAIN}
+      - APP_URL=https://docs.${DOMAIN}
       - DB_HOST=bookstack_db
       - DB_PORT=3306
       - DB_USER=bookstack
       - DB_PASS=${DBPASS}
       - DB_DATABASE=bookstackapp
-      - VIRTUAL_HOST=wiki.${DOMAIN}
-      - LETSENCRYPT_HOST=wiki.${DOMAIN}
+      - VIRTUAL_HOST=docs.${DOMAIN}
+      - LETSENCRYPT_HOST=docs.${DOMAIN}
       - LETSENCRYPT_EMAIL=${EMAIL}
     volumes:
       - ./config:/config

games/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   gamevault-backend:
-    image: phalcode/gamevault-backend:latest
+    image: phalcode/gamevault-backend:13.1.0
     restart: unless-stopped
     environment:
       - PUID=${UID}
@@ -17,7 +17,7 @@ services:
       # Mount the folder where your games are
       - ${DATA_LOCATION}:/files
       # Mount the folder where GameVault should store its images
-      - ${DATA_LOCATION}/images:/images
+      - ${DATA_LOCATION}/images:/media
     expose:
       - "8080"
     ports:

gitea/docker-compose.yml

@@ -11,7 +11,7 @@ services:
       - GITEA__database__USER=gitea
       - GITEA__database__PASSWD=${DBPASS}
       - VIRTUAL_HOST=git.${DOMAIN},git.${DOMAIN}
-      - VIRTUAL_PORT=3000
+      - VIRTUAL_PORT=3004
       - LETSENCRYPT_HOST=git.${DOMAIN},git.${DOMAIN}
       - LETSENCRYPT_EMAIL=${EMAIL}
     restart: always
@@ -21,10 +21,10 @@ services:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     ports:
-      - "3000:3000"
+      - "3004:3004"
       - "2222:2222"
     expose:
-      - "3000"
+      - "3004"
   db:
     image: postgres:14
     restart: always

kiwix/docker-compose.yml

@@ -0,0 +1,23 @@
+services:
+  kiwix-serve:
+      ports:
+        - 8082:8082
+      image: ghcr.io/kiwix/kiwix-serve:latest
+      # uncomment next 4 lines to use it with local zim file in /tmp/zim
+      volumes:
+        - /tank/storage/media/Cloud/Kiwix:/data
+      command:
+        - 'wikipedia_en_all_maxi_2024-01.zim'
+      # uncomment next 2 lines to use it with remote zim file
+      environment:
+        - PORT=8082
+        - VIRTUAL_HOST=wiki.${DOMAIN}
+        - VIRTUAL_PORT=8082
+        - LETSENCRYPT_HOST=wiki.${DOMAIN}
+        - LETSENCRYPT_EMAIL=${EMAIL}
+      expose:
+      - "8082"
+networks:
+  default:
+    name: nginx-proxy
+    external: true

monitoring/.env.example

@@ -0,0 +1,7 @@
+DOMAIN=example.com
+UID=1000
+GID=1000
+TZ=Etc/UTC
+CONFIG_LOCATION=./config
+DATA_LOCATION=./data
+EMAIL=example@mail.com

monitoring/.gitignore

@@ -0,0 +1 @@
+data/

monitoring/docker-compose.yml

@@ -0,0 +1,60 @@
+services:
+  cadvisor:
+    image: gcr.io/cadvisor/cadvisor:latest
+    container_name: cadvisor
+    privileged: true
+    restart: unless-stopped
+    volumes:
+      - /:/rootfs:ro
+      - /var/run:/var/run:rw
+      - /sys:/sys:ro
+      - /var/lib/docker/:/var/lib/docker:ro
+  prometheus:
+    image: prom/prometheus
+    container_name: prometheus
+    user: '0'
+    command:
+      - '--config.file=/etc/prometheus/prometheus.yml'
+    ports:
+      - 9090:9090
+    restart: unless-stopped
+    volumes:
+      - ${CONFIG_LOCATION}/prometheus:/etc/prometheus
+      - ${DATA_LOCATION}/prometheus:/prometheus
+  node-exporter:
+    image: quay.io/prometheus/node-exporter:latest
+    container_name: node-exporter
+    command:
+      - '--path.rootfs=/host'
+    ports:
+      - 9100:9100
+    pid: host
+    restart: unless-stopped
+    volumes:
+      - '/:/host:ro,rslave'
+  smartctl-exporter:
+    image: prometheuscommunity/smartctl-exporter
+    container_name: smartctl-exporter
+    privileged: true
+    user: root
+    ports:
+      - "9633:9633"
+  grafana:
+    image: grafana/grafana-enterprise
+    container_name: grafana
+    restart: unless-stopped
+    user: '0'
+    environment:
+      - GF_SERVER_ROOT_URL=https://grafana.${DOMAIN}
+      - GF_INSTALL_PLUGINS=grafana-clock-panel
+      - VIRTUAL_HOST=grafana.${DOMAIN}
+      - LETSENCRYPT_HOST=grafana.${DOMAIN}
+      - LETSENCRYPT_EMAIL=${EMAIL}
+    volumes:
+      - ${CONFIG_LOCATION}/grafana:/var/lib/grafana
+    ports:
+     - '3003:3000'
+networks:
+  default:
+    name: nginx-proxy
+    external: true

nginx-proxy/client_max_body_size.conf

@@ -1 +0,0 @@
-client_max_body_size 100000m;

nginx-proxy/docker-compose.yml

@@ -10,7 +10,8 @@ services:
       - ./nginx/certs:/etc/nginx/certs
       - ./nginx/html:/usr/share/nginx/html
       - ./nginx/vhost.d:/etc/nginx/vhost.d
-      - ./client_max_body_size.conf:/etc/nginx/conf.d/client_max_body_size.conf:ro
+      - ./settings.conf:/etc/nginx/conf.d/settings.conf:ro
+      # - ./keepalive_requests.conf:/etc/nginx/conf.d/keepalive_requests.conf:ro
   nginx-letsencrypt:
     image: jrcs/letsencrypt-nginx-proxy-companion
     container_name: nginx-letsencrypt

nginx-proxy/settings.conf

@@ -0,0 +1,2 @@
+client_max_body_size 100000m;
+keepalive_requests 1000000;

restart_all.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# cd nginx-proxy
+# sudo docker compose restart
+cd ../arr
+sudo docker compose restart
+cd ../dashboard
+sudo docker compose restart
+cd ../games 
+sudo docker compose restart
+cd ../gita 
+sudo docker compose restart
+cd ../lazylibrarian 
+sudo docker compose restart
+cd ../nextcloud 
+sudo docker compose restart
+cd ../plex 
+sudo docker compose restart
+cd ../readers 
+sudo docker compose restart
+cd ../recipes
+sudo docker compose restart
+cd ../rss-reader 
+sudo docker compose restart
+cd ../sites
+cd botc
+sudo docker compose restart
+cd ../fusiondance
+sudo docker compose restart
+cd ../gamesclub
+sudo docker compose restart
+cd ../photos
+sudo docker compose restart
+cd ..
+cd ../stats
+sudo docker compose restart
+cd ../vnc
+sudo docker compose restart
+cd ../wiki
+sudo docker compose restart

sites/analytics/.env.example

@@ -0,0 +1,12 @@
+EMAIL=example@gmail.com
+DOMAIN=example.com
+
+DATABASE_URL=postgresql://umami_user:umami_pass@db:5432/umami_db
+DATABASE_TYPE=postgresql
+HASH_SALT=generate_a_random_salt
+
+POSTGRES_DB=umami_db
+POSTGRES_USER=umami_user
+POSTGRES_PASSWORD=umami_pass
+
+APP_SECRET=random-string

sites/analytics/docker-compose.yml

@@ -0,0 +1,33 @@
+services:
+  umami:
+    image: ghcr.io/umami-software/umami:postgresql-latest
+    env_file: .env
+    environment:
+      TRACKER_SCRIPT_NAME: getinfo
+      API_COLLECT_ENDPOINT: all
+      VIRTUAL_HOST: "analytics.${DOMAIN}"
+      VIRTUAL_PORT: 3000
+      CLIENT_IP_HEADER: x-real-ip
+      # HOSTNAME: "analytics.${DOMAIN}"
+      # PORT: 3004
+      # FORCE_SSL: 0
+      LETSENCRYPT_HOST: "analytics.${DOMAIN}"
+      LETSENCRYPT_EMAIL: ${EMAIL}
+    depends_on:
+      - db
+    restart: always
+    ports:
+      - 3000:3000
+    expose:
+      - 3000
+  db:
+    container_name: umami-db
+    image: postgres:15-alpine
+    env_file: .env
+    volumes:
+      - ./data:/var/lib/postgresql/data
+    restart: always
+networks:
+  default:
+    name: nginx-proxy
+    external: true

sites/botc/config.production.json.sendgrid

@@ -0,0 +1,30 @@
+{
+  "url": "http://localhost:2371",
+  "server": {
+    "port": 2371,
+    "host": "::"
+  },
+  "mail": {
+    "transport": "SMTP",
+    "options": {
+        "service": "Sendgrid",
+        "host": "smtp.sendgrid.net",
+        "port": 587,
+        "secure": true,
+        "auth": {
+            "user": "apikey",
+            "pass": "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"
+          }
+    }
+  },
+  "logging": {
+    "transports": [
+      "file",
+      "stdout"
+    ]
+  },
+  "process": "systemd",
+  "paths": {
+    "contentPath": "/var/lib/ghost/content"
+  }
+}

sites/fusiondance/update.sh

@@ -0,0 +1 @@
+sudo docker cp config.production.json fusiondance-ghost-1:/var/lib/ghost/.

stats/docker-compose.yml

@@ -39,6 +39,7 @@ services:
     ports:
       - 4018:3000
     environment:
+      JAVA_OPTS: "-Xmx1g" #-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/path/to/directory
       MB_DB_TYPE: postgres
       MB_DB_DBNAME: ${PGDATABASE:-postgres}
       MB_DB_PORT: 5432