feat(chaotic): switch to chaotic-v4

docker-compose/chaotic-v4/docker-compose.yml

@@ -87,34 +87,12 @@ services:
             },
             "garuda": {
                 "url": "https://gitlab.com/garuda-linux/pkgbuilds"
-            },
-            "garuda-aur": {
-                "url": "https://gitlab.com/garuda-linux/pkgbuilds-aur"
             }
         }
       PACKAGE_TARGET_REPOS: >-
         {
             "chaotic-aur": {
                 "extra_repos": [
-                    {
-                        "name": "chaotic-aur",
-                        "servers": [
-                            "https://builds.garudalinux.org/chaotic-v4/x86_64"
-                        ]
-                    }
-                ],
-                "extra_keyrings": [
-                    "https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst"
-                ]
-            },
-            "garuda": {
-                "extra_repos": [
-                    {
-                        "name": "garuda",
-                        "servers": [
-                            "https://builds.garudalinux.org/repos/garuda/x86_64"
-                        ]
-                    },
                     {
                         "name": "chaotic-aur",
                         "servers": [
@@ -126,7 +104,7 @@ services:
                     "https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst"
                 ]
             },
-            "garuda-aur": {
+            "garuda": {
                 "extra_repos": [
                     {
                         "name": "garuda",
@@ -157,11 +135,6 @@ services:
                 "id": "48461689",
                 "token": "${GITLAB_TOKEN:-?err}",
                 "check_name": "garuda: %pkgbase%"
-            },
-            "garuda-aur": {
-                "id": "52092196",
-                "token": "${GITLAB_TOKEN:-?err}",
-                "check_name": "garuda: %pkgbase%"
             }
         }
     volumes:
@@ -170,7 +143,7 @@ services:
       - /srv/http/repos:/repo_root
     extra_hosts:
       - "host.docker.internal:host-gateway"
-    ports: ["8080:8080", "3030:3030"]
+    ports: ["127.0.0.1:8080:8080", "127.0.0.1:3030:3030"]
 
   # Metadata for the Chaotic website
   caur-backend:
@@ -186,7 +159,7 @@ services:
       TELEGRAM_API_HASH: ${TELEGRAM_API_HASH:-?err}
       TELEGRAM_API_ID: ${TELEGRAM_API_ID:-?err}
       TELEGRAM_DB_ENCRYPTION_KEY: ${TELEGRAM_DB_ENCRYPTION_KEY:-?err}
-    ports: ["3000:3000"]
+    ports: ["127.0.0.1:3000:3000"]
     volumes: ["./tdlib:/app/tdlib"]
 
   # Automated container updates

docker-compose/gitlab-runner/docker-compose.yml

@@ -27,6 +27,6 @@ services:
     image: containrrr/watchtower:1.7.1
     container_name: watchtower
     command:
-      --cleanup gitlab-runner-chaotic gitlab-runner-garuda gitlab-runner-dind
-    volumes: [/var/run/docker.sock:/var/run/docker.sock]
+      --cleanup watchtower gitlab-runner-chaotic gitlab-runner-garuda gitlab-runner-dind
+    volumes: ["/var/run/docker.sock:/var/run/docker.sock"]
     restart: always

docs/src/SUMMARY.md

@@ -23,7 +23,6 @@
   - [mastodon](./nixos-containers/mastodon.md)
   - [mongodb](./nixos-containers/mongodb.md)
   - [postgres](./nixos-containers/postgres.md)
-  - [temeraire](./nixos-containers/temeraire.md)
   - [web-front](./nixos-containers/web-front.md)
 - [garuda-build](./hosts/garuda-build.md)
 - [garuda-mail](./hosts/garuda-mail.md)

docs/src/hosts/immortalis.md

@@ -28,7 +28,6 @@ lemmy          container systemd-nspawn nixos 24.11   10.0.5.120…
 mastodon       container systemd-nspawn nixos 24.11   10.0.5.80…
 mongodb        container systemd-nspawn nixos 24.11   10.0.5.60…
 postgres       container systemd-nspawn nixos 24.11   10.0.5.50…
-temeraire      container systemd-nspawn nixos 24.11   10.0.5.20…
 web-front      container systemd-nspawn nixos 24.11   10.0.5.10…
 ```
 
@@ -37,7 +36,7 @@ We are seeing:
 - 1 ISO builder (`iso-runner`)
 - 1 reverse proxy serving all the websites and services (`web-front`)
 - 2 Docker dedicated nspawn containers (`docker` & `docker-proxied`)
-- 3 Chaotic-AUR builders ( `chaotic-v4`, `github-runner` & `temeraire`)
+- 3 Chaotic-AUR builders ( `chaotic-v4`, `github-runner` )
 - 6 app dedicated containers (`forum`, `lemmy`, `mastodon`, `mongodb` & `postgres`)
 
 ### Connecting to the server
@@ -46,7 +45,6 @@ After connecting to the host via `ssh -p 666 [email protected]`, containers
 running `nixos-container login $containername`, eg. `nixos-container login web-front`. Some containers may also be
 connected via SSH using the following ports:
 
-- 22: `temeraire` (needs to be 22 to allow pushing packages to the main Chaotic-AUR node via rsync)
 - 224: `forum`
 - 225: `docker`
 - 227: `iso-runner`
@@ -63,24 +61,6 @@ to deploy those with the rest of the system. Secrets are handled via our secret
 submodule `secret` (private repo with `ansible-vault` encrypted files) and `garuda-lib` (see secrets section). Those
 contain a `docker-compose` directory in which the `.env` files for the `docker-compose.yml` are stored.
 
-### Chaotic-AUR / repository
-
-Our repository leverages [Chaotic-AUR's](https://aur.chaotic.cx) [toolbox](https://github.com/chaotic-aur/toolbox) to
-provide the main node for the `[chaotic-aur]` repository as well as two more instances building the `[garuda]`
-and `[chaotic-kde]` repositories. Users of the `chaotic_op` group may build packages on the corresponding
-nixos-container via the [chaotic](https://github.com/chaotic-aur/toolbox/blob/main/README.md) command:
-
-```sh
-chaotic get $package # pull PKGBUILD
-chaotic mkd $package # build package in the previously cloned directory
-chaotic bump $package # increment pkgver of $package by 0.1 to allow a rebuild
-chaotic rm $package # remove the package from the repository
-```
-
-Further information may be obtained by clicking `chaotic` seen above. The corresponding builders are:
-
-- `[chaotic-aur]`: `temeraire`
-
 ### Squid proxy
 
 Squid is being installed on the host machine to proxy outgoing requests via random IPv6 addresses of the /64 subnet