Skip to content

Commit

Permalink
refactor(flake): Full system update, remove repo container, switch ga…
Browse files Browse the repository at this point in the history 
…ruda repo to chaotic-v4

Co-authored-by: Nico <[email protected]>
  • Loading branch information
@JustTNE @dr460nf1r3
JustTNE and dr460nf1r3 committed Feb 4, 2024
1 parent d85d8a1 commit 702104f
Show file tree
Hide file tree
Showing 12 changed files with 112 additions and 237 deletions.
6 changes: 3 additions & 3 deletions docker-compose/all-in-one/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ services:

# Password vault
bitwarden:
image: vaultwarden/server:1.30.1
image: vaultwarden/server:1.30.3
container_name: bitwarden
volumes: [./bitwarden:/data]
ports: [8081:80]
Expand Down Expand Up @@ -136,7 +136,7 @@ services:

# Matrix homeserver
matrix:
image: matrixdotorg/synapse:v1.99.0
image: matrixdotorg/synapse:v1.100.0
container_name: matrix
volumes: [./matrix/matrix:/data]
ports: [8008:8008]
Expand All @@ -163,7 +163,7 @@ services:

# Matrix web client
matrix_web:
image: vectorim/element-web:v1.11.55
image: vectorim/element-web:v1.11.57
container_name: element_web
depends_on: [matrix]
volumes: [./matrix/element/config.json:/app/config.json]
Expand Down
34 changes: 17 additions & 17 deletions docs/src/hosts/immortalis.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,43 +9,43 @@ All directories containing important data were mapped to `/data_1` and `/data_2`
The current line-up looks as follows:

```sh
nico@immortalis ~ (main)> machinectl
nico@immortalis ~> machinectl
MACHINE CLASS SERVICE OS VERSION ADDRESSES
chaotic-kde container systemd-nspawn nixos 23.11 10.0.5.90
docker container systemd-nspawn nixos 23.11 10.0.5.100
docker-proxied container systemd-nspawn nixos 23.11 10.0.5.110
forum container systemd-nspawn nixos 23.11 10.0.5.70
github-runner container systemd-nspawn nixos 23.11 10.0.5.130
iso-runner container systemd-nspawn nixos 23.11 10.0.5.40
lemmy container systemd-nspawn nixos 23.11 10.0.5.120
mastodon container systemd-nspawn nixos 23.11 10.0.5.80
meshcentral container systemd-nspawn nixos 23.11 10.0.5.60
postgres container systemd-nspawn nixos 23.11 10.0.5.50
repo container systemd-nspawn nixos 23.11 10.0.5.30
temeraire container systemd-nspawn nixos 23.11 10.0.5.20
web-front container systemd-nspawn nixos 23.11 10.0.5.10
chaotic-kde container systemd-nspawn nixos 24.05 10.0.5.90
chaotic-v4 container systemd-nspawn nixos 24.05 10.0.5.140
docker container systemd-nspawn nixos 24.05 10.0.5.100
docker-proxied container systemd-nspawn nixos 24.05 10.0.5.110
forum container systemd-nspawn nixos 24.05 10.0.5.70
github-runner container systemd-nspawn nixos 24.05 10.0.5.130
iso-runner container systemd-nspawn nixos 24.05 10.0.5.40
lemmy container systemd-nspawn nixos 24.05 10.0.5.120
mastodon container systemd-nspawn nixos 24.05 10.0.5.80
meshcentral container systemd-nspawn nixos 24.05 10.0.5.60
postgres container systemd-nspawn nixos 24.05 10.0.5.50
temeraire container systemd-nspawn nixos 24.05 10.0.5.20
web-front container systemd-nspawn nixos 24.05 10.0.5.10
```

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`)
- 4 Chaotic-AUR builders (`chaotic-kde`, `github-runner`, `repo` & `temeraire`)
- 4 Chaotic-AUR builders (`chaotic-kde`, `chaotic-v4`, `github-runner` & `temeraire`)
- 5 app dedicated containers (`forum`, `lemmy`, `mastodon`, `meshcentral` & `postgres`)

### Connecting to the server

After connecting to the host via `ssh -p 666 [email protected]`, containers can generally be entered by 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)
- 223: `repo`
- 224: `forum`
- 225: `docker`
- 226: `chaotic-kde`
- 227: `iso-runner`
- 228: `web-front`
- 229: `postgres` (access the database in `127.0.0.1` via `ssh -p 229 [email protected] -L 5432:127.0.0.1:5432`)
- 229: `postgres` (access the database in `127.0.0.1` via `ssh -p 229 [email protected] -L 5432:127.0.0.1:5432`)
- 400: `chaotic-v4`

### Docker containers

Expand Down
31 changes: 0 additions & 31 deletions docs/src/nixos-containers/repo.md
View file

This file was deleted.

32 changes: 16 additions & 16 deletions docs/theme/highlight.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@ var hljs = (function () {
? e
: n
: "start" === n[0].event
? e
: n
? e
: n
: e.length
? e
: n;
? e
: n;
}
function c(e) {
s +=
Expand Down Expand Up @@ -348,10 +348,10 @@ var hljs = (function () {
return n
? +n
: (function (e) {
return N.includes(e.toLowerCase());
})(e)
? 0
: 1;
return N.includes(e.toLowerCase());
})(e)
? 0
: 1;
}
const R = t,
y = r,
Expand Down Expand Up @@ -718,12 +718,12 @@ var hljs = (function () {
e.cached_variants
? e.cached_variants
: (function e(n) {
return !!n && (n.endsWithParent || e(n.starts));
})(e)
? r(e, { starts: e.starts ? r(e.starts) : null })
: Object.isFrozen(e)
? r(e)
: e
return !!n && (n.endsWithParent || e(n.starts));
})(e)
? r(e, { starts: e.starts ? r(e.starts) : null })
: Object.isFrozen(e)
? r(e)
: e
);
})("self" === e ? s : e);
}),
Expand Down Expand Up @@ -847,8 +847,8 @@ var hljs = (function () {
? "<br>"
: e
: f.tabReplace
? e.replace(/\t/g, f.tabReplace)
: e,
? e.replace(/\t/g, f.tabReplace)
: e,
)
: e;
}
Expand Down
69 changes: 41 additions & 28 deletions flake.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions flake.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@
# Patches for nixos, automatically applied if they follow this format
nixos-patch-nat.url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/277016.patch";
nixos-patch-nat.flake = false;
nixos-patch-mastodon-cve.url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/285558.patch";
nixos-patch-mastodon-cve.flake = false;

# Common input
systems.url = "github:nix-systems/default";
Expand Down Expand Up @@ -175,6 +177,7 @@
{ package = "rsync"; }
{ package = "commitizen"; }
{ package = "manix"; }
{ package = "nodePackages.prettier"; }
{ package = "nixos-install-tools"; }
{ package = "pre-commit"; }
{
Expand Down
2 changes: 1 addition & 1 deletion nixos/hosts/chaotic-kde.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
export NO_PROXY=mirror.rackspace.com,cloudflaremirrors.com,github.com,downloads.sentry-cdn.com
'';
services.chaotic.db-name = "chaotic-aur-kde";
services.chaotic.routines = [ "hourly" "nightly" "afternoon" ];
services.chaotic.routines = [ "hourly" ];
services.chaotic.patches = [ ../services/chaotic/add-chaotic-repo.diff ../services/chaotic/prepend-repo.diff ];
services.chaotic.useACMEHost = "garudalinux.org";

Expand Down
Loading

0 comments on commit 702104f

Please sign in to comment.