diff --git a/.gitea/workflows/gitea-ci.yaml b/.gitea/workflows/gitea-ci.yaml deleted file mode 100644 index ff7d9d9..0000000 --- a/.gitea/workflows/gitea-ci.yaml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/README.md b/README.md index 95c6a23..fbffbbd 100644 --- a/README.md +++ b/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. diff --git a/infrastructure/docker-compose.yml b/infrastructure/docker-compose.yml index c302200..edfd998 100644 --- a/infrastructure/docker-compose.yml +++ b/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 diff --git a/infrastructure/services/caddy/config/website/gitea.caddy b/infrastructure/services/caddy/config/website/gitea.caddy deleted file mode 100644 index 16f1d23..0000000 --- a/infrastructure/services/caddy/config/website/gitea.caddy +++ /dev/null @@ -1,3 +0,0 @@ -gitea.{$MAIN_DOMAIN} { - reverse_proxy gitea:3000 -} diff --git a/infrastructure/services/forgejo/docker-compose.forgejo.yml b/infrastructure/services/forgejo/docker-compose.forgejo.yml index 5187ed4..75558a1 100644 --- a/infrastructure/services/forgejo/docker-compose.forgejo.yml +++ b/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 diff --git a/infrastructure/services/gitea/config/gitea_runner/config.yaml b/infrastructure/services/gitea/config/gitea_runner/config.yaml deleted file mode 100644 index 648db96..0000000 --- a/infrastructure/services/gitea/config/gitea_runner/config.yaml +++ /dev/null @@ -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: diff --git a/infrastructure/services/gitea/docker-compose.gitea.yml b/infrastructure/services/gitea/docker-compose.gitea.yml deleted file mode 100644 index 74fa791..0000000 --- a/infrastructure/services/gitea/docker-compose.gitea.yml +++ /dev/null @@ -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 diff --git a/infrastructure/services/gitea/env/gitea-runner.env b/infrastructure/services/gitea/env/gitea-runner.env deleted file mode 100644 index 814f533..0000000 --- a/infrastructure/services/gitea/env/gitea-runner.env +++ /dev/null @@ -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 \ No newline at end of file diff --git a/infrastructure/services/gitea/env/gitea.env b/infrastructure/services/gitea/env/gitea.env deleted file mode 100644 index c7e1388..0000000 --- a/infrastructure/services/gitea/env/gitea.env +++ /dev/null @@ -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 \ No newline at end of file diff --git a/infrastructure/services/gitea/env/gitea_db.env b/infrastructure/services/gitea/env/gitea_db.env deleted file mode 100644 index 7cf17f2..0000000 --- a/infrastructure/services/gitea/env/gitea_db.env +++ /dev/null @@ -1,4 +0,0 @@ -MARIADB_ROOT_PASSWORD=xpc4zIhHZzWKqVHcjBu4aW6aS7jG8d7X -MARIADB_USER=bensuperpc -MARIADB_PASSWORD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j -MARIADB_DATABASE=gitea \ No newline at end of file diff --git a/infrastructure/services/homepage/config/services.yaml b/infrastructure/services/homepage/config/services.yaml index 9d9da3d..97008a0 100644 --- a/infrastructure/services/homepage/config/services.yaml +++ b/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/ diff --git a/infrastructure/services/main/docker-compose.main.yml b/infrastructure/services/main/docker-compose.main.yml index e6e893a..6079f27 100644 --- a/infrastructure/services/main/docker-compose.main.yml +++ b/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 diff --git a/infrastructure/services/openssh/docker-compose.openssh.yml b/infrastructure/services/openssh/docker-compose.openssh.yml index be73f8b..3a3af40 100644 --- a/infrastructure/services/openssh/docker-compose.openssh.yml +++ b/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 \ No newline at end of file diff --git a/presets/forgejo.conf b/presets/forgejo.conf index e35b564..55641ca 100644 --- a/presets/forgejo.conf +++ b/presets/forgejo.conf @@ -1,3 +1,2 @@ DOCKER_PROFILES += main_infrastructure caddy DOCKER_PROFILES += forgejo forgejo-runner -# DOCKER_PROFILES += gitea gitea-runner diff --git a/tools/docker_volumes_export.sh b/tools/docker_volumes_export.sh index 2ac6dd7..1f8398d 100755 --- a/tools/docker_volumes_export.sh +++ b/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