10 Commits

Author SHA1 Message Date
2ddf03bba1 [fanny] add disable autoupdate option at startup
All checks were successful
Check flake syntax / flake-check (push) Successful in 5m54s
2026-02-21 12:55:49 +01:00
9d7ab9f901 Merge remote-tracking branch 'origin/autoupdate'
All checks were successful
Check flake syntax / flake-check (push) Successful in 11m15s
2026-02-21 00:33:02 +01:00
a55b498eaa Merge pull request 'update the update domain to prepare for repo move' (#128) from move_repo into master
All checks were successful
Check flake syntax / flake-check (push) Successful in 7m43s
Reviewed-on: kalipso/infrastructure#128
2026-02-21 00:23:54 +01:00
8afc42d46f update the update domain to prepare for repo move
All checks were successful
Check flake syntax / flake-check (push) Successful in 5m41s
2026-02-20 23:55:27 +01:00
e32c1f31bc [fanny] fix keys.malobeo.org proxypass
All checks were successful
Check flake syntax / flake-check (push) Successful in 11m9s
2026-02-20 23:49:04 +01:00
66a0433148 [nextcloud] add hq to trusted_domains
All checks were successful
Check flake syntax / flake-check (push) Successful in 6m21s
2026-02-20 23:22:19 +01:00
04ee3105c1 [hosts] fix dns
All checks were successful
Check flake syntax / flake-check (push) Successful in 6m12s
2026-02-20 22:58:16 +01:00
5a35febf77 [fanny] fix ip 2026-02-20 22:58:10 +01:00
6182318a29 [actions] fix the autoupdate action
All checks were successful
Check flake syntax / flake-check (push) Successful in 7m46s
2026-02-20 20:19:57 +01:00
a90960d7a1 Add autoupdate runner + fix a typo in the vaultwarden config 2026-02-18 23:57:42 +01:00
5 changed files with 92 additions and 19 deletions

View File

@@ -18,8 +18,27 @@ jobs:
run: |
apt-get update
apt-get install -y sudo
- name: Install Tea
env:
TEA_DL_URL: "https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-amd64"
shell: bash
run: |
TEA_DIR=$(mktemp -d -t tmp.XXXX)
pushd $TEA_DIR
wget "$TEA_DL_URL"
wget "${TEA_DL_URL}.sha256"
if $(sha256sum --quiet -c "tea-0.9.2-linux-amd64.sha256"); then
mv "tea-0.9.2-linux-amd64" /usr/bin/tea
chmod +x /usr/bin/tea
popd
rm -rf $TEA_DIR
else
popd
rm -rf $TEA_DIR
echo "::error title=⛔ error hint::Tea v0.9.2 Checksum Failed"
exit 1
fi
- uses: https://code.forgejo.org/actions/checkout@v6
- name: Set up Nix
uses: https://github.com/cachix/install-nix-action@v31
with:
@@ -27,16 +46,65 @@ jobs:
- name: Run nix flake update
run: nix flake update
- name: Run nix flake check
run: nix flake check --all-systems --verbose
- name: Create Gitea PR
uses: https://github.com/infinilabs/gitea-pr@v0
with:
url: https://git.dynamicdiscord.de
token: ${{ secrets.AHTLONS_GITEA_TOKEN }}
commit-message: 'Update flake.lock'
committer: 'malobot <malobot@systemli.org>'
base: 'master'
title: 'Update flake.lock'
assignee: 'ahtlon'
- name: Commit flake.lock
run: |
git config user.name "malobot"
git config user.email "malobot@systemli.org"
git stash push
git branch nixpkgs_bump_$(date +%Y%m%d)
git checkout nixpkgs_bump_$(date +%Y%m%d)
git stash pop
git add flake.lock
git diff --staged --quiet || git commit -m "Update flake.lock"
- name: Check for eval warnings
id: commit
shell: bash
run: |
{
echo "COMMIT_DESC<<EOF"
echo "Date: $(date)"
echo "Evaluation warnings:"
nix flake check --all-systems --no-build 2>&1 | grep evaluation | awk '!seen[$0]++' || echo "None :)"
echo EOF
} >> "$GITHUB_OUTPUT"
- name: Login to Gitea
shell: bash
env:
GIT_SERVER_URL: https://git.dynamicdiscord.de
GIT_SERVER_TOKEN: ${{ secrets.AHTLONS_GITEA_TOKEN }}
run: >-
tea login add
-u "$GIT_SERVER_URL"
-t "$GIT_SERVER_TOKEN"
- name: Check for existing pull request
id: no-pr
continue-on-error: true
shell: bash
run: >-
tea pr -f head -o simple |
grep -q ${{ github.ref_name }} &&
exit 1 ||
exit 0
- name: Force push branch
run: git push --force -u origin nixpkgs_bump_$(date +%Y%m%d)
- name: Create pull request
if: steps.no-pr.outcome == 'success'
env:
COMMIT_MSG: Automatic Nixpkgs update
COMMIT_DESC: ${{ steps.commit.outputs.COMMIT_DESC }}
shell: bash
run: >-
tea pr create
-L "bump"
-t "$COMMIT_MSG"
-d "$COMMIT_DESC"
- name: Skip pull request
if: steps.no-pr.outcome == 'failure'
shell: bash
run: >
echo "::error title=⛔ error hint::
A PR already exists for this branch: ${{ github.ref_name }}"

View File

@@ -1,4 +1,4 @@
{ inputs, config, ... }:
{ inputs, config, lib, ... }:
let
sshKeys = import ../ssh_keys.nix;
peers = import ../modules/malobeo/peers.nix;
@@ -47,6 +47,10 @@ in
jobset = "infrastructure";
cacheurl = "https://cache.dynamicdiscord.de";
};
specialisation."NOAUTOUPDATE".configuration = {
system.nixos.tags = [ "NOAUTOUPDATE" ];
malobeo.autoUpdate.enable = lib.mkForce false;
};
malobeo.backup = {
enable = true;
@@ -135,8 +139,9 @@ in
enableHostBridge = true;
interface = "enp1s0";
gateway = "192.168.1.1";
address = "192.168.1.2/24";
address = "192.168.1.103/24";
};
services.malobeo.microvm.deployHosts = [
"overwatch"
"infradocs"
@@ -212,7 +217,7 @@ in
virtualHosts."keys.malobeo.org" = {
locations."/" = {
proxyPass = "http://10.0.0.16";
proxyPass = "http://${hosts.malobeo.hosts.vaultwarden.network.address}";
extraConfig = ''
proxy_set_header Host $host;
'';

View File

@@ -6,7 +6,7 @@ let
hostId = hostId;
address = "192.168.1.${hostId}";
gateway = "192.168.1.1";
nameservers = [ "192.168.1.17" "1.1.1.1" ]; #setting ns1 as nameserver
nameservers = [ "192.168.1.1" "1.1.1.1" ]; #setting ns1 as nameserver
mac = mac;
};

View File

@@ -101,7 +101,7 @@ in
# under nixosConfigurations
flake = inputs.malobeo;
# Specify from where to let `microvm -u` update later on
updateFlake = "git+https://git.dynamicdiscord.de/kalipso/infrastructure";
updateFlake = "git+https://git.dynamicdiscord.de/malobeo/infrastructure";
}; };
in
builtins.listToAttrs (map mapperFunc cfg.deployHosts);

View File

@@ -61,7 +61,7 @@ in
};
};
settings = {
trusted_domains = [ "cloud.malobeo.org" ];
trusted_domains = [ "cloud.malobeo.org" "cloud.hq.malobeo.org" ];
trusted_proxies = [ hosts.malobeo.hosts.fanny.network.address ];
"maintenance_window_start" = "1";
"default_phone_region" = "DE";