diff --git a/.forgejo/workflows/demo.yaml b/.forgejo/workflows/demo.yaml new file mode 100644 index 0000000..88bd500 --- /dev/null +++ b/.forgejo/workflows/demo.yaml @@ -0,0 +1,6 @@ +on: [push] +jobs: + test: + runs-on: ubuntu-latest + steps: + - run: echo All Good! \ No newline at end of file diff --git a/flake.lock b/flake.lock index 8f9720a..9f50cd4 100644 --- a/flake.lock +++ b/flake.lock @@ -866,11 +866,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1710695816, - "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "lastModified": 1712310679, + "narHash": "sha256-XgC/a/giEeNkhme/AV1ToipoZ/IVm1MV2ntiK4Tm+pw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "rev": "72da83d9515b43550436891f538ff41d68eecc7f", "type": "github" }, "original": { diff --git a/hosts/phantom/email.nix b/hosts/phantom/email.nix index fbe33d7..8d3021b 100644 --- a/hosts/phantom/email.nix +++ b/hosts/phantom/email.nix @@ -9,21 +9,13 @@ mailserver = { enable = true; fqdn = "mail.lelgenio.xyz"; - domains = [ - "lelgenio.xyz" - "git.lelgenio.xyz" - ]; + domains = [ "lelgenio.xyz" ]; certificateScheme = "acme-nginx"; - # Create passwords with - # nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt' loginAccounts = { "lelgenio@lelgenio.xyz" = { hashedPassword = "$2y$05$z5s7QCXcs5uTFsfyYpwNJeWzb3RmzgWxNgcPCr0zjSytkLFF/qZmS"; aliases = [ "postmaster@lelgenio.xyz" ]; }; - "noreply@git.lelgenio.xyz" = { - hashedPassword = "$2b$05$TmR1R7ZwXfec7yrOfeBL7u3ZtyXf0up5dEO6uMWSvb/O7LPEm.j0."; - }; }; }; diff --git a/hosts/phantom/forgejo.nix b/hosts/phantom/forgejo.nix index 94b7169..ca31329 100644 --- a/hosts/phantom/forgejo.nix +++ b/hosts/phantom/forgejo.nix @@ -29,28 +29,12 @@ in lfs.enable = true; settings = { service.DISABLE_REGISTRATION = true; - actions = { - ENABLED = true; - DEFAULT_ACTIONS_URL = "github"; - }; server = { DOMAIN = "git.lelgenio.xyz"; HTTP_PORT = 3000; - ROOT_URL = "https://${srv.DOMAIN}/"; - }; - mailer = { - ENABLED = true; - SMTP_ADDR = "mail.lelgenio.xyz"; - FROM = "noreply@git.lelgenio.xyz"; - USER = "noreply@git.lelgenio.xyz"; + ROOT_URL = "${srv.PROTOCOL}://${srv.DOMAIN}/"; + SSH_PORT = 9022; }; }; - mailerPasswordFile = config.age.secrets.phantom-forgejo-mailer-password.path; - }; - - age.secrets.phantom-forgejo-mailer-password = { - file = ../../secrets/phantom-forgejo-mailer-password.age; - mode = "400"; - owner = "forgejo"; }; } diff --git a/hosts/phantom/users.nix b/hosts/phantom/users.nix index 75aee27..5cc853a 100644 --- a/hosts/phantom/users.nix +++ b/hosts/phantom/users.nix @@ -2,7 +2,7 @@ security.rtkit.enable = true; services.openssh = { enable = true; - ports = [ 9022 22 ]; + ports = [ 9022 ]; settings = { PasswordAuthentication = false; KbdInteractiveAuthentication = false; diff --git a/hosts/phantom/vpsadminos.nix b/hosts/phantom/vpsadminos.nix index 40401cd..070017e 100644 --- a/hosts/phantom/vpsadminos.nix +++ b/hosts/phantom/vpsadminos.nix @@ -13,8 +13,7 @@ let "1.1.1.1" "2606:4700:4700::1111" ]; -in -{ +in { networking.nameservers = mkDefault nameservers; services.resolved = mkDefault { fallbackDns = nameservers; }; networking.dhcpcd.extraConfig = "noipv4ll"; @@ -22,7 +21,7 @@ in systemd.services.systemd-sysctl.enable = false; systemd.services.systemd-oomd.enable = false; systemd.sockets."systemd-journald-audit".enable = false; - systemd.mounts = [{ where = "/sys/kernel/debug"; enable = false; }]; + systemd.mounts = [ {where = "/sys/kernel/debug"; enable = false;} ]; systemd.services.rpc-gssd.enable = false; # Due to our restrictions in /sys, the default systemd-udev-trigger fails diff --git a/secrets/phantom-forgejo-mailer-password.age b/secrets/phantom-forgejo-mailer-password.age deleted file mode 100644 index 90fbe73..0000000 Binary files a/secrets/phantom-forgejo-mailer-password.age and /dev/null differ diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 9a5fe2b..9bc7c27 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -10,5 +10,4 @@ in "phantom-nextcloud.age".publicKeys = [ main_ssh_public_key ]; "phantom-writefreely.age".publicKeys = [ main_ssh_public_key ]; "phantom-renawiki.age".publicKeys = [ main_ssh_public_key ]; - "phantom-forgejo-mailer-password.age".publicKeys = [ main_ssh_public_key ]; } diff --git a/switch-phantom b/switch-phantom deleted file mode 100755 index c824b0c..0000000 --- a/switch-phantom +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -nix fmt - -git diff - -nixos-rebuild switch --flake .#phantom \ - --update-input nixpkgs \ - --no-write-lock-file \ - --build-host phantom \ - --target-host phantom \ - "$@" diff --git a/system/secrets.nix b/system/secrets.nix index 22c5d14..0d0870b 100644 --- a/system/secrets.nix +++ b/system/secrets.nix @@ -10,7 +10,5 @@ ../secrets/rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age; secrets.monolith-nix-serve-privkey.file = ../secrets/monolith-nix-serve-privkey.age; - secrets.phantom-forgejo-mailer-password.file = - ../secrets/phantom-forgejo-mailer-password.age; }; }