gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 04:19:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: meiling

Browse source
This commit is contained in:
arcnmx 2025-09-03 23:18:59 -07:00
parent dd30009b7e
commit 47ca22ff47
30 changed files with 431 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ci/generate.sh
View file

@ -32,7 +32,8 @@ nf-eval() {
}
for node in reisen; do
NF_NODES=$(nix eval --json "${NF_CONFIG_ROOT}#lib.generate.nodeNames")
for node in $(jq -r '.[]' <<<"$NF_NODES"); do
nf-eval --json "lib.generate.nodes.$node.users" "systems/$node/users.json"
nf-eval --json "lib.generate.nodes.$node.systems" "systems/$node/systems.json"
nf-eval --json "lib.generate.nodes.$node.extern" "systems/$node/extern.json"

48
ci/systems.json
View file

@ -37,9 +37,24 @@
}
}
},
"ct": {
"ct-meiling": {
"network": {
"hostName": "ct",
"hostName": "ct-meiling",
"networks": {
"global": null,
"int": null,
"local": {
"address4": null,
"address6": null,
"macAddress": null
},
"tail": null
}
}
},
"ct-reisen": {
"network": {
"hostName": "ct-reisen",
"networks": {
"global": null,
"int": null,
@ -328,6 +343,29 @@
}
}
},
"meiling": {
"network": {
"hostName": "meiling",
"networks": {
"global": {
"address4": "49.12.128.117",
"address6": null,
"macAddress": null
},
"int": {
"address4": "10.9.1.4",
"address6": "fd0c::4",
"macAddress": null
},
"local": null,
"tail": {
"address4": "100.67.99.30",
"address6": "fd7a:115c:a1e0::dc34:631e",
"macAddress": null
}
}
}
},
"minecraft": {
"network": {
"hostName": "minecraft",
@ -419,7 +457,11 @@
"address6": null,
"macAddress": null
},
"tail": null
"tail": {
"address4": "100.101.208.19",
"address6": "fd7a:115c:a1e0::3034:d013",
"macAddress": null
}
}
}
},

22
ci/tarball.sh
View file

@ -4,7 +4,7 @@ if [[ $# -gt 0 ]]; then
ARG_NODE=$1
shift
else
ARG_NODE=ct
ARG_NODE=ct-reisen
fi
ARG_CONFIG_PATH=nixosConfigurations.$ARG_NODE.config
@ -12,16 +12,16 @@ RESULT=$(nix build --no-link --print-out-paths \
"${NF_CONFIG_ROOT}#$ARG_CONFIG_PATH.system.build.tarball" \
--show-trace "$@")
if [[ $ARG_NODE = ct ]]; then
DATESTAMP=$(nix eval --raw "${NF_CONFIG_ROOT}#lib.inputs.nixpkgs.sourceInfo.lastModifiedDate")
DATENAME=${DATESTAMP:0:4}${DATESTAMP:4:2}${DATESTAMP:6:2}
SYSARCH=$(nix eval --raw "${NF_CONFIG_ROOT}#$ARG_CONFIG_PATH.nixpkgs.system")
TAREXT=$(nix eval --raw "${NF_CONFIG_ROOT}#$ARG_CONFIG_PATH.system.build.tarball.extension")
TARNAME=nixos-system-$SYSARCH.tar$TAREXT
OUTNAME="ct-$DATENAME-$TARNAME"
ln -sf "$RESULT/tarball/$TARNAME" "$OUTNAME"
IMAGEPATH="$(nix eval --raw "${NF_CONFIG_ROOT}#$ARG_CONFIG_PATH.image.filePath")"
if [[ $ARG_NODE = ct-* ]]; then
#DATESTAMP=$(nix eval --raw "${NF_CONFIG_ROOT}#lib.inputs.nixpkgs.sourceInfo.lastModifiedDate")
#DATENAME=${DATESTAMP:0:4}${DATESTAMP:4:2}${DATESTAMP:6:2}
#IMAGEEXT="$(nix eval --raw "${NF_CONFIG_ROOT}#$ARG_CONFIG_PATH.image.extension")"
#OUTNAME="$ARG_NODE-$DATENAME-nixos-image.${IMAGEEXT}"
OUTNAME=$(basename "$IMAGEPATH")
ln -sf "$RESULT/$IMAGEPATH" "./$OUTNAME"
echo $OUTNAME
ls -l $OUTNAME
ls -l $OUTNAME >&2
else
echo $RESULT
echo "$RESULT/$IMAGEPATH"
fi