Remove Gitea

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>

.gitea/workflows/gitea-ci.yaml

@@ -1,15 +0,0 @@
-name: Build And Test
-run-name: ${{ gitea.actor }} is runs ci pipeline
-on: [ push ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - run: ls
-publish:
-    runs-on: cth-ubuntu-latest
-    needs: build
-    if: gitea.ref == 'refs/heads/main'
-    steps:
-      - run: ls

.github/workflows/main.yml

@@ -22,7 +22,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: "Checkout Code"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: "recursive"
           fetch-depth: 0

.github/workflows/submodule-update.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Checkout Code"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           token: ${{ secrets.CI_TOKEN }}
           repository: ${{ github.repository }}

DockerCompose.mk

@@ -15,9 +15,14 @@ PROJECT_DIRECTORY ?= infrastructure
 
 DOCKER_EXEC ?= docker
 
-DOCKER_PROFILES ?= main_infrastructure
+CONFIG_DIRECTORY ?= presets
+CONFIG_FILES ?= $(addprefix $(CONFIG_DIRECTORY)/,$(addsuffix .conf,$(CONFIGS)))
+include $(CONFIG_FILES)
 
-PROFILE_CMD ?= $(addprefix --profile ,$(DOCKER_PROFILES))
+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)
@@ -32,40 +37,20 @@ DOCKER_COMPOSE_COMMAND ?= $(ENV_ARG_VAR) $(DOCKER_EXEC) compose $(COMPOSE_DIR) $
 .PHONY: build all
 all: start
 
-.PHONY: build
+GENERIC_TARGETS := build down up run config logs pull images start restart stop
-build:
-	$(DOCKER_COMPOSE_COMMAND) build
 
-.PHONY: start
+.PHONY: $(GENERIC_TARGETS)
-start:
+$(GENERIC_TARGETS):
+	$(DOCKER_COMPOSE_COMMAND) $@
+
+.PHONY: start-detached
+start-detached:
 	$(DOCKER_COMPOSE_COMMAND) up -d
 
-.PHONY: start-at
-start-at:
-	$(DOCKER_COMPOSE_COMMAND) up
-
 .PHONY: no-start
 no-start:
 	$(DOCKER_COMPOSE_COMMAND) up --no-start
 
-.PHONY: check
-check:
-	$(DOCKER_COMPOSE_COMMAND) config
-
-.PHONY: stop
-stop: down
-
-.PHONY: down
-down:
-	$(DOCKER_COMPOSE_COMMAND) down
-
-.PHONY: restart
-restart: stop start
-
-.PHONY: logs
-logs:
-	$(DOCKER_COMPOSE_COMMAND) logs
-
 .PHONY: state
 state:
 	$(DOCKER_COMPOSE_COMMAND) ps
@@ -75,10 +60,6 @@ state:
 volumes:
 	$(DOCKER_COMPOSE_COMMAND) config --volumes
 
-.PHONY: image-update
-image-update:
-	$(DOCKER_COMPOSE_COMMAND) pull
-
 .PHONY: git-update
 git-update: 
 #	git submodule update --init --recursive --remote

Makefile

@@ -11,29 +11,21 @@
 #//                                                          //
 #//////////////////////////////////////////////////////////////
 
-ADMIN_SERVICES := openssh uptime-kuma
+#ADMIN_SERVICES := openssh
+# uptime-kuma
 #BLOG_SERVICES := wordpress
-#7DAYS_TO_DIE_SERVICES := 7daystodie_server 7daystodie_backup
-#MINECRAFT_SERVICES := minecraft_server minecraft_backup
-#SATISFACTORY_SERVICES := satisfactory_server satisfactory_backup
-TEAM_FORTRESS_SERVICES := teamfortress2_server
-# teamfortress2_backup
-# gitea gitea-runner
 #IA_SERVICES := open-webui
-SHARING_SERVICES := privatebin
+#SHARING_SERVICES := privatebin
 # jellyfin
 # psitransfer picoshare projectsend dufs syncthing
-TORRENTS_SERVICES := qbittorrent
+#UTILS_SERVICES := it-tools omni-tools cyberchef
-# transmission
+# homepage
-UTILS_SERVICES := it-tools omni-tools cyberchef
 # stirlingpdf
-MAIN_SERVICES := main_infrastructure caddy homepage
 
 PROJECT_DIRECTORY := infrastructure
+CONFIG_DIRECTORY := presets
 
-DOCKER_PROFILES := $(MAIN_SERVICES) $(ADMIN_SERVICES) $(BLOG_SERVICES) \
+CONFIGS := torrent
-	$(7DAYS_TO_DIE_SERVICES) $(MINECRAFT_SERVICES) $(SATISFACTORY_SERVICES) \
+#DOCKER_PROFILES := 
-	$(GIT_SERVICES) $(IA_SERVICES) $(SHARING_SERVICES) \
-	$(TORRENTS_SERVICES) $(UTILS_SERVICES)
 
 include DockerCompose.mk

README.md

@@ -14,7 +14,6 @@ If you have any **questions** or **suggestions**, feel free to open an issue or
 - [x] Docker / docker-compose
 - [x] Wordpress (Via FASTCGI/caddy)
 - [x] Jellyfin (Media server)
-- [x] Gitea (Git server)
 - [x] Forgejo (Git server, fork of Gitea)
 - [x] Uptime Kuma (Monitoring)
 - [x] qbittorrent and transmission (Torrent client/server)
@@ -56,7 +55,6 @@ List of ports used by the services in this infrastructure:
 | 443         | Caddy         | HTTPS traffic     |
 | 22          | Forgejo       | Git/SSH access    |
 | 2222        | OpenSSH       | Global SSH access |
-| 5555        | Gitea         | Git/SSH access    |
 | 7777        | Satisfactory  | Game server port  |
 | 25565       | Minecraft     | Game server port  |
 | 26900       | 7 Days to Die | Game server port  |
@@ -103,7 +101,6 @@ And then, caddy will generate the certificate for you and renew it automatically
 | [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                                        |
-| [gitea.bensuperpc.org](https://gitea.bensuperpc.org)               | Sub  | Gitea for git                                                |
 | [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                                           |
@@ -162,24 +159,6 @@ For [wordpress_backup.env](infrastructure/services/wordpress/env/wordpress_backu
 RESTIC_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
 ```
 
-#### Gitea
-
-For [gitea.env](infrastructure/services/gitea/env/gitea.env) file, you need to change the password(s) and user for the database.
-
-```sh
-GITEA__database__USER=bensuperpc
-GITEA__database__PASSWD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j
-GITEA__security__SECRET_KEY=ykcZt23an1E4lFHWvrCKdAyt16WAiK9c
-```
-
-For [gitea_db.env](infrastructure/services/gitea/env/gitea_db.env) file, you need to change the password(s) and user for the database.
-
-```sh
-MARIADB_ROOT_PASSWORD=xpc4zIhHZzWKqVHcjBu4aW6aS7jG8d7X
-MARIADB_USER=bensuperpc
-MARIADB_PASSWORD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j
-```
-
 #### PsiTransfer
 
 For [psitransfer.env](infrastructure/services/psitransfer/env/psitransfer.env) file, you need to change the secret key.

infrastructure/docker-compose.yml

@@ -7,8 +7,6 @@ include:
   - services/caddy/docker-compose.caddy.yml
 # Dufs
   - services/dufs/docker-compose.dufs.yml
-# Gitea
-  - services/gitea/docker-compose.gitea.yml
 # Forgejo
   - services/forgejo/docker-compose.forgejo.yml
 # Homepage

infrastructure/services/caddy/config/website/gitea.caddy

@@ -1,3 +0,0 @@
-gitea.{$MAIN_DOMAIN} {
-	reverse_proxy gitea:3000
-}

infrastructure/services/caddy/docker-compose.caddy.yml

@@ -1,7 +1,7 @@
 services:
   # Caddy
   caddy:
-    image: caddy:latest
+    image: bensuperpc/caddy-l4:latest
     container_name: caddy
     profiles:
       - caddy

infrastructure/services/forgejo/docker-compose.forgejo.yml

@@ -1,7 +1,7 @@
 services:
   # forgejo
   forgejo:
-    image: codeberg.org/forgejo/forgejo:12-rootless
+    image: codeberg.org/forgejo/forgejo:13-rootless
     container_name: forgejo
     profiles:
       - forgejo

infrastructure/services/gitea/config/gitea_runner/config.yaml

@@ -1,98 +0,0 @@
-# Example configuration file, it's safe to copy this as the default config file without any modification.
-
-# You don't have to copy this file to your instance,
-# just run `./act_runner generate-config > config.yaml` to generate a config file.
-
-log:
-  # The level of logging, can be trace, debug, info, warn, error, fatal
-  level: info
-
-runner:
-  # Where to store the registration result.
-  file: .runner
-  # Execute how many tasks concurrently at the same time.
-  capacity: 1
-  # Extra environment variables to run jobs.
-  envs:
-    A_TEST_ENV_NAME_1: a_test_env_value_1
-    A_TEST_ENV_NAME_2: a_test_env_value_2
-  # Extra environment variables to run jobs from a file.
-  # It will be ignored if it's empty or the file doesn't exist.
-  env_file: .env
-  # The timeout for a job to be finished.
-  # Please note that the Gitea instance also has a timeout (3h by default) for the job.
-  # So the job could be stopped by the Gitea instance if it's timeout is shorter than this.
-  timeout: 3h
-  # Whether skip verifying the TLS certificate of the Gitea instance.
-  insecure: false
-  # The timeout for fetching the job from the Gitea instance.
-  fetch_timeout: 5s
-  # The interval for fetching the job from the Gitea instance.
-  fetch_interval: 2s
-  # The labels of a runner are used to determine which jobs the runner can run, and how to run them.
-  # Like: "macos-arm64:host" or "ubuntu-latest:docker://gitea/runner-images:ubuntu-latest"
-  # Find more images provided by Gitea at https://gitea.com/gitea/runner-images .
-  # If it's empty when registering, it will ask for inputting labels.
-  # If it's empty when execute `daemon`, will use labels in `.runner` file.
-  labels:
-    - "ubuntu-latest:docker://gitea/runner-images:ubuntu-latest"
-    - "ubuntu-22.04:docker://gitea/runner-images:ubuntu-22.04"
-    - "ubuntu-20.04:docker://gitea/runner-images:ubuntu-20.04"
-
-cache:
-  # Enable cache server to use actions/cache.
-  enabled: true
-  # The directory to store the cache data.
-  # If it's empty, the cache data will be stored in $HOME/.cache/actcache.
-  dir: ""
-  # The host of the cache server.
-  # It's not for the address to listen, but the address to connect from job containers.
-  # So 0.0.0.0 is a bad choice, leave it empty to detect automatically.
-  host: ""
-  # The port of the cache server.
-  # 0 means to use a random available port.
-  port: 0
-  # The external cache server URL. Valid only when enable is true.
-  # If it's specified, act_runner will use this URL as the ACTIONS_CACHE_URL rather than start a server by itself.
-  # The URL should generally end with "/".
-  external_server: ""
-
-container:
-  # Specifies the network to which the container will connect.
-  # Could be host, bridge or the name of a custom network.
-  # If it's empty, act_runner will create a network automatically.
-  network: ""
-  # Whether to use privileged mode or not when launching task containers (privileged mode is required for Docker-in-Docker).
-  privileged: false
-  # And other options to be used when the container is started (eg, --add-host=my.gitea.url:host-gateway).
-  options:
-  # The parent directory of a job's working directory.
-  # NOTE: There is no need to add the first '/' of the path as act_runner will add it automatically. 
-  # If the path starts with '/', the '/' will be trimmed.
-  # For example, if the parent directory is /path/to/my/dir, workdir_parent should be path/to/my/dir
-  # If it's empty, /workspace will be used.
-  workdir_parent:
-  # Volumes (including bind mounts) can be mounted to containers. Glob syntax is supported, see https://github.com/gobwas/glob
-  # You can specify multiple volumes. If the sequence is empty, no volumes can be mounted.
-  # For example, if you only allow containers to mount the `data` volume and all the json files in `/src`, you should change the config to:
-  # valid_volumes:
-  #   - data
-  #   - /src/*.json
-  # If you want to allow any volume, please use the following configuration:
-  # valid_volumes:
-  #   - '**'
-  valid_volumes: []
-  # overrides the docker client host with the specified one.
-  # If it's empty, act_runner will find an available docker host automatically.
-  # If it's "-", act_runner will find an available docker host automatically, but the docker host won't be mounted to the job containers and service containers.
-  # If it's not empty or "-", the specified docker host will be used. An error will be returned if it doesn't work.
-  docker_host: ""
-  # Pull docker image(s) even if already present
-  force_pull: true
-  # Rebuild docker image(s) even if already present
-  force_rebuild: false
-
-host:
-  # The parent directory of a job's working directory.
-  # If it's empty, $HOME/.cache/act/ will be used.
-  workdir_parent:

infrastructure/services/gitea/docker-compose.gitea.yml

@@ -1,73 +0,0 @@
-services:
-  # Gitea
-  gitea:
-    image: gitea/gitea:latest-rootless
-    container_name: gitea
-    profiles:
-      - gitea
-    restart: on-failure:5
-    depends_on:
-      - database_gitea
-      - caddy
-    ports:
-      - "5555:5555"
-    env_file:
-      - ./env/gitea.env
-    volumes:
-      - gitea_data:/var/lib/gitea
-      - gitea_config:/etc/gitea
-      - /etc/timezone:/etc/timezone:ro
-      - /etc/localtime:/etc/localtime:ro
-    networks:
-      - infra-network
-    security_opt:
-      - no-new-privileges:true
-  
-  # Database gitea
-  database_gitea:
-    image: mariadb:latest
-    container_name: database_gitea
-    profiles:
-      - gitea
-    depends_on:
-      - caddy
-    restart: on-failure:5
-    volumes:
-      - gitea_db:/var/lib/mysql:rw
-    env_file:
-      - ./env/gitea_db.env
-    command: '--default-authentication-plugin=mysql_native_password'
-    networks:
-      - infra-network
-    security_opt:
-      - no-new-privileges:true
-
-  # Gitea-runner
-  gitea-runner:
-    image: gitea/act_runner:latest
-    container_name: gitea-runner
-    profiles:
-      - gitea-runner
-    depends_on:
-      - gitea
-    restart: on-failure:5
-    env_file:
-      - ./env/gitea-runner.env
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - gitea_runner:/data
-      - ./config/gitea_runner/config.yaml:/config.yaml:ro
-    networks:
-      - infra-network
-    security_opt:
-      - no-new-privileges:true
-
-volumes:
-  gitea_data:
-    name: gitea_data
-  gitea_config:
-    name: gitea_config
-  gitea_db:
-    name: gitea_db
-  gitea_runner:
-    name: gitea_runner

infrastructure/services/gitea/env/gitea-runner.env

@@ -1,5 +0,0 @@
-GITEA_INSTANCE_URL=https://git.bensuperpc.org
-GITEA_RUNNER_REGISTRATION_TOKEN=TBGzS0m823Xk732zRqjrbcSWFTEPajj5V5OFzXWP
-GITEA_RUNNER_NAME=runner-1
-#GITEA_RUNNER_LABELS=
-CONFIG_FILE=/config.yaml

infrastructure/services/gitea/env/gitea.env

@@ -1,15 +0,0 @@
-USER_UID=1000
-USER_GID=1000
-GITEA__database__DB_TYPE=mysql
-GITEA__database__HOST=database_gitea:3306
-GITEA__database__NAME=gitea
-GITEA__database__USER=bensuperpc
-GITEA__database__PASSWD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j
-GITEA__security__SECRET_KEY=ykcZt23an1E4lFHWvrCKdAyt16WAiK9c
-#GITEA__security__INTERNAL_TOKEN=
-GITEA__server__DOMAIN=git.bensuperpc.org
-GITEA__server__SSH_DOMAIN=git.bensuperpc.org
-GITEA__server__HTTP_PORT=3000
-GITEA__server__SSH_LISTEN_PORT=5555
-GITEA__server__SSH_PORT=5555
-GITEA__server__ROOT_URL=https://git.bensuperpc.org

infrastructure/services/gitea/env/gitea_db.env

@@ -1,4 +0,0 @@
-MARIADB_ROOT_PASSWORD=xpc4zIhHZzWKqVHcjBu4aW6aS7jG8d7X
-MARIADB_USER=bensuperpc
-MARIADB_PASSWORD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j
-MARIADB_DATABASE=gitea

infrastructure/services/homepage/config/services.yaml

@@ -96,12 +96,6 @@
         description: StirlingPDF
         ping: stirlingpdf.bensuperpc.org
         container: stirlingpdf
-    - gitea:
-        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/gitea.png
-        href: https://gitea.bensuperpc.org/
-        description: Gitea
-        ping: gitea.bensuperpc.org
-        container: gitea
     - forgejo:
         icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/forgejo.png
         href: https://forgejo.bensuperpc.org/

infrastructure/services/main/docker-compose.main.yml

@@ -28,7 +28,3 @@ networks:
   infra-network:
     driver: bridge
     name: infra-network
-  intern-network:
-    driver: bridge
-    internal: true
-    name: intern-network

infrastructure/services/openssh/docker-compose.openssh.yml

@@ -33,9 +33,6 @@ services:
       - forgejo_data:/forgejo_data:rw
       - forgejo_config:/forgejo_config:rw
       - forgejo_db:/forgejo_db:rw
-      - gitea_data:/gitea_data:rw
-      - gitea_config:/gitea_config:rw
-      - gitea_db:/gitea_db:rw
       - teamfortress2_backup:/teamfortress2_backup:rw
       - teamfortress2_data:/teamfortress2_data:rw
 
@@ -95,10 +92,3 @@ volumes:
     name: forgejo_config
   forgejo_db:
     name: forgejo_db
-# gitea
-  gitea_data:
-    name: gitea_data
-  gitea_config:
-    name: gitea_config
-  gitea_db:
-    name: gitea_db

infrastructure/services/qbittorrent/env/qbittorrent.env

@@ -1,3 +1,5 @@
 TZ=Etc/UTC
 WEBUI_PORT=8080
-TORRENTING_PORT=6881
+TORRENTING_PORT=6881
+# Use alternative WebUI: /vuetorrent
+DOCKER_MODS=ghcr.io/vuetorrent/vuetorrent-lsio-mod:latest

presets/7dtd.conf

@@ -0,0 +1 @@
+DOCKER_PROFILES += 7daystodie_server 7daystodie_backup

presets/forgejo.conf

@@ -0,0 +1,2 @@
+DOCKER_PROFILES += main_infrastructure caddy
+DOCKER_PROFILES += forgejo forgejo-runner

presets/minecraft.conf

@@ -0,0 +1 @@
+DOCKER_PROFILES += minecraft_server minecraft_backup

presets/satisfactory.conf

@@ -0,0 +1 @@
+DOCKER_PROFILES += satisfactory_server satisfactory_backup

presets/tf2.conf

@@ -0,0 +1,2 @@
+DOCKER_PROFILES += teamfortress2_server
+# teamfortress2_backup

presets/torrent.conf

@@ -0,0 +1,3 @@
+DOCKER_PROFILES += main_infrastructure caddy
+DOCKER_PROFILES += qbittorrent openssh
+# transmission

presets/utils.conf

@@ -0,0 +1,3 @@
+DOCKER_PROFILES += main_infrastructure caddy homepage
+DOCKER_PROFILES += it-tools omni-tools cyberchef
+DOCKER_PROFILES += qbittorrent

tools/docker_volumes_export.sh

@@ -40,10 +40,6 @@ volumes=(
     transmission_watch
     privatebin_data
     psitransfer_data
-#    gitea_db
-#    gitea_data
-#    gitea_runner
-#    gitea_config
     jellyfin_config
     picoshare_data
     forgejo_data