6 Commits

Author SHA1 Message Date
Bensuperpc cd2862a358 Update infra
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2023-04-16 23:43:40 +02:00
Bensuperpc 13c2b7df19 Update nginx config
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2023-04-16 12:56:07 +02:00
Bensuperpc 20fe33f7d5 Update nginx
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2023-04-16 00:43:35 +02:00
Bensuperpc c2f8075fd7 Revert "Update with caddy instead nginx"
This reverts commit c07c16f2d7.
2023-04-15 20:41:28 +02:00
Bensuperpc b13654df15 Revert "Update caddy"
This reverts commit 951e5b2956.
2023-04-15 20:41:21 +02:00
Bensuperpc 66b014c076 Revert "Update Caddy"
This reverts commit 1e912164a6.
2023-04-15 20:41:16 +02:00
162 changed files with 1014 additions and 3667 deletions
-1
View File
@@ -1 +0,0 @@
github: bensuperpc
-38
View File
@@ -1,38 +0,0 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''
---
**Describe the bug**
A clear and concise description of what the bug is.
**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
**Expected behavior**
A clear and concise description of what you expected to happen.
**Screenshots**
If applicable, add screenshots to help explain your problem.
**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]
**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]
**Additional context**
Add any other context about the problem here.
-10
View File
@@ -1,10 +0,0 @@
---
name: Custom issue template
about: Describe this issue template's purpose here.
title: ''
labels: ''
assignees: ''
---
-20
View File
@@ -1,20 +0,0 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''
---
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
**Additional context**
Add any other context or screenshots about the feature request here.
-6
View File
@@ -1,6 +0,0 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
-48
View File
@@ -1,48 +0,0 @@
name: infrastructure
on:
push:
branches:
- "main"
- "master"
- "dev"
paths-ignore:
- "**/README.md"
pull_request:
branches:
- "*"
schedule:
- cron: "0 9 * * 2" # every tuesday at 9:00 https://crontab.guru/#0_7_*_*_1
workflow_dispatch:
jobs:
image:
name: infrastructure
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- name: "Checkout Code"
uses: actions/checkout@v5
with:
submodules: "recursive"
fetch-depth: 0
- name: "Check compose"
run: make check
- name: "Update server image"
run: make image-update
- name: "Build server"
run: make build
# - name: "Start server"
# run: make start
- name: "Logs server"
run: make logs
- name: "State server"
run: make state
- name: "Stop server"
run: make stop
- name: "Down server"
run: make down
- name: "Clean server"
run: make clean
- name: "Purge server"
run: make purge
-31
View File
@@ -1,31 +0,0 @@
name: submodule-update
on:
schedule:
- cron: '0 */8 * * *'
workflow_dispatch:
jobs:
image:
name: submodule-update
runs-on: ubuntu-latest
steps:
- name: "Checkout Code"
uses: actions/checkout@v5
with:
token: ${{ secrets.CI_TOKEN }}
repository: ${{ github.repository }}
submodules: 'recursive'
fetch-depth: 1
# Update references
- name: Git Sumbodule Update
run: |
git pull --recurse-submodules
git submodule update --remote --recursive
# Commit and push
- name: Commit update
run: |
git config --global user.name 'Bensuperpc'
git config --global user.email 'bensuperpc@gmail.com'
git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
git commit -am "Auto updated submodule references" && git push || echo "No changes to commit"
+2 -2
View File
@@ -1,2 +1,2 @@
*.env
/*.tar.gz **/*.env
-77
View File
@@ -1,77 +0,0 @@
#//////////////////////////////////////////////////////////////
#// //
#// docker-multimedia, 2024 //
#// Created: 30, May, 2021 //
#// Modified: 14 November, 2024 //
#// file: - //
#// - //
#// Source: //
#// OS: ALL //
#// CPU: ALL //
#// //
#//////////////////////////////////////////////////////////////
PROJECT_DIRECTORY ?= infrastructure
DOCKER_EXEC ?= docker
CONFIG_DIRECTORY ?= presets
CONFIG_FILES ?= $(addprefix $(CONFIG_DIRECTORY)/,$(addsuffix .conf,$(CONFIGS)))
include $(CONFIG_FILES)
DOCKER_PROFILES ?=
EXTRA_PROFILES ?=
PROFILE_CMD ?= $(addprefix --profile ,$(DOCKER_PROFILES) $(EXTRA_PROFILES))
COMPOSE_FILES ?= $(shell find ./$(PROJECT_DIRECTORY) -maxdepth 1 -name 'docker-compose*.yml' -type f | sed -e 's/^/--file /')
COMPOSE_DIR ?= --project-directory ./$(PROJECT_DIRECTORY)
UID ?= 1000
GID ?= 1000
ENV_ARG_VAR ?= PUID=$(UID) PGID=$(GID)
DOCKER_COMPOSE_COMMAND ?= $(ENV_ARG_VAR) $(DOCKER_EXEC) compose $(COMPOSE_DIR) $(COMPOSE_FILES) $(PROFILE_CMD)
.PHONY: build all
all: start
GENERIC_TARGETS := build down up run config logs pull images start restart stop
.PHONY: $(GENERIC_TARGETS)
$(GENERIC_TARGETS):
$(DOCKER_COMPOSE_COMMAND) $@
.PHONY: start-detached
start-detached:
$(DOCKER_COMPOSE_COMMAND) up -d
.PHONY: no-start
no-start:
$(DOCKER_COMPOSE_COMMAND) up --no-start
.PHONY: state
state:
$(DOCKER_COMPOSE_COMMAND) ps
$(DOCKER_COMPOSE_COMMAND) top
.PHONY: volumes
volumes:
$(DOCKER_COMPOSE_COMMAND) config --volumes
.PHONY: git-update
git-update:
# git submodule update --init --recursive --remote
git pull --recurse-submodules --all --progress
.PHONY: update
update: image-update git-update
.PHONY: clean
clean:
docker system prune -f
.PHONY: purge
purge:
$(ENV_ARG_VAR) $(DOCKER_EXEC) compose $(COMPOSE_DIR) $(COMPOSE_FILES) down -v --rmi all
+66 -17
View File
@@ -1,8 +1,15 @@
#////////////////////////////////////////////////////////////// #//////////////////////////////////////////////////////////////
#// ____ //
#// | __ ) ___ _ __ ___ _ _ _ __ ___ _ __ _ __ ___ //
#// | _ \ / _ \ '_ \/ __| | | | '_ \ / _ \ '__| '_ \ / __| //
#// | |_) | __/ | | \__ \ |_| | |_) | __/ | | |_) | (__ //
#// |____/ \___|_| |_|___/\__,_| .__/ \___|_| | .__/ \___| //
#// |_| |_| //
#//////////////////////////////////////////////////////////////
#// // #// //
#// Script, 2022 // #// Script, 2022 //
#// Created: 14, April, 2022 // #// Created: 14, April, 2022 //
#// Modified: 30, November, 2024 // #// Modified: 17, March, 2023 //
#// file: - // #// file: - //
#// - // #// - //
#// Source: // #// Source: //
@@ -11,21 +18,63 @@
#// // #// //
#////////////////////////////////////////////////////////////// #//////////////////////////////////////////////////////////////
#ADMIN_SERVICES := openssh DOCKER := docker
# uptime-kuma
#BLOG_SERVICES := wordpress
#IA_SERVICES := open-webui
#SHARING_SERVICES := privatebin
# jellyfin
# psitransfer picoshare projectsend dufs syncthing
#UTILS_SERVICES := it-tools omni-tools cyberchef
# homepage
# stirlingpdf
PROJECT_DIRECTORY := infrastructure PROFILES := wp_db wordpress webserver certbot phpmyadmin qbittorrent jellyfin
CONFIG_DIRECTORY := presets PROFILE_CMD := $(addprefix --profile ,$(PROFILES))
# 7dtd minecraft satisfactory
CONFIGS := minecraft
#DOCKER_PROFILES :=
include DockerCompose.mk
COMPOSE_FILES := $(shell find docker-compose* | sed -e 's/^/--file /')
AUTHOR := bensuperpc
.PHONY: build all
all: start
.PHONY: build
build:
docker compose $(COMPOSE_FILES) $(PROFILE_CMD) build
.PHONY: start
start:
docker compose $(COMPOSE_FILES) $(PROFILE_CMD) up -d
.PHONY: start-at
start-at:
docker compose $(COMPOSE_FILES) $(PROFILE_CMD) up
.PHONY: docker-check
docker-check:
docker compose $(COMPOSE_FILES) $(PROFILES_CMD) config
.PHONY: stop
stop: down
.PHONY: down
down:
docker compose $(COMPOSE_FILES) $(PROFILE_CMD) down
.PHONY: restart
restart: stop start
.PHONY: logs
logs:
docker compose $(COMPOSE_FILES) logs
.PHONY: state
state:
docker compose $(COMPOSE_FILES) ps
docker compose $(COMPOSE_FILES) top
.PHONY: update
update:
git pull --recurse-submodules --all --progress
docker compose $(COMPOSE_FILES) $(PROFILES_CMD) pull
.PHONY: clean
clean:
$(DOCKER) images --filter=reference='bensuperpc/*' --format='{{.Repository}}:{{.Tag}}' | xargs -r $(DOCKER) rmi -f
.PHONY: purge
purge:
docker compose $(COMPOSE_FILES) $(PROFILE_CMD) down -v --rmi all
+85 -264
View File
@@ -1,41 +1,31 @@
# Infrastructure # Infrastructure
_Open source, decentralized and self-hosted infrastructure for many services._ _My personal infrastructure for my servers and services._
## About ## About
It uses caddy and docker-compose to run my services (And many other things). This is my infrastructure. It's a collection of scripts and configuration files that I use to manage my servers and services.
It uses Nginx and docker-compose to run my services (And many other things).
It's a **work in progress**, and I'm still learning a lot about it. It's a **work in progress**, and I'm still learning a lot about it.
If you have any **questions** or **suggestions**, feel free to open an issue or a pull request. If you have any **questions** or **suggestions**, feel free to open an issue or a pull request.
## Features ## Features
- [x] caddy 2 HTTP/S reverse proxy - [x] Nginx reverse proxy
- [x] Docker / docker-compose - [x] Docker / docker-compose
- [x] Wordpress (Via FASTCGI/caddy) - [x] Letsencrypt / Certbot
- [x] Jellyfin (Media server) - [x] Wordpress (Via FASTCGI/NGINX)
- [x] Forgejo (Git server, fork of Gitea) - [x] PHPMyAdmin (MariaDB)
- [x] Uptime Kuma (Monitoring) - [x] PGAdmin (PostgreSQL)
- [x] qbittorrent and transmission (Torrent client/server) - [x] Qbittorrent
- [x] SyncThing (File synchronization) - [x] Jellyfin
- [x] PsiTransfer, ProjectSend, Picoshare (File sharing) - [ ] Gitea
- [x] it-tools and omni-tools (Tools for IT) - [ ] Mastodon
- [x] Open-WebUI (Local chatGPT) - [ ] Minecraft server (Hyperworld v2)
- [x] Privatebin (Pastebin) - [ ] SSL for all subdomains / Services (Not just the main domain)
- [X] [Satisfactory](https://github.com/bensuperpc/docker-satisfactory)
- [x] [7 days to die](https://github.com/bensuperpc/docker-7daystodie)
- [x] [minecraft](https://github.com/bensuperpc/docker-minecraft-server)
## Architecture
![Architecture](ressources/arch_infra.png)
## Screenshots ## Screenshots
The homepage is a dashboard with many widgets and services.
![Homepage](ressources/homepagev1.jpg)
## Installation and configuration ## Installation and configuration
### Requirements ### Requirements
@@ -44,25 +34,7 @@ The homepage is a dashboard with many widgets and services.
- [Docker Compose](https://docs.docker.com/compose/install/) - [Docker Compose](https://docs.docker.com/compose/install/)
- [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) - [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
- [Web domain](https://www.ovh.com/world/domains/) (I use OVH) - [Web domain](https://www.ovh.com/world/domains/) (I use OVH)
- [Open port 80, 443, 22, 2222 and 5555 on your router](http://192.168.1.1/) - [Open port 80 and 443 on your router](http://192.168.0.1/) (I use a Orange box with default IP)
- For games server, you need to open these ports (7777, 25565, 26900, 26901, 26903)
List of ports used by the services in this infrastructure:
| Port number | Service | Description |
| ----------- | ------------- | ----------------- |
| 80 | Caddy | HTTP traffic |
| 443 | Caddy | HTTPS traffic |
| 22 | Forgejo | Git/SSH access |
| 2222 | OpenSSH | Global SSH access |
| 7777 | Satisfactory | Game server port |
| 25565 | Minecraft | Game server port |
| 26900 | 7 Days to Die | Game server port |
| 26901 | 7 Days to Die | Game server port |
| 26903 | 7 Days to Die | Game server port |
**To avoid get rate limit from letsencrypt (10 certificates per 3 hours), you need to disable some certificates in the caddyfiles and enable them 3h later...**
### Clone ### Clone
@@ -78,158 +50,105 @@ Go to the folder
cd infrastructure cd infrastructure
``` ```
Change services you want to enable in the [Makefile](Makefile) file, by default all services are enabled (games servers included). ### Get the SSL certificate
### Configure the domain For all **bensuperpc.org**, you need to replace it with your domain, example: **bensuperpc.com**
For all **bensuperpc.org**, you need to replace it with your domain, example: **mydomain.com**, so the same for **bensuperpc.com** ect...
```sh ```sh
find . \( -type d -name .git -prune \) -o -type f -print0 | xargs -0 sed -i 's/bensuperpc.org/mydomain.com/g' find . \( -type d -name .git -prune \) -o -type f -print0 | xargs -0 sed -i 's/bensuperpc.org/bensuperpc.com/g'
``` ```
Check if all bensuperpc.* are replaced by your domain in [Caddyfile](caddy/services/wordpress/Caddyfile) Keep original config file
And then, caddy will generate the certificate for you and renew it automatically :D
| Domain name | Type | Description |
| ------------------------------------------------------------------ | ---- | ------------------------------------------------------------ |
| [bensuperpc.org](https://bensuperpc.org) | Main | Redirect to [www.bensuperpc.org](https://www.bensuperpc.org) |
| [www.bensuperpc.org](https://www.bensuperpc.org) | Main | Homepage |
| [open-webui.bensuperpc.org](https://open-webui.bensuperpc.org) | Sub | For local chatGPT |
| [wordpress.bensuperpc.org](https://wordpress.bensuperpc.org) | Sub | Wordpress website |
| [uptimekuma.bensuperpc.org](https://uptimekuma.bensuperpc.org) | Sub | Uptime Kuma for monitoring |
| [qbittorrent.bensuperpc.org](https://qbittorrent.bensuperpc.org) | Sub | Torrent client/server |
| [transmission.bensuperpc.org](https://transmission.bensuperpc.org) | Sub | Torrent client/server |
| [forgejo.bensuperpc.org](https://forgejo.bensuperpc.org/) | Sub | Fork of Gitea for git |
| [git.bensuperpc.org](https://git.bensuperpc.org) | Sub | Fork of Gitea for git |
| [link.bensuperpc.org](https://link.bensuperpc.org) | Sub | For link shortener |
| [jellyfin.bensuperpc.org](https://jellyfin.bensuperpc.org) | Sub | Jellyfin for media server |
| [syncthing.bensuperpc.org](https://syncthing.bensuperpc.org) | Sub | SyncThing for file synchronization |
| [psitransfer.bensuperpc.org](https://psitransfer.bensuperpc.org) | Sub | PsiTransfer for file sharing |
| [it-tools.bensuperpc.org](https://it-tools.bensuperpc.org) | Sub | Tools for IT |
| [omni-tools.bensuperpc.org](https://omni-tools.bensuperpc.org) | Sub | Tools for IT |
| [privatebin.bensuperpc.org](https://privatebin.bensuperpc.org) | Sub | Pastebin |
| [projectsend.bensuperpc.org](https://projectsend.bensuperpc.org) | Sub | ProjectSend for file sharing |
| [picoshare.bensuperpc.org](https://picoshare.bensuperpc.org) | Sub | Picoshare for file sharing |
| [dufs.bensuperpc.org](https://dufs.bensuperpc.org) | Sub | Dufs for file sharing |
| [memos.bensuperpc.org](https://memos.bensuperpc.org) | Sub | Caddy for file sharing |
| [stirlingpdf.bensuperpc.org](https://stirlingpdf.bensuperpc.org) | Sub | Stirling PDF tools |
### Configure the infrastructure
You need to configure the infrastructure with your own configuration.
You can generate a password with 32 characters:
```sh ```sh
openssl rand -base64 32 cp -r nginx/conf.d nginx/conf.d-original
``` ```
Or online: [passwordsgenerator.net](https://passwordsgenerator.net/) Remove the old config file
#### Caddy
For [caddy_backup.env](infrastructure/services/caddy/env/caddy_backup.env) file, you need to change the password(s) for the restic backup.
```sh ```sh
RESTIC_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ rm -fr nginx/nginx-conf
``` ```
#### Wordpress Copy _nginx-conf-cert_ to _nginx-conf_, for temporary use to get the SSL certificate
For the [wordpress.env](infrastructure/services/wordpress/env/wordpress.env) file, you need to change the password and user for the database.
```sh ```sh
WORDPRESS_DB_USER=bensuperpc cp -r nginx/conf.d-cert nginx/conf.d
WORDPRESS_DB_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw
``` ```
For [wordpress_db.env](infrastructure/services/wordpress/env/wordpress_db.env) file, you need to change the password(s) and user for the database. Replace certbot commands in _docker-compose.yml_, and replace _bensuperpc.org_ by your domain
```yaml
command: >
certonly --email bensuperpc@bensuperpc.fr --agree-tos --rsa-key-size 4096 --no-eff-email --verbose --noninteractive --keep-until-expiring --webroot
--webroot-path=/var/www/wordpress --domain bensuperpc.org --domain www.bensuperpc.org
--webroot-path=/var/www/jellyfin --domain jellyfin.bensuperpc.org --domain www.jellyfin.bensuperpc.org
```
With to get the SSL certificate
```yaml
command: >
certonly --email bensuperpc@bensuperpc.fr --agree-tos --rsa-key-size 4096 --no-eff-email --verbose --noninteractive --staging --webroot
--webroot-path=/var/www/wordpress --domain bensuperpc.org --domain www.bensuperpc.org
--webroot-path=/var/www/jellyfin --domain jellyfin.bensuperpc.org --domain www.jellyfin.bensuperpc.org
```
Run the docker-compose and exit with CTRL+C and when you have the SSL certificate
```sh ```sh
MARIADB_ROOT_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ make start-at
MARIADB_USER=bensuperpc
MARIADB_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw
``` ```
For [wordpress_backup.env](infrastructure/services/wordpress/env/wordpress_backup.env) file, you need to change the password(s) for the restic backup. Replace certbot commands in _docker-compose.yml_ to update and renew the SSL certificate
```sh ```sh
RESTIC_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ command: >
certonly --email bensuperpc@bensuperpc.fr --agree-tos --rsa-key-size 4096 --no-eff-email --verbose --noninteractive --force-renewal --webroot
--webroot-path=/var/www/wordpress --domain bensuperpc.org --domain www.bensuperpc.org
--webroot-path=/var/www/jellyfin --domain jellyfin.bensuperpc.org --domain www.jellyfin.bensuperpc.org
``` ```
#### PsiTransfer Run the docker-compose to update and renew the SSL certificate and exit with CTRL+C when you have the SSL certificate
For [psitransfer.env](infrastructure/services/psitransfer/env/psitransfer.env) file, you need to change the secret key.
```sh ```sh
PSITRANSFER_ADMIN_PASS=n9jLVNT9QUotTJTT91JqH4GyBTg9pvEn make start-at
``` ```
For [projectsend_db.env](infrastructure/services/projectsend/env/projectsend_db.env) file, you need to change the password(s) and user for the database. Now you can replace the certbot commands in _docker-compose.yml_ with the original one
```yaml
command: >
certonly --email bensuperpc@bensuperpc.fr --agree-tos --rsa-key-size 4096 --no-eff-email --verbose --noninteractive --keep-until-expiring --webroot
--webroot-path=/var/www/wordpress --domain bensuperpc.org --domain www.bensuperpc.org
--webroot-path=/var/www/jellyfin --domain jellyfin.bensuperpc.org --domain www.jellyfin.bensuperpc.org
```
Remove the cert config file
```sh ```sh
MARIADB_ROOT_PASSWORD=8O34297GrBfT3Ld34Lfg9mpotmZwbJtt rm -fr nginx/conf.d
MARIADB_USER=bensuperpc
MARIADB_PASSWORD=wdSUa1JEZhXie5AJ5NcX1w73xmpO12EY
``` ```
#### Picoshare Copy _nginx-conf-original_ to _nginx-conf_, for definitive use
For [picoshare.env](infrastructure/services/picoshare/env/picoshare.env) file, you need to change the secret key.
```sh ```sh
PS_SHARED_SECRET=CBuS4DJLqIe93xF1KGYRrnhxUFBqLD2n cp -r nginx/conf.d-original nginx/conf.d
``` ```
#### Dufs Now you start services
For [dufs.env](infrastructure/services/dufs/env/dufs.env) file, you need to change the secret key and if you want the user name.
```sh ```sh
DUFS_AUTH="admin:heqihlOfBmJDESGFlpbPi7P7Mi6F7RkV@/:rw|@/:ro" make start-at
``` ```
#### Stirling PDF ### Flask website
For [stirlingpdf.env](infrastructure/services/stirlingpdf/env/stirlingpdf.env) file, it's **completly optional**, you can change the password(s) and user. You can follow the [README.md](bensuperpc_website/README.md) to install the Flask website.
```sh ### Wordpress website
# Enable security, optional
DOCKER_ENABLE_SECURITY=true
SECURITY_ENABLE_LOGIN=true
# Can be disabled after initial login, optional,
# default it admin:stirling
SECURITY_INITIALLOGIN_USERNAME=admin
SECURITY_INITIALLOGIN_PASSWORD=Jw9U039f5xc2mFcacvGvPD9RjwIh4DzO
```
#### OpenSSH For the Wordpress website, you can configure in GUI when you go to the website.
You can need to add/change the public ssh key [id_ed25519.pub](infrastructure/services/openssh/config/authorized_keys/id_ed25519.pub) (its my public key), also change the config/password in [openssh.env](infrastructure/services/openssh/env/openssh.env):
```sh
SUDO_ACCESS=true
#PUBLIC_KEY_URL=https://github.com/bensuperpc.keys
PUBLIC_KEY_DIR=/authorized_ssh_keys
USER_PASSWORD=rdUwf36C11PLmpU9Lvq7tP5pfFBKAuCh
#PUBLIC_KEY=yourpublickey
#PUBLIC_KEY_FILE=/path/to/file
#PUBLIC_KEY_DIR=/path/to/directory/containing/_only_/pubkeys
#USER_PASSWORD_FILE=/path/to/file
```
#### Open-WebUI
For [open-webui.env](infrastructure/services/open-webui/env/open-webui.env) file, entirely optional.
To download the model, you can use:
```sh
docker exec -it ollama ollama run deepseek-r1:8b
```
### Start the infrastructure ### Start the infrastructure
@@ -245,95 +164,16 @@ Stop the website with (or CTRL+C with the previous command):
make stop make stop
``` ```
Remove countainers with: ## URL
```sh You can access to the website with:
make down
```
You can disable some services by removing the service name in PROFILES variable in the [Makefile](Makefile) file. - [bensuperpc.org](https://bensuperpc.org) and [www.bensuperpc.org](https://www.bensuperpc.org) (Wordpress for now)
- [phpmyadmin.bensuperpc.org](http://phpmyadmin.bensuperpc.org) and [www.phpmyadmin.bensuperpc.org](http://www.phpmyadmin.bensuperpc.org) (PHPMyAdmin for MariaDB)
- [pgadmin.bensuperpc.org](http://pgadmin.bensuperpc.org) and [www.pgadmin.bensuperpc.org](http://www.pgadmin.bensuperpc.org) (PGAdmin for PostgreSQL)
- [qbittorrent.bensuperpc.org](http://qbittorrent.bensuperpc.org) and [www.qbittorrent.bensuperpc.org](http://www.qbittorrent.bensuperpc.org) (Qbittorrent)
To enable the gitea CI: [how-to-build-docker-containers-using-gitea-runners](https://medium.com/@lokanx/how-to-build-docker-containers-using-gitea-runners-600729555e07) ## Build with
### Homepage
You can change the homepage config in these files:
- [bookmarks.yaml](infrastructure/services/homepage/config/bookmarks.yaml)
- [services.yaml](infrastructure/services/homepage/config/services.yaml)
- [settings.yaml](infrastructure/services/homepage/config/settings.yaml)
- [widgets.yaml](infrastructure/services/homepage/config/widgets.yaml)
### Forgejo
For Forgejo installation, you must change the password(s) and user in [forgejo_db.env](infrastructure/services/forgejo/env/forgejo_db.env) file and [forgejo.env](infrastructure/services/forgejo/env/forgejo.env) file.
Once the installation is complete, you need to set the installation lock:
```sh
FORGEJO__security__INSTALL_LOCK=true
```
### Forgejo Runner
```sh
docker exec -it forgejo_runner /bin/bash
```
```sh
forgejo-runner generate-config > /data/config.yml
```
Now update the config.yml file to support docker-in-docker:
```yml
envs:
DOCKER_TLS_VERIFY: 1
DOCKER_CERT_PATH: /certs/client
DOCKER_HOST: tcp://docker:2376
labels: ["ubuntu-latest:docker://node:20-bookworm", "ubuntu-22.04:docker://node:20-bookworm"]
network: host
options: -v /certs/client:/certs/client
valid_volumes:
- /certs/client
```
Register the runner with your Forgejo instance:
```sh
forgejo-runner register
```
You will need to provide the following information:
```sh
https://forgejo.bensuperpc.org/
<Your Registration Token, in https://forgejo.bensuperpc.org/admin/actions/runners>
ubuntu-22.04:docker://ghcr.io/catthehacker/ubuntu:act-24.04
main
```
### Docker volumes
This infrastructure uses docker volumes to store data, all configuration/data for each service are not shared between services for security and maintenance reasons, but **public_data** and **private_data** are shared between all services to store your data.
| Volume name | Description |
| ------------ | ---------------------------------------------------------------------------------------------------------- |
| public_data | Public data reachable on internet via [dufs.bensuperpc.org](https://dufs.bensuperpc.org), can be disabled. |
| private_data | Private data |
### SSH access
The default port for ssh/rsync is is 2222.
You can access to the server with:
```sh
ssh -p 2222 admin@bensuperpc.org
```
## Sources
- [Wordpress](https://wordpress.org/) - [Wordpress](https://wordpress.org/)
- [Gnu Make](https://www.gnu.org/software/make/) - [Gnu Make](https://www.gnu.org/software/make/)
@@ -342,34 +182,15 @@ ssh -p 2222 admin@bensuperpc.org
- [Docker](https://www.docker.com/) - [Docker](https://www.docker.com/)
- [Docker Compose](https://docs.docker.com/compose/) - [Docker Compose](https://docs.docker.com/compose/)
- [Docker Hub](https://hub.docker.com/) - [Docker Hub](https://hub.docker.com/)
- [How To Start WordPress with Caddy using Docker Compose](https://minhcung.me/how-to-start-wordpress-with-caddy-using-docker-compose-3d31bb9ef88b) - [Digital Ocean](https://www.digitalocean.com/)
- [Digital Ocean - How To Install WordPress with Docker Compose (nginx)](https://www.digitalocean.com/community/tutorials/how-to-install-wordpress-with-docker-compose) - [Digital Ocean - How To Install WordPress with Docker Compose](https://www.digitalocean.com/community/tutorials/how-to-install-wordpress-with-docker-compose)
- [Imagisphe](https://imagisphe.re/) - [PGAmin](https://www.pgadmin.org/)
- [Letsencrypt](https://letsencrypt.org/) - [Qbittorrent](https://www.qbittorrent.org/)
- [Caddy](https://caddyserver.com/)
- [Adminer](https://www.adminer.org/)
- [Uptime Kuma](https://uptime-kuma.com/)
- [qbittorrent](https://www.qbittorrent.org/)
- [Transmission](https://transmissionbt.com/)
- [Gitea](https://gitea.io/)
- [Jellyfin](https://jellyfin.org/) - [Jellyfin](https://jellyfin.org/)
- [SyncThing](https://syncthing.net/) - [Letsencrypt](https://letsencrypt.org/)
- [PsiTransfer](https://psitransfer.com/) - [Certbot](https://certbot.eff.org/)
- [It-tools](https://github.com/CorentinTh/it-tools) - [Nginx](https://www.nginx.com/)
- [Omni-tools](https://github.com/iib0011/omni-tools) - [UWSGI](https://uwsgi-docs.readthedocs.io/en/latest/)
- [Privatebin](https://github.com/PrivateBin/PrivateBin)
- [ghost](https://ghost.org)
- [Homepage Tuto](https://belginux.com/installer-homepage-avec-docker/)
- [ProjectSend](https://www.projectsend.org/)
- [Picoshare](https://github.com/mtlynch/picoshare)
- [Dufs](https://github.com/sigoden/dufs)
- [demos](https://github.com/usememos/memos)
- [Stirling PDF](https://github.com/Stirling-Tools/Stirling-PDF)
- [open-webui](https://github.com/open-webui/open-webui)
- [Fix docker volume](https://pratikpc.medium.com/use-docker-compose-named-volumes-as-non-root-within-your-containers-1911eb30f731)
- [Forgejo-runner](https://code.forgejo.org/forgejo/runner)
- [Forgejo-runner](https://huijzer.xyz/posts/55)
- [Forgejo](https://nickcunningh.am/blog/how-to-setup-and-configure-forgejo-with-support-for-forgejo-actions-and-more)
## License ## License
+32
View File
@@ -0,0 +1,32 @@
version: "3.9"
services:
certbot:
depends_on:
- webserver
image: certbot/certbot:v2.5.0
container_name: certbot
profiles:
- certbot
volumes:
- certbot-cert:/etc/letsencrypt
- wordpress:/var/www/wordpress
- jellyfin:/var/www/jellyfin
#command: >
# certonly --email bensuperpc@bensuperpc.fr --agree-tos --rsa-key-size 4096 --no-eff-email --verbose --noninteractive --staging --webroot
# --webroot-path=/var/www/wordpress --domain bensuperpc.org --domain www.bensuperpc.org
# --webroot-path=/var/www/jellyfin --domain jellyfin.bensuperpc.org --domain www.jellyfin.bensuperpc.org
#command: >
# certonly --email bensuperpc@bensuperpc.fr --agree-tos --rsa-key-size 4096 --no-eff-email --verbose --noninteractive --force-renewal --webroot
# --webroot-path=/var/www/wordpress --domain bensuperpc.org --domain www.bensuperpc.org
# --webroot-path=/var/www/jellyfin --domain jellyfin.bensuperpc.org --domain www.jellyfin.bensuperpc.org
command: >
certonly --email bensuperpc@bensuperpc.fr --agree-tos --rsa-key-size 4096 --no-eff-email --verbose --noninteractive --keep-until-expiring --webroot
--webroot-path=/var/www/wordpress --domain bensuperpc.org --domain www.bensuperpc.org
--webroot-path=/var/www/jellyfin --domain jellyfin.bensuperpc.org --domain www.jellyfin.bensuperpc.org
volumes:
certbot-cert:
name: certbot-cert
+48
View File
@@ -0,0 +1,48 @@
version: "3.9"
services:
qbittorrent:
image: lscr.io/linuxserver/qbittorrent:latest
container_name: qbittorrent
profiles:
- qbittorrent
environment:
- PUID=1000
- PGID=1000
- TZ=Europe/London
- WEBUI_PORT=8080
volumes:
- qbittorrent-conf:/config
- qbittorrent-downloads:/downloads
#ports:
# - 8080:8080
# - 6881:6881
# - 6881:6881/udp
restart: unless-stopped
networks:
- app-network
jellyfin:
image: lscr.io/linuxserver/jellyfin:latest
container_name: jellyfin
profiles:
- jellyfin
environment:
- PUID=1000
- PGID=1000
- TZ=Europe/London
- JELLYFIN_PublishedServerUrl=192.168.0.5 #optional
volumes:
- jellyfin-config:/config
- jellyfin-tvseries:/data/tvshows
- jellyfin-movies:/data/movies
- jellyfin:/var/www/html
#ports:
# - 8096:8096
# - 8920:8920 #optional
# - 7359:7359/udp #optional
# - 1900:1900/udp #optional
restart: unless-stopped
networks:
- app-network
security_opt:
- no-new-privileges:true
+6
View File
@@ -0,0 +1,6 @@
version: "3.9"
networks:
app-network:
driver: bridge
name: app-network
+24
View File
@@ -0,0 +1,24 @@
version: "3.9"
services:
webserver:
depends_on:
- wordpress
image: nginx:1.24.0
container_name: webserver
profiles:
- webserver
restart: unless-stopped
ports:
- "80:80"
- "443:443"
volumes:
- wordpress:/var/www/wordpress
- jellyfin:/var/www/jellyfin
- ./nginx/conf.d:/etc/nginx/conf.d:ro
- ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
- certbot-cert:/etc/letsencrypt:ro
networks:
- app-network
security_opt:
- no-new-privileges:true
+15
View File
@@ -0,0 +1,15 @@
version: "3.9"
volumes:
qbittorrent-downloads:
name: qbittorrent-downloads
qbittorrent-conf:
name: qbittorrent-conf
jellyfin-config:
name: jellyfin-config
jellyfin-tvseries:
name: jellyfin-tvseries
jellyfin-movies:
name: jellyfin-movies
jellyfin:
name: jellyfin
+63
View File
@@ -0,0 +1,63 @@
version: "3.9"
services:
wp_db:
image: mariadb:10.10.3
container_name: wp_db
profiles:
- wp_db
restart: unless-stopped
env_file:
- env/wp_database.env
volumes:
- dbdata:/var/lib/mysql
networks:
- app-network
security_opt:
- no-new-privileges:true
wordpress:
depends_on:
- wp_db
image: wordpress:6.2.0-fpm
container_name: wordpress
profiles:
- wordpress
restart: unless-stopped
env_file:
- env/wordpress.env
volumes:
- wordpress:/var/www/html
networks:
- app-network
security_opt:
- no-new-privileges:true
# cap_drop:
# - ALL
# cap_add:
# - SETUID
# - SETGID
# - DAC_OVERRIDE
# - NET_BIND_SERVICE
# - NET_RAW
# - CAP_CHOWN
phpmyadmin:
image: phpmyadmin:5.2.0
container_name: phpmyadmin
profiles:
- phpmyadmin
restart: unless-stopped
env_file:
- env/phpmyadmin.env
depends_on:
- wp_db
networks:
- app-network
security_opt:
- no-new-privileges:true
volumes:
wordpress:
name: wordpress
dbdata:
name: dbdata
+4
View File
@@ -0,0 +1,4 @@
POSTGRES_HOST_AUTH_METHOD=trust
POSTGRES_USER=bensuperpc
POSTGRES_PASSWORD=nPRh270dKH3hz%6HS2$X%8F3fqoQ*Fex
POSTGRES_DB=website
+7
View File
@@ -0,0 +1,7 @@
FLASK_DEBUG=1
# Acces to the database
POSTGRES_URL=flask_db:5432
POSTGRES_USER=bensuperpc
POSTGRES_PW=nPRh270dKH3hz%6HS2$X%8F3fqoQ*Fex
POSTGRES_DB=website
+3
View File
@@ -0,0 +1,3 @@
PGADMIN_DEFAULT_EMAIL=bensuperpc@bensuperpc.org
PGADMIN_DEFAULT_PASSWORD=LmRVf9DY291ez7B^^%2RntHcsCrJ5fQ!
#PGADMIN_ENABLE_TLS
+4
View File
@@ -0,0 +1,4 @@
MYSQL_ROOT_PASSWORD=g1qQWxTXyFXIKpAfbE0h5bxn&prr4zfd
MYSQL_USER=bensuperpc
MYSQL_PASSWORD=4Xnc7FB7902%*w9PW4y9&anQ5&hQdTzt
PMA_HOST=db
+4
View File
@@ -0,0 +1,4 @@
WORDPRESS_DB_USER=bensuperpc
WORDPRESS_DB_PASSWORD=4Xnc7FB7902%*w9PW4y9&anQ5&hQdTzt
WORDPRESS_DB_NAME=wordpress
WORDPRESS_DB_HOST=wp_db:3306
+4
View File
@@ -0,0 +1,4 @@
MARIADB_ROOT_PASSWORD=g1qQWxTXyFXIKpAfbE0h5bxn&prr4zfd
MARIADB_USER=bensuperpc
MARIADB_PASSWORD=4Xnc7FB7902%*w9PW4y9&anQ5&hQdTzt
MARIADB_DATABASE=wordpress
-51
View File
@@ -1,51 +0,0 @@
include:
# Main
- services/main/docker-compose.main.yml
# WordPress
- services/wordpress/docker-compose.wordpress.yml
# Caddy
- services/caddy/docker-compose.caddy.yml
# Dufs
- services/dufs/docker-compose.dufs.yml
# Forgejo
- services/forgejo/docker-compose.forgejo.yml
# Homepage
- services/homepage/docker-compose.homepage.yml
# It-tools
- services/it-tools/docker-compose.it-tools.yml
# omni-tools
- services/omni-tools/docker-compose.omni-tools.yml
# cyberchef
- services/cyberchef/docker-compose.cyberchef.yml
# Jellyfin
- services/jellyfin/docker-compose.jellyfin.yml
# Openssh
- services/openssh/docker-compose.openssh.yml
# Picoshare
- services/picoshare/docker-compose.picoshare.yml
# Privatebin
- services/privatebin/docker-compose.privatebin.yml
# Projectsend
- services/projectsend/docker-compose.projectsend.yml
# Psitransfer
- services/psitransfer/docker-compose.psitransfer.yml
# Qbittorrent
- services/qbittorrent/docker-compose.qbittorrent.yml
# Stirlingpdf
- services/stirlingpdf/docker-compose.stirlingpdf.yml
# Syncthing
- services/syncthing/docker-compose.syncthing.yml
# Transmission
- services/transmission/docker-compose.transmission.yml
# Uptime-kuma
- services/uptime-kuma/docker-compose.uptime-kuma.yml
# open-webui
- services/open-webui/docker-compose.open-webui.yml
# Minecraft
- services/minecraft-server/docker-compose.yml
# 7daystodie
- services/7daystodie-server/docker-compose.yml
# Satisfactory
- services/satisfactory-server/docker-compose.yml
# Team Fortress 2
- services/teamfortress2-server/docker-compose.yml
@@ -1,54 +0,0 @@
services:
# 7 days to die server
7daystodie_server:
image: vinanrra/7dtd-server:latest
container_name: 7daystodie_server
profiles:
- 7daystodie_server
restart: on-failure:5
ports:
- "26900:26900"
- "26901:26901"
- "26902:26902"
# - "8080:8080" # WEBADMIN
# - "8081:8081" # TELNET
# - "8082:8082" # WEBSERVER
volumes:
- 7daystodie_server_save:/home/sdtdserver/.local/share/7DaysToDie # 7 Days To Die world saves
- 7daystodie_server_config_lgsm:/home/sdtdserver/lgsm/config-lgsm/sdtdserver # LGSM config folder
- 7daystodie_server_file:/home/sdtdserver/serverfiles # Optional - serverfiles folder
- 7daystodie_server_log:/home/sdtdserver/log
networks:
- infra-network
env_file:
- ./env/7daystodie.env
environment:
- PUID=${PUID:-1000}
- PGID=${PGID:-1000}
# security_opt:
# - no-new-privileges:true
# cap_drop:
# - SYS_ADMIN
deploy:
resources:
limits:
memory: 16G
reservations:
memory: 4G
volumes:
7daystodie_backup:
name: 7daystodie_backup
7daystodie_server_save:
name: 7daystodie_server_save
7daystodie_server_config_lgsm:
name: 7daystodie_server_config_lgsm
7daystodie_server_file:
name: 7daystodie_server_file
7daystodie_server_log:
name: 7daystodie_server_log
networks:
infra-network:
driver: bridge
name: infra-network
@@ -1,7 +0,0 @@
START_MODE=3
VERSION=stable
TimeZone=Europe/Paris
BACKUP=NO
BACKUP_HOUR=2
BACKUP_MAX=7
MONITOR=NO
@@ -1,14 +0,0 @@
#RUN_ON_STARTUP=true
RESTIC_REPOSITORY=/mnt/restic
RESTIC_BACKUP_SOURCES=/data
RESTIC_PASSWORD=SCY5cmu12Odca302EXabPA9jXYkCb2NN
# Backup (exuclusive with Check and Prune)
BACKUP_CRON=*/15 * * * *
RESTIC_BACKUP_ARGS=--tag docker-volumes --verbose
#RESTIC_FORGET_ARGS=--prune --keep-last 8 --keep-daily 7 --keep-weekly 5 --keep-monthly 12 --keep-yearly 4
# Check (exuclusive with Check and Prune)
#CHECK_CRON=*/15 * * * *
#RESTIC_CHECK_ARGS=--read-data-subset=40%
# Prune (exuclusive with Check and Prune)
#PRUNE_CRON=*/15 * * * *
#RESTIC_PRUNE_ARGS=
@@ -1,33 +0,0 @@
services:
7daystodie_backup:
image: mazzolino/restic:latest
container_name: 7daystodie_backup
profiles:
- 7daystodie_backup
depends_on:
- 7daystodie_server
restart: on-failure:5
env_file:
- ./env/7daystodie_backup.env
volumes:
- 7daystodie_backup:/mnt/restic
- 7daystodie_server_save:/data:ro
security_opt:
- no-new-privileges:true
network_mode: none
cap_drop:
- NET_ADMIN
- NET_RAW
- SYS_ADMIN
volumes:
7daystodie_backup:
name: 7daystodie_backup
7daystodie_server_save:
name: 7daystodie_server_save
7daystodie_server_config_lgsm:
name: 7daystodie_server_config_lgsm
7daystodie_server_file:
name: 7daystodie_server_file
7daystodie_server_log:
name: 7daystodie_server_log
@@ -1,14 +0,0 @@
#RUN_ON_STARTUP=true
RESTIC_REPOSITORY=/mnt/restic
RESTIC_BACKUP_SOURCES=/data
RESTIC_PASSWORD=SCY5cmu12Odca302EXabPA9jXYkCb2NN
# Backup (exuclusive with Check and Prune)
BACKUP_CRON=*/15 * * * *
RESTIC_BACKUP_ARGS=--tag docker-volumes --verbose
#RESTIC_FORGET_ARGS=--prune --keep-last 8 --keep-daily 7 --keep-weekly 5 --keep-monthly 12 --keep-yearly 4
# Check (exuclusive with Check and Prune)
#CHECK_CRON=*/15 * * * *
#RESTIC_CHECK_ARGS=--read-data-subset=40%
# Prune (exuclusive with Check and Prune)
#PRUNE_CRON=*/15 * * * *
#RESTIC_PRUNE_ARGS=
@@ -1,5 +0,0 @@
include:
# 7 days to die server
- 7daystodie/docker-compose.7daystodie.yml
# Backup server
- backup/docker-compose.backup.yml
@@ -1,41 +0,0 @@
{
email {$MAIL_DOMAIN}
key_type p384
log {
output file /data/logs/access.log {
roll_size 1GiB
roll_keep 20
roll_keep_for 720h
}
format json
}
}
# import website/*
# Common settings
import website/header.caddy
# All website configurations
import website/main.caddy
import website/cyberchef.caddy
import website/forgejo.caddy
import website/homepage.caddy
import website/jellyfin.caddy
import website/memos.caddy
import website/open-webui.caddy
import website/privatebin.caddy
import website/psitransfer.caddy
import website/stirlingpdf.caddy
import website/transmission.caddy
import website/wordpress.caddy
import website/dufs.caddy
import website/it-tools.caddy
import website/omni-tools.caddy
import website/picoshare.caddy
import website/projectsend.caddy
import website/qbittorrent.caddy
import website/syncthing.caddy
import website/uptimekuma.caddy
@@ -1,9 +0,0 @@
cyberchef.{$MAIN_DOMAIN} {
# Load balance between 2 instances
reverse_proxy {
to cyberchef0:8000 cyberchef1:8000
lb_policy round_robin
lb_retries 3
lb_try_interval 1s
}
}
@@ -1,3 +0,0 @@
dufs.{$MAIN_DOMAIN} {
reverse_proxy dufs:5000
}
@@ -1,7 +0,0 @@
git.{$MAIN_DOMAIN} {
reverse_proxy forgejo:3000
}
forgejo.{$MAIN_DOMAIN} {
redir https://git.{$MAIN_DOMAIN}{uri} permanent
}
@@ -1,15 +0,0 @@
(header_common) {
Permissions-Policy: geolocation=(), camera=(), microphone=(), clipboard-read=(), usb=()
Strict-Transport-Security: max-age=31536000; includeSubDomains
X-Content-Type-Options: nosniff
X-Frame-Options: DENY
Referrer-Policy: strict-origin-when-cross-origin
# Only useful for old browsers
X-XSS-Protection: "1; mode=block"
# Can cause issues with external resources
#Cross-Origin-Embedder-Policy: require-corp
Cross-Origin-Opener-Policy: same-origin
#Cross-Origin-Resource-Policy: same-origin
#Content-Security-Policy: default-src 'self'; img-src 'self' data:; object-src 'none'; frame-ancestors 'none'; base-uri 'self'; form-action 'self';
}
@@ -1,3 +0,0 @@
homepage.{$MAIN_DOMAIN} {
reverse_proxy homepage:3000
}
@@ -1,12 +0,0 @@
it-tools.{$MAIN_DOMAIN} {
# Load balance between 2 instances
reverse_proxy {
to it-tools0:8080 it-tools1:8080
lb_policy round_robin
lb_retries 3
lb_try_interval 1s
}
header {
import header_common
}
}
@@ -1,6 +0,0 @@
jellyfin.{$MAIN_DOMAIN} {
reverse_proxy jellyfin:8096
header {
import header_common
}
}
@@ -1,27 +0,0 @@
www.{$MAIN_DOMAIN} {
header {
Cache-Control "public, max-age=10"
import header_common
}
handle_errors {
@notFound expression `{http.error.status_code} == 404`
redir @notFound https://www.{$MAIN_DOMAIN} permanent
}
reverse_proxy homepage:3000
}
{$MAIN_DOMAIN} {
redir https://www.{host}{uri} permanent
}
public.{$MAIN_DOMAIN} {
root * /public_data
file_server browse
header / {
Cache-Control "no-store"
import header_common
}
}
@@ -1,3 +0,0 @@
memos.{$MAIN_DOMAIN} {
reverse_proxy memos:5230
}
@@ -1,9 +0,0 @@
omni-tools.{$MAIN_DOMAIN} {
# Load balance between 2 instances
reverse_proxy {
to omni-tools0:80 omni-tools1:80
lb_policy round_robin
lb_retries 3
lb_try_interval 1s
}
}
@@ -1,3 +0,0 @@
open-webui.{$MAIN_DOMAIN} {
reverse_proxy open-webui:8080
}
@@ -1,3 +0,0 @@
picoshare.{$MAIN_DOMAIN} {
reverse_proxy picoshare:4001
}
@@ -1,7 +0,0 @@
privatebin.{$MAIN_DOMAIN} {
reverse_proxy privatebin:8080
}
pastebin.{$MAIN_DOMAIN} {
redir https://privatebin.{$MAIN_DOMAIN} permanent
}
@@ -1,3 +0,0 @@
projectsend.{$MAIN_DOMAIN} {
reverse_proxy projectsend:80
}
@@ -1,7 +0,0 @@
transfer.{$MAIN_DOMAIN} {
reverse_proxy psitransfer:3000
}
psitransfer.{$MAIN_DOMAIN} {
redir https://transfer.{$MAIN_DOMAIN}{uri} permanent
}
@@ -1,11 +0,0 @@
torrent.{$MAIN_DOMAIN} {
reverse_proxy qbittorrent:8080
header {
Cache-Control "no-store"
import header_common
}
}
qbittorrent.{$MAIN_DOMAIN} {
redir https://torrent.{$MAIN_DOMAIN} permanent
}
@@ -1,3 +0,0 @@
stirlingpdf.{$MAIN_DOMAIN} {
reverse_proxy stirlingpdf:8080
}
@@ -1,5 +0,0 @@
syncthing.{$MAIN_DOMAIN} {
reverse_proxy syncthing:8384 {
header_up Host {upstream_hostport}
}
}
@@ -1,3 +0,0 @@
transmission.{$MAIN_DOMAIN} {
reverse_proxy transmission:9091
}
@@ -1,7 +0,0 @@
uptimekuma.{$MAIN_DOMAIN} {
reverse_proxy uptime-kuma:3001
header {
Cache-Control "no-store"
import header_common
}
}
@@ -1,34 +0,0 @@
wordpress.{$MAIN_DOMAIN} {
root * /var/www/html
php_fastcgi wordpress:9000
file_server
encode zstd gzip
@disallowed {
path /xmlrpc.php
path *.sql
path /wp-content/uploads/*.php
}
rewrite @disallowed '/index.php'
respond /uploads/*.php 404
header {
# disable FLoC tracking
Permissions-Policy interest-cohort=()
# enable HSTS
Strict-Transport-Security max-age=31536000;
# disable clients from sniffing the media type
X-Content-Type-Options nosniff
# clickjacking protection
# X-Frame-Options DENY
# Disable powerful features we don't need
Permissions-Policy "geolocation=(), camera=(), microphone=() interest-cohort=()"
}
}
@@ -1,65 +0,0 @@
services:
# Caddy
caddy:
image: bensuperpc/caddy-l4:latest
container_name: caddy
profiles:
- caddy
depends_on:
main_infrastructure:
condition: service_completed_successfully
restart: on-failure:5
ports:
- 80:80/tcp
- 80:80/udp
- 443:443/tcp
- 443:443/udp
volumes:
- caddy_data:/data:rw
- caddy_config:/config:rw
- ./config:/etc/caddy:ro
- wordpress:/var/www/html:rw
- public_data:/public_data:ro
networks:
- infra-network
env_file:
- ./env/caddy.env
security_opt:
- no-new-privileges:true
healthcheck:
test: pidof caddy || exit 1
interval: 120s
timeout: 10s
retries: 3
caddy_backup:
image: mazzolino/restic:latest
container_name: caddy_backup
profiles:
- caddy
depends_on:
- caddy
restart: on-failure:5
env_file:
- ./env/caddy_backup.env
volumes:
- caddy_backup:/mnt/restic
- caddy_data:/data:ro
network_mode: none
cap_drop:
- NET_ADMIN
- NET_RAW
- SYS_ADMIN
volumes:
caddy_data:
name: caddy_data
caddy_config:
name: caddy_config
caddy_backup:
name: caddy_backup
wordpress:
name: wordpress
public_data:
name: public_data
-2
View File
@@ -1,2 +0,0 @@
MAIN_DOMAIN=bensuperpc.org
MAIL_DOMAIN=bensuperpc@gmail.com
-14
View File
@@ -1,14 +0,0 @@
#RUN_ON_STARTUP=true
RESTIC_REPOSITORY=/mnt/restic
RESTIC_BACKUP_SOURCES=/data
RESTIC_PASSWORD=YFQh8v3Wi95v0p6h88D4u8C8z4gLfdMw
# Backup (exuclusive with Check and Prune)
BACKUP_CRON=*/30 * * * *
RESTIC_BACKUP_ARGS=--tag docker-volumes --verbose
#RESTIC_FORGET_ARGS=--prune --keep-last 8 --keep-daily 7 --keep-weekly 5 --keep-monthly 12 --keep-yearly 4
# Check (exuclusive with Check and Prune)
#CHECK_CRON=*/30 * * * *
#RESTIC_CHECK_ARGS=--read-data-subset=40%
# Prune (exuclusive with Check and Prune)
#PRUNE_CRON=*/30 * * * *
#RESTIC_PRUNE_ARGS=
@@ -1,51 +0,0 @@
services:
# cyberchef
cyberchef0:
image: mpepping/cyberchef:latest
container_name: cyberchef0
profiles:
- cyberchef
restart: on-failure:5
depends_on:
- caddy
networks:
- infra-network
read_only: false
security_opt:
- no-new-privileges:true
cap_drop:
- SYS_ADMIN
deploy:
resources:
limits:
cpus: '0.5'
memory: 512M
reservations:
cpus: '0.001'
memory: 20M
cyberchef1:
image: mpepping/cyberchef:latest
container_name: cyberchef1
profiles:
- cyberchef
restart: on-failure:5
depends_on:
- caddy
networks:
- infra-network
read_only: false
security_opt:
- no-new-privileges:true
cap_drop:
- SYS_ADMIN
deploy:
resources:
limits:
cpus: '0.5'
memory: 512M
reservations:
cpus: '0.001'
memory: 20M
@@ -1,25 +0,0 @@
services:
# dufs
dufs:
image: sigoden/dufs:latest
container_name: dufs
profiles:
- dufs
# user: ${PUID:-1000}:${PGID:-1000}
restart: on-failure:5
depends_on:
- caddy
env_file:
- ./env/dufs.env
volumes:
- public_data:/data
networks:
- infra-network
security_opt:
- no-new-privileges:true
volumes:
public_data:
name: public_data
private_data:
name: private_data
-7
View File
@@ -1,7 +0,0 @@
DUFS_BIND=0.0.0.0
DUFS_PORT=5000
DUFS_SERVE_PATH=/data
DUFS_HIDDEN=tmp,*.log,*.lock
DUFS_ALLOW_ALL=true
DUFS_COMPRESS=medium
DUFS_AUTH="admin:heqihlOfBmJDESGFlpbPi7P7Mi6F7RkV@/:rw|@/:ro"
@@ -1,93 +0,0 @@
services:
# forgejo
forgejo:
image: codeberg.org/forgejo/forgejo:13
container_name: forgejo
profiles:
- forgejo
restart: on-failure:5
depends_on:
- database_forgejo
- caddy
ports:
- "22:2222"
env_file:
- ./env/forgejo.env
volumes:
- forgejo_data:/data
- /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro
networks:
- infra-network
# user: ${PUID:-1000}:${PGID:-1000}
security_opt:
- no-new-privileges:true
# Database forgejo
database_forgejo:
image: mariadb:latest
container_name: database_forgejo
profiles:
- forgejo
depends_on:
- caddy
restart: on-failure:5
volumes:
- forgejo_db:/var/lib/mysql:rw
env_file:
- ./env/forgejo_db.env
command: '--default-authentication-plugin=mysql_native_password'
networks:
- infra-network
security_opt:
- no-new-privileges:true
# forgejo-runner
docker-in-docker:
image: code.forgejo.org/oci/docker:dind
container_name: 'docker_dind'
hostname: docker
networks:
- infra-network
profiles:
- forgejo-runner
privileged: true
environment:
DOCKER_TLS_CERTDIR: /certs
DOCKER_HOST: docker-in-docker
volumes:
- forgejo_certs:/certs
forgejo_runner:
image: data.forgejo.org/forgejo/runner:12
networks:
- infra-network
profiles:
- forgejo-runner
links:
- docker-in-docker
depends_on:
docker-in-docker:
condition: service_started
container_name: 'forgejo_runner'
env_file:
- ./env/forgejo_runner.env
# user: ${PUID:-1000}:${PGID:-1000}
volumes:
# - ./config/forgejo_runner/config.yaml:/config.yaml:ro
- forgejo_runner:/data
- forgejo_certs:/certs
restart: 'unless-stopped'
# command: '/bin/sh -c "while : ; do sleep 1 ; done ;"'
command: '/bin/sh -c "sleep 5; forgejo-runner -c /data/config.yml daemon"'
volumes:
forgejo_data:
name: forgejo_data
forgejo_db:
name: forgejo_db
forgejo_certs:
name: forgejo_certs
forgejo_runner:
name: forgejo_runner
-25
View File
@@ -1,25 +0,0 @@
USER_UID=1000
USER_GID=1000
FORGEJO__database__DB_TYPE=mysql
FORGEJO__database__HOST=database_forgejo:3306
FORGEJO__database__NAME=forgejo
FORGEJO__database__USER=bensuperpc
FORGEJO__database__PASSWD=ZcuHcM9tnIEM7EEO7R5jCpEt6v1d6r7s
FORGEJO__APP_NAME=Bensuperpc's Forgejo
FORGEJO__APP_SLOGAN=Personal Code, Mirrors, and More
FORGEJO__server__DOMAIN=git.bensuperpc.org
FORGEJO__server__SSH_DOMAIN=git.bensuperpc.org
FORGEJO__server__HTTP_PORT=3000
FORGEJO__server__SSH_LISTEN_PORT=2222
FORGEJO__server__SSH_PORT=22
FORGEJO__server__ROOT_URL=https://git.bensuperpc.org
FORGEJO__security__SECRET_KEY=7IWrMh7mC7UMo1SowvUsAT2LOX49eU6P
#FORGEJO__security__INTERNAL_TOKEN=
FORGEJO__security__INSTALL_LOCK=true
FORGEJO__security__MIN_PASSWORD_LENGTH=8
FORGEJO__actions__ENABLED=true
FORGEJO__actions__DEFAULT_ACTIONS_URL="https://git.bensuperpc.org"
#FORGEJO__log__LEVEL: "debug"
FORGEJO__repository__ENABLE_PUSH_CREATE_USER=true
FORGEJO__repository__DEFAULT_PUSH_CREATE_PRIVATE=false
FORGEJO__repository__DEFAULT_REPO_UNITS=repo.code,repo.actions
-4
View File
@@ -1,4 +0,0 @@
MARIADB_ROOT_PASSWORD=ZI8Trbot3b8WGqE5AKj1yphKMu4v9qQw
MARIADB_USER=bensuperpc
MARIADB_PASSWORD=ZcuHcM9tnIEM7EEO7R5jCpEt6v1d6r7s
MARIADB_DATABASE=forgejo
@@ -1,3 +0,0 @@
DOCKER_HOST=tcp://docker:2376
DOCKER_CERT_PATH=/certs/client
DOCKER_TLS_VERIFY=1
@@ -1,51 +0,0 @@
---
# For configuration options and examples, please see:
# https://gethomepage.dev/configs/bookmarks
- Developer:
- Github:
- abbr: GH
href: https://github.com/bensuperpc
description: github.com
- Social:
- Reddit:
- abbr: RE
href: https://reddit.com/u/bensuperpc
description: reddit.com
- Twitter:
- abbr: TW
href: https://twitter.com/bensuperpc
description: twitter.com
- Bluesky:
- abbr: BS
href: https://bsky.app/profile/bensuperpc.bsky.social
description: bsky.app
- Mastodon:
- abbr: MA
href: https://mastodon.social/@bensuperpc
description: mastodon.social
- Entertainment:
- YouTube:
- abbr: YT
href: https://youtube.com/c/bensuperpc
description: youtube.com
- Twitch:
- abbr: TW
href: https://twitch.tv/bensuperpc
description: twitch.tv
- Friends:
- Gnous:
- abbr: Gn
href: https://gnous.eu/
description: gnous.eu
- Imagisphe:
- abbr: IM
href: https://imagisphe.re/
description: imagisphe.re
- Greep:
- abbr: GP
href: https://greep.fr/#/
description: greep.fr
@@ -1,10 +0,0 @@
---
# For configuration options and examples, please see:
# https://gethomepage.dev/configs/docker
#jellyfin:
# host: jellyfin
# port: 8096
#my-docker:
# socket: /var/run/docker.sock
@@ -1,2 +0,0 @@
---
# sample kubernetes config
@@ -1,4 +0,0 @@
---
# url: https://proxmox.host.or.ip:8006
# token: username@pam!Token ID
# secret: secret
@@ -1,139 +0,0 @@
---
# For configuration options and examples, please see:
# https://gethomepage.dev/configs/services/
- Personal:
- wordpress:
icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/wordpress.png
href: https://wordpress.bensuperpc.org/
description: Wordpress
ping: wordpress.bensuperpc.org
container: wordpress
- jellyfin:
icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/jellyfin.png
href: https://jellyfin.bensuperpc.org/
description: Jellyfin
ping: jellyfin.bensuperpc.org
container: jellyfin
- projectsend:
icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/projectsend.png
href: https://projectsend.bensuperpc.org/
description: ProjectSend
ping: projectsend.bensuperpc.org
container: projectsend
- Sharing:
- psitransfer:
icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/psitransfer.png
href: https://psitransfer.bensuperpc.org/
description: PsiTransfer
ping: psitransfer.bensuperpc.org
container: psitransfer
- picoshare:
# icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/picoshare.png
href: https://picoshare.bensuperpc.org/
description: PicoShare
ping: picoshare.bensuperpc.org
container: picoshare
- privatebin:
icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/privatebin.png
href: https://privatebin.bensuperpc.org/
description: PrivateBin
ping: privatebin.bensuperpc.org
container: privatebin
- qbittorrent:
icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/qbittorrent.png
href: https://qbittorrent.bensuperpc.org/
description: qBittorrent
ping: qbittorrent.bensuperpc.org
container: qbittorrent
- syncthing:
icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/syncthing.png
href: https://syncthing.bensuperpc.org/
description: Syncthing
ping: syncthing.bensuperpc.org
container: syncthing
- transmission:
icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/transmission.png
href: https://transmission.bensuperpc.org/
description: Transmission
ping: transmission.bensuperpc.org
container: transmission
- dufs:
# icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/dufs.png
href: https://dufs.bensuperpc.org/
description: Dufs
ping: dufs.bensuperpc.org
container: dufs
# - caddy:
# icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/caddy.png
# href: https://public.bensuperpc.org/
# description: File browser
# ping: public.bensuperpc.org
# container: caddy
- Utils:
- it-tools:
icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/it-tools.png
href: https://it-tools.bensuperpc.org/
description: IT Tools
ping: it-tools.bensuperpc.org
container: it-tools0
- omni-tools:
icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/it-tools.png
href: https://omni-tools.bensuperpc.org/
description: Omni Tools
ping: omni-tools.bensuperpc.org
container: omni-tools0
- cyberchef:
icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/cyberchef.png
href: https://cyberchef.bensuperpc.org/
description: CyberChef
ping: cyberchef.bensuperpc.org
container: cyberchef0
- stirlingpdf:
#icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/stirlingpdf.png
href: https://stirlingpdf.bensuperpc.org/
description: StirlingPDF
ping: stirlingpdf.bensuperpc.org
container: stirlingpdf
- forgejo:
icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/forgejo.png
href: https://forgejo.bensuperpc.org/
description: Forgejo
ping: forgejo.bensuperpc.org
container: forgejo
- open-webui:
icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/open-webui.png
href: https://open-webui.bensuperpc.org/
description: ChatGPT local
ping: open-webui.bensuperpc.org
container: open-webui
- Games:
- minecraft:
icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/minecraft.png
# href: https://minecraft.bensuperpc.org/
description: Minecraft server
# ping: minecraft.bensuperpc.org
container: minecraft-server
- 7dtd:
# icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/7dtd.png
# href: https://7dtd.bensuperpc.org/
description: 7 Days to Die server
# ping: 7dtd.bensuperpc.org
container: 7daystodie_server
- satisfactory:
# icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/7dtd.png
# href: https://7dtd.bensuperpc.org/
description: Satisfactory server
# ping: 7dtd.bensuperpc.org
container: satisfactory_server
- Admin:
- uptime-kuma:
icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/uptime-kuma.png
href: https://uptimekuma.bensuperpc.org/
description: Uptime Kuma
ping: uptimekuma.bensuperpc.org
container: uptime-kuma
@@ -1,58 +0,0 @@
---
# For configuration options and examples, please see:
# https://gethomepage.dev/configs/settings/
title: Bensuperpc
description: Bensuperpc's homepage
base: https://www.bensuperpc.org
favicon: /image/favicon.ico
logpath: /app/logs
background:
image: /image/background.jpg
blur: md
opacity: 50
brightness: 50
theme: dark
color: slate
language: en
layout:
Personal:
style: row
columns: 6
Sharing:
style: row
columns: 6
Admin:
style: row
columns: 6
Utils:
style: row
columns: 6
initiallyCollapsed: false
Games:
style: row
columns: 6
initiallyCollapsed: false
quicklaunch:
searchDescriptions: true
hideInternetSearch: false
hideVisitURL: false
hideVersion: true
headerStyle: boxed
useEqualHeights: true
#providers:
# openweathermap: openweathermapapikey
# weatherapi: weatherapiapikey
@@ -1,37 +0,0 @@
---
# For configuration options and examples, please see:
# https://gethomepage.dev/widgets/services/
# https://gethomepage.dev/widgets/services/qbittorrent/
#- logo:
# icon: /image/daisy.jpg
- resources:
cpu: true
cputemp: true
memory: true
disk: /
uptime: true
refresh: 3000
#- search:
# provider: duckduckgo
# target: _blank
# showSearchSuggestions: true
- datetime:
text_size: xl
locale: fr
format:
timeStyle: short
dateStyle: short
- openmeteo:
label: Nantes # optional
latitude: 47.216671
longitude: -1.55
timezone: Europe/Paris # optional
units: metric # or imperial
cache: 5 # Time in minutes to cache API responses, to stay within limits
format: # optional, Intl.NumberFormat options
maximumFractionDigits: 1
@@ -1,33 +0,0 @@
services:
# homepage
homepage:
image: ghcr.io/gethomepage/homepage:latest
container_name: homepage
profiles:
- homepage
restart: on-failure:5
# environment:
# - PUID=${PUID:-1000}
# - PGID=${PGID:-1000}
depends_on:
- caddy
env_file:
- ./env/homepage.env
volumes:
- homepage_log:/app/logs
- ./config:/app/config
- ./image:/app/public/image:ro
- /var/run/docker.sock:/var/run/docker.sock:ro
# develop:
# watch:
# - action: sync+restart
# path: ./homepage/image
# target: /app/public/image
networks:
- infra-network
security_opt:
- no-new-privileges:true
volumes:
homepage_log:
name: homepage_log
-3
View File
@@ -1,3 +0,0 @@
PSITRANSFER_ADMIN_PASS=n9jLVNT9QUotTJTT91JqH4GyBTg9pvEn
#PSITRANSFER_PORT=3000
HOMEPAGE_ALLOWED_HOSTS=www.bensuperpc.org
Binary file not shown.

Before

Width:  |  Height:  |  Size: 569 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 295 KiB

@@ -1,51 +0,0 @@
services:
# it-tools
it-tools0:
image: ghcr.io/sharevb/it-tools:latest
container_name: it-tools0
profiles:
- it-tools
restart: on-failure:5
depends_on:
- caddy
networks:
- infra-network
read_only: false
security_opt:
- no-new-privileges:true
cap_drop:
- SYS_ADMIN
deploy:
resources:
limits:
cpus: '0.5'
memory: 512M
reservations:
cpus: '0.001'
memory: 20M
it-tools1:
image: ghcr.io/sharevb/it-tools:latest
container_name: it-tools1
profiles:
- it-tools
restart: on-failure:5
depends_on:
- caddy
networks:
- infra-network
read_only: false
security_opt:
- no-new-privileges:true
cap_drop:
- SYS_ADMIN
deploy:
resources:
limits:
cpus: '0.5'
memory: 512M
reservations:
cpus: '0.001'
memory: 20M
@@ -1,37 +0,0 @@
services:
# Jellyfin
jellyfin:
image: lscr.io/linuxserver/jellyfin:latest
container_name: jellyfin
profiles:
- jellyfin
restart: on-failure:5
environment:
- PUID=${PUID:-1000}
- PGID=${PGID:-1000}
depends_on:
- caddy
env_file:
- ./env/jellyfin.env
volumes:
- jellyfin_config:/config
- jellyfin_cache:/cache
- public_data:/public
- private_data:/private
# Hardware acceleration (For Intel and AMD GPUs)
devices:
- /dev/dri:/dev/dri
networks:
- infra-network
security_opt:
- no-new-privileges:true
volumes:
jellyfin_config:
name: jellyfin_config
jellyfin_cache:
name: jellyfin_cache
public_data:
name: public_data
private_data:
name: private_data
-2
View File
@@ -1,2 +0,0 @@
TZ=Etc/UTC
DOCKER_MODS=linuxserver/mods:jellyfin-opencl-intel
@@ -1,30 +0,0 @@
services:
main_infrastructure:
container_name: main_infrastructure
image: alpine:latest
profiles:
- main_infrastructure
volumes:
- public_data:/public_data:rw
- private_data:/private_data:rw
read_only: true
security_opt:
- no-new-privileges:true
cap_drop:
- ALL
cap_add:
- CHOWN
- DAC_OVERRIDE
# Fix root permissions on mounted volumes
command: chown -R ${PUID:-1000}:${PGID:-1000} /public_data /private_data
volumes:
public_data:
name: public_data
private_data:
name: private_data
networks:
infra-network:
driver: bridge
name: infra-network
@@ -1,22 +0,0 @@
services:
# memos
memos:
image: neosmemo/memos:latest
container_name: memos
profiles:
- memos
restart: on-failure:5
depends_on:
- caddy
env_file:
- ./env/memos.env
volumes:
- memos_config:/var/opt/memos
networks:
- infra-network
security_opt:
- no-new-privileges:true
volumes:
memos_config:
name: memos_config
-1
View File
@@ -1 +0,0 @@
@@ -1,34 +0,0 @@
services:
minecraft_backup:
image: mazzolino/restic:latest
container_name: minecraft_backup
profiles:
- minecraft_backup
depends_on:
- mc-server
- minecraft_proxy
restart: on-failure:3
env_file:
- ./env/backup.env
volumes:
- minecraft_server_backup:/mnt/restic
- minecraft_server_data:/data/minecraft_server_data:ro
- minecraft_proxy_data:/data/minecraft_proxy_data:ro
- minecraft_rcon_data:/data/minecraft_rcon_data:ro
security_opt:
- no-new-privileges:true
network_mode: none
cap_drop:
- NET_ADMIN
- NET_RAW
- SYS_ADMIN
volumes:
minecraft_server_backup:
name: minecraft_server_backup
minecraft_server_data:
name: minecraft_server_data
minecraft_proxy_data:
name: minecraft_proxy_data
minecraft_rcon_data:
name: minecraft_rcon_data
@@ -1,14 +0,0 @@
#RUN_ON_STARTUP=true
RESTIC_REPOSITORY=/mnt/restic
RESTIC_BACKUP_SOURCES=/data
RESTIC_PASSWORD=7xymiWBH4c56rlBXPXbgkxF2zw3f2AGs
# Backup (exuclusive with Check and Prune)
RESTIC_BACKUP_ARGS=--tag docker-volumes --verbose
BACKUP_CRON=*/15 * * * *
#RESTIC_FORGET_ARGS=--prune --keep-last 8 --keep-daily 7 --keep-weekly 5 --keep-monthly 12 --keep-yearly 4
# Check (exuclusive with Check and Prune)
#CHECK_CRON=*/15 * * * *
#RESTIC_CHECK_ARGS=--read-data-subset=40%
# Prune (exuclusive with Check and Prune)
#PRUNE_CRON=*/15 * * * *
#RESTIC_PRUNE_ARGS=
@@ -1,5 +0,0 @@
include:
# Minecraft server
- minecraft-server/docker-compose.yml
# Backup server
- backup/docker-compose.backup.yml
@@ -1,4 +0,0 @@
https://github.com/bensuperpc/docker-minecraft-server/releases/download/Test_worlds/better-stonecutter-v1-1.zip
https://github.com/bensuperpc/docker-minecraft-server/releases/download/Test_worlds/cuttable-wood-v2-2.zip
https://github.com/bensuperpc/docker-minecraft-server/releases/download/Test_worlds/easy-bone-blocks-v1-0-1.zip
https://github.com/bensuperpc/docker-minecraft-server/releases/download/Test_worlds/more-smeltable-items-v2-0-3.zip
@@ -1,152 +0,0 @@
# Dynmap
https://dev.bukkit.org/projects/dynmap/files/4167109/download
# Dynmap-WorldGuard
# https://dev.bukkit.org/projects/dynmap-worldguard/files/latest
# v1.4-beta-1 (05-02-2022)
https://dev.bukkit.org/projects/dynmap-worldguard/files/3635984/download
# Dynmap-EssentialsX
# https://dev.bukkit.org/projects/dynmap-essentialsx/files/latest
# v1.0-beta-1 (09-02-2022)
https://dev.bukkit.org/projects/dynmap-essentialsx/files/3634752/download
# Dynmap-Structures
https://dev.bukkit.org/projects/dynmap-structures/files/3845985/download
# EssentialsX
https://github.com/EssentialsX/Essentials/releases/download/2.19.7/EssentialsX-2.19.7.jar
# EssentialsX Add-on
https://github.com/EssentialsX/Essentials/releases/download/2.19.7/EssentialsXChat-2.19.7.jar
https://github.com/EssentialsX/Essentials/releases/download/2.19.7/EssentialsXSpawn-2.19.7.jar
# https://github.com/EssentialsX/Essentials/releases/download/2.19.7/EssentialsXDiscord-2.19.7.jar
https://github.com/EssentialsX/Essentials/releases/download/2.19.7/EssentialsXProtect-2.19.7.jar
https://github.com/EssentialsX/Essentials/releases/download/2.19.7/EssentialsXAntiBuild-2.19.7.jar
# https://github.com/EssentialsX/Essentials/releases/download/2.19.7/EssentialsXGeoIP-2.19.7.jar
# Serverutils
# https://serverutils.fvdh.dev/api/v1/Bukkit/latest
https://github.com/bensuperpc/docker-minecraft-server/releases/download/Test_worlds/ServerUtils-Bukkit-3.5.3.jar
# WorldEdit, WorldGuard and FastAsyncWorldEdit
# https://dev.bukkit.org/projects/worldedit/files/latest
https://dev.bukkit.org/projects/worldguard/files/latest
https://ci.athion.net/job/FastAsyncWorldEdit/339/artifact/artifacts/FastAsyncWorldEdit-Bukkit-2.5.1-SNAPSHOT-339.jar
https://github.com/MrMicky-FR/WorldEditSelectionVisualizer/releases/download/v2.1.3/WorldEditSelectionVisualizer-2.1.3.jar
# LuckPerms
# https://download.luckperms.net/1438/bukkit/loader/LuckPerms-Bukkit-5.4.30.jar
# Vault
https://dev.bukkit.org/projects/vault/files/latest
# Advanced Portals
# https://dev.bukkit.org/projects/advanced-portals/files/latest
https://github.com/sekwah41/Advanced-Portals/releases/download/v0.9.2/Advanced-Portals-0.9.2.jar
# ProtocolLib
# https://github.com/dmulloy2/ProtocolLib/releases/download/4.8.0/ProtocolLib.jar
https://ci.dmulloy2.net/job/ProtocolLib/lastSuccessfulBuild/artifact/target/ProtocolLib.jar
# NBT-API
https://dev.bukkit.org/projects/nbt-api/files/latest
# CoreProtect
https://dev.bukkit.org/projects/coreprotect/files/latest
# Decent Holograms
# https://www.spigotmc.org/resources/decent-holograms-1-8-1-18-papi-support-no-dependencies.96927/
# https://github.com/DecentSoftware-eu/DecentHolograms/releases/download/2.7.2/DecentHolograms-2.7.2.jar
# DropHeads
# https://dev.bukkit.org/projects/dropheads/files/latest
# OpenInv
https://dev.bukkit.org/projects/openinv/files/latest
# Animated-TabList
https://dev.bukkit.org/projects/animated-tab-tablist/files/latest
# DeadChest
# https://dev.bukkit.org/projects/dead-chest/files/latest
# UberEnchant
https://dev.bukkit.org/projects/uberenchant/files/latest
# TreeAssist
# https://dev.bukkit.org/projects/tree-assist/files/latest
# Beta TreeAssist v7.3.31 (18-07-2022)
https://dev.bukkit.org/projects/tree-assist/files/3963990/download
# Shopkeepers
https://dev.bukkit.org/projects/shopkeepers/files/latest
# EconomyShopGUI
https://dev.bukkit.org/projects/economyshopgui/files/latest
# SignShop v3
# https://dev.bukkit.org/projects/signshop/files/latest
# Quickshop-reremake
# https://dev.bukkit.org/projects/quickshop-reremake/files/latest
# https://ci.codemc.io/job/PotatoCraft-Studio/job/QuickShopDynmap/7/artifact/target/QuickShop-Dynmap-1.0.jar
# CustomCrafting Advanced Custom Recipes
# https://dev.bukkit.org/projects/customcrafting-advanced-custom-recipes/files/latest
# https://dev.bukkit.org/projects/wolfyutilities/files/latest
# Insta Mine Deepslate
https://dev.bukkit.org/projects/insta-mine-deepslate/files/latest
# SkinsRestorerX
https://github.com/SkinsRestorer/SkinsRestorerX/releases/download/14.2.5/SkinsRestorer.jar
# ImageOnMap
https://dev.bukkit.org/projects/imageonmap/files/latest
# Geyser
https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/lastSuccessfulBuild/artifact/bootstrap/spigot/target/Geyser-Spigot.jar
# Floodgate
https://ci.opencollab.dev/job/GeyserMC/job/Floodgate/job/master/lastSuccessfulBuild/artifact/spigot/build/libs/floodgate-spigot.jar
# ViaVersion
# https://github.com/ViaVersion/ViaVersion/releases/download/4.3.1/ViaVersion-4.3.1.jar
# ViaBackwards
# https://github.com/ViaVersion/ViaBackwards/releases/download/4.3.0/ViaBackwards-4.3.0.jar
# PvPManager
# https://dev.bukkit.org/projects/pvpmanager/files/latest
# AuthMe Reloaded
# https://ci.codemc.io/job/AuthMe/job/AuthMeReloaded/lastSuccessfulBuild/artifact/target/AuthMe-5.6.0-SNAPSHOT.jar
# SignBoard
# https://dev.bukkit.org/projects/signboard/files/latest
# plan-player-analytics
https://github.com/plan-player-analytics/Plan/releases/download/5.5.2163/Plan-5.5-build-2163.jar
# MiniMOTD
# https://github.com/jpenilla/MiniMOTD/releases/download/v2.0.9/minimotd-universal-2.0.9.jar
# Citizens2
https://ci.citizensnpcs.co/job/Citizens2/2756/artifact/dist/target/Citizens-2.0.30-b2756.jar
# Simple voice chat [BUKKIT/SPIGOT/PAPER][1.19] Simple Voice Chat 1.19-2.2.45 (18-06-2022)
https://dev.bukkit.org/projects/simple-voice-chat/files/latest
# BKCommonLib
https://ci.mg-dev.eu/job/BKCommonLib/1454/artifact/target/BKCommonLib-1.19.3-v2-SNAPSHOT-1454.jar
# MyWorlds
https://ci.mg-dev.eu/job/MyWorlds/lastSuccessfulBuild/artifact/target/MyWorlds-1.19.3-v2-SNAPSHOT-196.jar
# PurpurExtras
https://cdn.modrinth.com/data/Hn8OHmqL/versions/w60JPGhg/PurpurExtras-1.23.0.jar
#FreedomChat
https://cdn.modrinth.com/data/MubyTbnA/versions/qGaisS0d/FreedomChat-1.3.1.jar
@@ -1,106 +0,0 @@
services:
minecraft_proxy:
image: itzg/bungeecord:latest
container_name: minecraft_proxy_server
profiles:
- minecraft_proxy
- minecraft_server
restart: on-failure:3
env_file:
- ./env/proxy.env
environment:
INIT_MEMORY: "512M"
MAX_MEMORY: "2048M"
ports:
# Server Minecraft port
- "25565:25577"
# Server Minecraft Bedrock port (GeyserMC)
#- "19132:19132/udp"
# Rcon port
#- "25576:25575"
# Plan port
# - "8806:8804"
volumes:
- minecraft_proxy_data:/server
networks:
- infra-network
mc-server:
image: itzg/minecraft-server:latest
container_name: minecraft_server
profiles:
- minecraft_server
depends_on:
- minecraft_proxy
restart: on-failure:3
ports:
# Server Minecraft port (Disable if you use proxy)
# - "25565:25565"
# Rcon port
# - "25575:25575"
# Server Minecraft Bedrock port (GeyserMC)
# - "19132:19132/udp"
# Dynmap port
# - "8123:8123"
# BlueMap port
- "8100:8100"
# Plan port
- "8804:8804"
env_file:
- ./env/server.env
- ./env/world.env
- ./env/mods_plugins.env
environment:
MAX_MEMORY: "${MAX_MEMORY:-24G}"
volumes:
- minecraft_server_data:/data
# - ./asset_links/plugins.txt:/extras/plugins.txt:ro
networks:
- infra-network
deploy:
resources:
# limits:
# cpus: '8.0'
# memory: 26G
reservations:
cpus: '0.01'
memory: 20M
rcon-web:
image: itzg/rcon:latest
container_name: minecraft_rcon_web
profiles:
- mc-web
restart: on-failure:3
depends_on:
- minecraft_server
- minecraft_proxy
environment:
RWA_USERNAME: admin
RWA_PASSWORD: admin
RWA_ADMIN: "TRUE"
# is referring to the hostname of 'minecraft_server' compose service below
RWA_RCON_HOST: minecraft_server
RWA_RCON_PASSWORD: 6hxU3Oxmh2Q8e6S9fjkdWJikRCON_PASSWORD
ports:
# web UI port
- "4326:4326"
# websocket access from UI
- "4327:4327"
volumes:
- minecraft_rcon_data:/opt/rcon-web-admin/db
networks:
- infra-network
volumes:
minecraft_server_data:
name: minecraft_server_data
minecraft_proxy_data:
name: minecraft_proxy_data
minecraft_rcon_data:
name: minecraft_rcon_data
networks:
infra-network:
driver: bridge
name: infra-network
@@ -1,34 +0,0 @@
# Disable SignLink: 39593
#KeepChunks,Chunky,Plasmo Voice Server,viaversion,viabackwards,LuckPerms,QuickShop-Reremake,KeepChunks, DecentHolograms
#SPIGET_RESOURCES=23307,81534,91064,19254,27448,28140,62575,23307,96927
# MODPACK= # MODPACK or MODS
# MODS=https://dev.bukkit.org/projects/dynmap/files/3620010/download
#MODS_FILE=/extras/plugins.txt
REMOVE_OLD_MODS=false
REMOVE_OLD_MODS_INCLUDE=*.jar,*-version.json
REMOVE_OLD_MODS_EXCLUDE=
REMOVE_OLD_MODS_DEPTH=16
# RESOURCE_PACK=
# RESOURCE_PACK_SHA1=
# Minecraft Datapack
# DATAPACKS=Terralith_v2.2_Seed_3820.zip
#DATAPACKS_FILE=/extras/datapacks.txt
#REMOVE_OLD_DATAPACKS=false
#REMOVE_OLD_DATAPACKS_INCLUDE=*.zip
# REMOVE_OLD_DATAPACKS_EXCLUDE=
#REMOVE_OLD_DATAPACKS_DEPTH=1
#RESOURCE_PACK=
#RESOURCE_PACK_SHA1=
# MODS_FORGEAPI_KEY
# MODS_FORGEAPI_FILE
# MODS_FORGEAPI_PROJECTIDS
# MODS_FORGEAPI_RELEASES
# MODS_FORGEAPI_DOWNLOAD_DEPENDENCIES
# MODS_FORGEAPI_IGNORE_GAMETYPE
# REMOVE_OLD_FORGEAPI_MODS
# REMOVE_OLD_DATAPACKS_DEPTH
# REMOVE_OLD_DATAPACKS_INCLUDE
@@ -1,14 +0,0 @@
TYPE=VELOCITY
VELOCITY_VERSION=3.5.0-SNAPSHOT
VELOCITY_BUILD_ID=593
#PLUGINS=
#SPIGET_PLUGINS=
DEBUG=false
DEBUG_HELPER=false
ENABLE_RCON=false
#RCON_PASSWORD=6hxU3Oxmh2Q8e6S9fjkdWJik
#RCON_PORT=25576
INIT_MEMORY=512M
MAX_MEMORY=1536M
#JVM_OPTS=
JVM_XX_OPTS=-XX:+UseG1GC -XX:G1HeapRegionSize=4M -XX:+UnlockExperimentalVMOptions -XX:+ParallelRefProcEnabled -XX:+AlwaysPreTouch -XX:MaxInlineLevel=15
@@ -1,81 +0,0 @@
# Base options
EULA=true
ONLINE_MODE=false
SERVER_PORT=25565
SERVER_NAME=MyServer
ICON=https://github.com/bensuperpc/docker-minecraft-server/releases/download/Test_world/icon_64x64.png
OVERRIDE_ICON=true
MOTD=A §l§cMinecraft§r §nserver
OVERRIDE_SERVER_PROPERTIES=true
ENFORCE_SECURE_PROFILE=false
# Server jar options
TYPE=PURPUR
VERSION=1.21.11
PURPUR_BUILD=2568
FORCE_REDOWNLOAD=false
BUILD_FROM_SOURCE=false
# Server options
INIT_MEMORY=2G
MAX_MEMORY=12G
EXEC_DIRECTLY=false
USE_AIKAR_FLAGS=true
USE_SIMD_FLAGS=true
# TUNE_VIRTUALIZED=true
# ENABLE_JMX=true
CONSOLE=false
GUI=false
TZ=Europe/Paris
# OPS options
OPS=Bensuperpc
# OPS_FILE=
OVERRIDE_OPS=true
#OP_PERMISSION_LEVEL=4
#FUNCTION_PERMISSION_LEVEL
# WHITELIST options
ENABLE_WHITELIST=false
OVERRIDE_WHITELIST=true
#WHITELIST=Bensuperpc
# WHITELIST_FILE=
ENFORCE_WHITELIST=false
# AUTOPAUSE options
ENABLE_AUTOPAUSE=false
AUTOPAUSE_TIMEOUT_EST=7200000
AUTOPAUSE_TIMEOUT_INIT=3600000
AUTOPAUSE_TIMEOUT_KN=480000
# AUTOSTOP options
# ENABLE_AUTOSTOP=true
# AUTOSTOP_TIMEOUT_EST
# AUTOSTOP_TIMEOUT_INIT
# AUTOSTOP_PERIOD
NETWORK_COMPRESSION_THRESHOLD=-1
LOG_TIMESTAMP=true
MAX_TICK_TIME=-1
# Time (sec) before AFK player was disconnected
PLAYER_IDLE_TIMEOUT=600
MAX_PLAYERS=32
ALLOW_FLIGHT=false
# RCON options
ENABLE_RCON=false
RCON_PASSWORD=6hxU3Oxmh2Q8e6S9fjkdWJik
RCON_PORT=25575
BROADCAST_CONSOLE_TO_OPS=true
BROADCAST_RCON_TO_OPS=true
# QUERY options
#ENABLE_QUERY=true
#QUERY_PORT=25565
# Others options
SNOOPER_ENABLED=true
ENABLE_STATUS=true
PREVIEWS_CHAT=false
#SYNC_CHUNK_WRITES=true
@@ -1,22 +0,0 @@
LEVEL=world
LEVEL_TYPE=default
# MAX_WORLD_SIZE=10000
# MAX_BUILD_HEIGHT=256
ALLOW_NETHER=true
GENERATE_STRUCTURES=true
VIEW_DISTANCE=12
SIMULATION_DISTANCE=10
ENABLE_COMMAND_BLOCK=true
ANNOUNCE_PLAYER_ACHIEVEMENTS=true
PVP=true
DIFFICULTY=hard
FORCE_GAMEMODE=false
MODE=survival
HARDCORE=false
SPAWN_PROTECTION=16
SEED=3820
# Spawn Entities Options
SPAWN_ANIMALS=true
SPAWN_MONSTERS=true
SPAWN_NPCS=true
@@ -1,51 +0,0 @@
services:
# omni-tools
omni-tools0:
image: iib0011/omni-tools:latest
container_name: omni-tools0
profiles:
- omni-tools
restart: on-failure:5
depends_on:
- caddy
networks:
- infra-network
read_only: false
security_opt:
- no-new-privileges:true
cap_drop:
- SYS_ADMIN
deploy:
resources:
limits:
cpus: '0.5'
memory: 512M
reservations:
cpus: '0.001'
memory: 20M
omni-tools1:
image: iib0011/omni-tools:latest
container_name: omni-tools1
profiles:
- omni-tools
restart: on-failure:5
depends_on:
- caddy
networks:
- infra-network
read_only: false
security_opt:
- no-new-privileges:true
cap_drop:
- SYS_ADMIN
deploy:
resources:
limits:
cpus: '0.5'
memory: 512M
reservations:
cpus: '0.001'
memory: 20M
@@ -1,42 +0,0 @@
services:
ollama:
image: ollama/ollama:latest
#platform: linux/amd64
container_name: ollama
profiles:
- open-webui
depends_on:
- caddy
restart: on-failure:5
tty: true
volumes:
- ollama:/root/.ollama
security_opt:
- no-new-privileges:true
networks:
- infra-network
open-webui:
image: ghcr.io/open-webui/open-webui:main
container_name: open-webui
profiles:
- open-webui
volumes:
- open-webui:/app/backend/data
depends_on:
- ollama
- caddy
env_file:
- ./env/open-webui.env
#environment:
# - UID=${PUID:-1000}
# - GID=${PGID:-1000}
restart: on-failure:5
networks:
- infra-network
security_opt:
- no-new-privileges:true
volumes:
ollama: {}
open-webui: {}
-16
View File
@@ -1,16 +0,0 @@
OLLAMA_BASE_URL=http://ollama:11434
#WEBUI_SECRET_KEY=
#HF_HUB_OFFLINE=1
# Disable analytics
SCARF_NO_ANALYTICS=true
DO_NOT_TRACK=true
ANONYMIZED_TELEMETRY=false
#OPENAI_API_BASE_URL=
#OPENAI_API_KEY=
# Only with stable-diffusion-webui
#ENABLE_IMAGE_GENERATION=true
#AUTOMATIC1111_BASE_URL=http://stable-diffusion-webui:7860
#IMAGE_SIZE=64x64
#IMAGE_STEPS=3
@@ -1 +0,0 @@
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHVtzpnPr0Boy+bUbL+viOYfqeetDZF6Hu40EwNLXNb0 bensuperpc@gmail.com
@@ -1,91 +0,0 @@
services:
# openssh
openssh:
image: linuxserver/openssh-server:latest
container_name: openssh
profiles:
- openssh
restart: on-failure:5
env_file:
- ./env/openssh.env
environment:
- PUID=${PUID:-1000}
- PGID=${PGID:-1000}
volumes:
- openssh_config:/config:rw
- ./config/authorized_keys:/authorized_ssh_keys:ro
- public_data:/public_data:rw
- private_data:/private_data:rw
- caddy_data:/caddy_data:rw
- caddy_config:/caddy_config:rw
- caddy_backup:/caddy_backup:rw
- 7daystodie_backup:/7daystodie_backup:rw
- 7daystodie_server_save:/7daystodie_server_save:rw
- 7daystodie_server_config_lgsm:/7daystodie_server_config_lgsm:rw
- 7daystodie_server_file:/7daystodie_server_file:rw
- 7daystodie_server_log:/7daystodie_server_log:rw
- satisfactory_backup:/satisfactory_backup:rw
- satisfactory_server_config:/satisfactory_server_config:rw
- minecraft_server_backup:/minecraft_server_backup:rw
- minecraft_server_data:/minecraft_server_data:rw
- minecraft_proxy_data:/minecraft_proxy_data:rw
- minecraft_rcon_data:/minecraft_rcon_data:rw
- forgejo_data:/forgejo_data:rw
- forgejo_db:/forgejo_db:rw
- teamfortress2_backup:/teamfortress2_backup:rw
- teamfortress2_data:/teamfortress2_data:rw
networks:
- infra-network
security_opt:
- no-new-privileges:false
ports:
- 2222:2222
volumes:
openssh_config:
name: openssh_config
public_data:
name: public_data
private_data:
name: private_data
caddy_data:
name: caddy_data
caddy_config:
name: caddy_config
caddy_backup:
name: caddy_backup
# 7daystodie-server
7daystodie_backup:
name: 7daystodie_backup
7daystodie_server_save:
name: 7daystodie_server_save
7daystodie_server_config_lgsm:
name: 7daystodie_server_config_lgsm
7daystodie_server_file:
name: 7daystodie_server_file
7daystodie_server_log:
name: 7daystodie_server_log
# satisfactory-server
satisfactory_backup:
name: satisfactory_backup
satisfactory_server_config:
name: satisfactory_server_config
# minecraft-server
minecraft_server_backup:
name: minecraft_server_backup
minecraft_server_data:
name: minecraft_server_data
minecraft_proxy_data:
name: minecraft_proxy_data
minecraft_rcon_data:
name: minecraft_rcon_data
# teamfortress2
teamfortress2_backup:
name: teamfortress2_backup
teamfortress2_data:
name: teamfortress2_data
# forgejo
forgejo_data:
name: forgejo_data
forgejo_db:
name: forgejo_db
-15
View File
@@ -1,15 +0,0 @@
TZ=Etc/UTC
SUDO_ACCESS=true
PASSWORD_ACCESS=false
DOCKER_MODS=linuxserver/mods:openssh-server-rsync
#PUBLIC_KEY_URL=https://github.com/bensuperpc.keys
PUBLIC_KEY_DIR=/authorized_ssh_keys
USER_NAME=admin
USER_PASSWORD=it47mnLJIhNFspkYQo70zJsAYX7n0DSX
#PUBLIC_KEY=yourpublickey
#PUBLIC_KEY_FILE=/path/to/file
#PUBLIC_KEY_DIR=/path/to/directory/containing/_only_/pubkeys
#PUBLIC_KEY_URL=https://github.com/username.keys
#USER_PASSWORD_FILE=/path/to/file
#LOG_STDOUT=
@@ -1,35 +0,0 @@
services:
# picoshare
picoshare:
image: mtlynch/picoshare:latest
container_name: picoshare
profiles:
- picoshare
restart: on-failure:5
depends_on:
- caddy
env_file:
- ./env/picoshare.env
volumes:
- picoshare_data:/data
networks:
- infra-network
security_opt:
- no-new-privileges:true
read_only: false
cap_drop:
- SYS_ADMIN
# tmpfs:
# - /tmp
deploy:
resources:
limits:
cpus: '0.5'
memory: 512M
reservations:
cpus: '0.001'
memory: 20M
volumes:
picoshare_data:
name: picoshare_data
-3
View File
@@ -1,3 +0,0 @@
PS_SHARED_SECRET=CBuS4DJLqIe93xF1KGYRrnhxUFBqLD2n
PORT=4001
PS_BEHIND_PROXY=true

Some files were not shown because too many files have changed in this diff Show More