diff --git a/.gitignore b/.gitignore index ee2da4f..ce336fd 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,11 @@ Database/ Gitea/gitea/ Gitea/mysql/ -Minecraft/data +Minecraft/docker/ NginxReverseProxy/data/ NginxReverseProxy/letsencrypt +Prunemate/logs/ +Prunemate/config/ Scanopy/data JellyFin/Gluetun JellyFin/JellySeerr diff --git a/Minecraft/compose.yaml b/Minecraft/compose.yaml index 5148d3e..59b6841 100644 --- a/Minecraft/compose.yaml +++ b/Minecraft/compose.yaml @@ -1,12 +1,18 @@ services: - mc: - image: itzg/minecraft-server:latest - tty: true - stdin_open: true - ports: - - "25565:25565" - environment: - EULA: "TRUE" - MEMORY: "5120M" - volumes: - - "./data:/data" + crafty: + container_name: crafty_container + image: registry.gitlab.com/crafty-controller/crafty-4:latest + restart: always + environment: + - TZ=Etc/UTC + ports: + - "8443:8443" # HTTPS + - "8123:8123" # DYNMAP + - "19132:19132/udp" # BEDROCK + - "25500-25600:25500-25600" # MC SERV PORT RANGE + volumes: + - ./docker/backups:/crafty/backups + - ./docker/logs:/crafty/logs + - ./docker/servers:/crafty/servers + - ./docker/config:/crafty/app/config + - ./docker/import:/crafty/import \ No newline at end of file diff --git a/NginxReverseProxy/default.html b/NginxReverseProxy/default.html index 60af8d9..f6d0698 100644 --- a/NginxReverseProxy/default.html +++ b/NginxReverseProxy/default.html @@ -216,7 +216,8 @@ { ipAddress: "192.168.40.5", port: "81", name: "Nginx Reverse Proxy", description: "Provide site routing", site: "nginx", icon: "fa-solid fa-network-wired" }, { ipAddress: "192.168.40.5", port: "8080", name: "QBit Torrent", description: "Torrent client", site: "torrent", icon: "fa-solid fa-download" }, { ipAddress: "192.168.40.5", port: "7676", name: "PruneMate", description: "Clean up Docker data", site: "prune", icon: "fa-solid fa-trash" }, - { ipAddress: "192.168.40.5", port: "60072", name: "Scanopy", description: "Scan and organize your network", site: "scan", icon: "fa-solid fa-satellite-dish" } + { ipAddress: "192.168.40.5", port: "60072", name: "Scanopy", description: "Scan and organize your network", site: "scan", icon: "fa-solid fa-satellite-dish" }, + { ipAddress: "192.168.40.5", scheme: 'https://', port: "8443", name: "Minecraft", description: "Crafty Minecraft server admin", site: "minecraft", icon: "fa-solid fa-cubes" } ]; const buttonContainer = document.querySelector(".button-container"); @@ -237,7 +238,9 @@ tooltipContainer.className = "tooltip-container"; const link = document.createElement("a"); - const url = `http://${site.ipAddress}:${site.port}`; + const defaultScheme = "http://"; + let scheme = site.scheme || defaultScheme; + const url = `${scheme}${site.ipAddress}:${site.port}`; link.href = url; link.target = "_blank"; link.className = "link-button"; diff --git a/Prunemate/Makefile b/Prunemate/Makefile new file mode 100644 index 0000000..1b7cef7 --- /dev/null +++ b/Prunemate/Makefile @@ -0,0 +1,5 @@ +up: + docker-compose up -d + +down: + docker-compose down diff --git a/Prunemate/docker-compose.yml b/Prunemate/docker-compose.yml new file mode 100644 index 0000000..b1415b8 --- /dev/null +++ b/Prunemate/docker-compose.yml @@ -0,0 +1,19 @@ +services: + prunemate: + image: anoniemerd/prunemate:latest # Supports amd64 and arm64 + container_name: prunemate + + ports: + - "7676:8080" + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - ./logs:/var/log + - ./config:/config + environment: + - PRUNEMATE_TZ=Europe/London # Change this to your desired timezone + - PRUNEMATE_TIME_24H=true #false for 12-Hour format (AM/PM) + # Optional: Enable authentication (generate hash with: docker run --rm anoniemerd/prunemate python prunemate.py --gen-hash "password") + # - PRUNEMATE_AUTH_USER=admin + + # - PRUNEMATE_AUTH_PASSWORD_HASH=your_base64_encoded_hash_here + restart: unless-stopped