Merge remote-tracking branch 'origin/#76-Nuked-Backup' into #76-Nuked-Backup

# Conflicts: # secrets/backup/nuked.age
admin: add eliza and esy as admins to teh secrets
2024-06-07 19:44:51 +01:00 · 2024-06-07 19:20:52 +01:00 · 2024-06-07 19:19:55 +01:00 · 2024-06-06 23:36:50 +01:00
96 changed files with 1833 additions and 2674 deletions
--- a/.forgejo/workflows/deploy.yaml
+++ b/.forgejo/workflows/deploy.yaml
@ -1,59 +0,0 @@
-name: Build_Deploy
-
-on:
-  workflow_run:
-    workflows: [ "Update_Flake" ]
-    types:
-      - completed
-  push:
-    branches:
-      - 'main'
-    paths:
-      - applications/**/*
-      - machines/**/*
-      - secrets/**/*
-      - flake.*
-      - config/**/*
-      - .forgejo/**/*
-
-jobs:
-  linter:
-    runs-on: nix
-    steps:
-      - uses: actions/checkout@v4
-      - run: nix fmt -- --check .
-      - run: nix --version
-
-  #if: github.repository == 'Skynet/nixos'
-  build:
-    runs-on: nix
-    steps:
-      - uses: actions/checkout@v4
-      - run: nix develop -v
-#      - name: Archive Test Results
-#        if: always()
-#        run: sleep 100m
-#      - run: colmena build -v --on @active-dns
-#      - run: colmena build -v --on @active-core
-#      - run: colmena build -v --on @active
-#      - run: colmena build -v --on @active-ext
-#      - run: colmena build -v --on @active-git
-
-  deploy_dns:
-    runs-on: nix
-    needs: [ linter, build ]
-    steps:
-      - uses: actions/checkout@v4
-      - run: colmena apply -v --on @active-dns --show-trace
-        shell: bash
-
-  deploy_active:
-    strategy:
-      matrix:
-        batch: [ active-core, active, active-ext ]
-    runs-on: nix
-    needs: [ deploy_dns ]
-    steps:
-      - uses: actions/checkout@v4
-      - run: colmena apply -v --on @${{ matrix.batch }} --show-trace
-        shell: bash
--- a/.forgejo/workflows/deploy_forgejo.yaml
+++ b/.forgejo/workflows/deploy_forgejo.yaml
@ -1,12 +0,0 @@
-name: Update_Forgejo
-
-on:
-  workflow_dispatch:
-
-jobs:
-  deploy:
-    runs-on: nix
-    steps:
-      - uses: actions/checkout@v4
-      - run: colmena apply -v --on @active-git --show-trace
-        shell: bash
--- a/.forgejo/workflows/update_input.yaml
+++ b/.forgejo/workflows/update_input.yaml
@ -1,31 +0,0 @@
-name: Update_Flake
-
-run-name: "[Update Flake] ${{ inputs.input_to_update }}"
-
-on:
-  workflow_dispatch:
-    inputs:
-      input_to_update:
-        description: 'Flake input to update'
-        required: false
-        type: string
-
-jobs:
-  update:
-    runs-on: nix
-
-    permissions:
-      # Give the default GITHUB_TOKEN write permission to commit and push the
-      # added or changed files to the repository.
-      contents: write
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.head_ref }}
-          token: ${{ secrets.PIPELINE_TOKEN }}
-      - run: nix flake update ${{ inputs.input_to_update }}
-        shell: bash
-      - uses: https://github.com/stefanzweifel/git-auto-commit-action@v5
-        with:
-          commit_message: "Updated flake for ${{ inputs.input_to_update }}"
--- a/.gitignore
+++ b/.gitignore
@ -6,9 +6,6 @@
 *.tmp
 tmp

-# open office tmp lockfiles
-.~lock.*
-
 # Test files
 test.*
 *.test.*
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -30,7 +30,7 @@ update:
    # the part that updates the flake
    - nix --experimental-features 'nix-command flakes' flake lock --update-input $PACKAGE_NAME
    - git add flake.lock
-    - git commit -m "Updated flake for $PACKAGE_NAME" || echo "No changes, nothing to commit"
+    - git commit -m "[skip ci] Updated flake for $PACKAGE_NAME" || echo "No changes, nothing to commit"
    # we have a custom domain
    - git remote rm origin && git remote add origin ssh://git@gitlab.skynet.ie:2222/compsoc1/skynet/nixos.git
    - git push origin HEAD:$CI_COMMIT_REF_NAME
@ -48,14 +48,13 @@ sync_repos:
    - chmod +x ./sync.sh
    - ./sync.sh
  rules:
-    - if: $UPDATE_FLAKE == "yes"
-      when: never
    - if: '$CI_PROJECT_NAMESPACE == "compsoc1/skynet" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
      changes:
        - sync/repos.csv

 .scripts_base: &scripts_base
  # load nix environment
+  - git pull origin $CI_COMMIT_REF_NAME
  - . "$HOME/.nix-profile/etc/profile.d/nix.sh"
  - nix --extra-experimental-features 'nix-command flakes'  profile install nixpkgs#colmena

@ -70,8 +69,6 @@ sync_repos:
  - nix --extra-experimental-features 'nix-command flakes'  profile install nixpkgs#attic-client
  - attic login skynet https://nix-cache.skynet.ie/ $CACHE_KEY
  - attic use skynet-cache
-  # add any new items to the cache
-  - attic watch-store skynet-cache &

 # every commit on main will build and deploy
 .build_template: &builder
@ -81,8 +78,6 @@ sync_repos:
    - *scripts_base
    - *scripts_cache
  rules:
-    - if: $UPDATE_FLAKE == "yes"
-      when: never
    - changes:
      - applications/**/*
      - machines/**/*
@ -98,8 +93,6 @@ sync_repos:
    - *scripts_base
    - *scripts_cache
  rules:
-    - if: $UPDATE_FLAKE == "yes"
-      when: never
    - if: '$CI_PROJECT_NAMESPACE == "compsoc1/skynet" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
      changes:
        - flake.nix
@ -119,12 +112,12 @@ build:
  <<: *builder
  stage: test
  script:
-    - nix --extra-experimental-features 'nix-command flakes' develop
+    - attic watch-store skynet-cache &
    - colmena build -v --on @active-dns
    - colmena build -v --on @active-core
    - colmena build -v --on @active
    - colmena build -v --on @active-ext
-    - colmena build -v --on @active-git
+    - colmena build -v --on @active-gitlab

 # dns always has to be deployed first
 deploy_dns:
@ -161,11 +154,12 @@ deploy_ext:
    - deploy_dns
  script:
    - colmena apply -v --on @active-ext
+  allow_failure: true

 deploy_gitlab:
  <<: *builder
  <<: *deployment
  stage: deploy_gitlab
  script:
-    - colmena apply -v --on @active-git
+    - colmena apply -v --on @active-gitlab
  when: manual
--- a/ITD/Firewall_Rules.csv
+++ b/ITD/Firewall_Rules.csv
@ -1,45 +0,0 @@
-Rule,Action,Ticket,Status,Source_IP,Source_Server,Destination_IP,Destination_Server,Port_TCP,Port_UDP,Notes
-SKYNET_FIREWALL_00000,Add,,Complete,VPN,-,93.1.99.71 - 193.1.99.126,All,22,-,sftp/ssh required from vpn to servers for admins
-SKYNET_FIREWALL_00001,Add,,Complete,All,-,193.1.99.109,SKYNET00004,-,53,Nameserver for skynet.ie
-SKYNET_FIREWALL_00002,Add,,Complete,All,-,193.1.99.111,SKYNET00005,"80, 443, 8000",-,"ULFM, http(s) for internet streaming, 8000 for connecting to the server."
-SKYNET_FIREWALL_00003,Add,,Complete,All,-,193.1.99.112,SKYNET00006,"80, 443, 25565",-,"Games host, Minecraft uses 25565 (will have more ports in the future)"
-SKYNET_FIREWALL_00004,Add,,Complete,All,-,193.1.99.120,SKYNET00002,-,53,Nameserver for skynet.ie
-SKYNET_FIREWALL_00005,Add,i23-01-19_681,Complete,193.1.99.72,SKYNET00001,All,-,-,-,Allow outbound access
-SKYNET_FIREWALL_00006,Add,i23-01-19_681,Complete,193.1.99.75,SKYNET00008,All,-,-,-,Allow outbound access
-SKYNET_FIREWALL_00007,Add,i23-01-19_681,Complete,193.1.99.109,SKYNET00004,All,-,-,-,Allow outbound access
-SKYNET_FIREWALL_00008,Add,i23-01-19_681,Complete,193.1.99.111,SKYNET00005,All,-,-,-,Allow outbound access
-SKYNET_FIREWALL_00009,Add,i23-01-19_681,Complete,193.1.99.112,SKYNET00006,All,-,-,-,Allow outbound access
-SKYNET_FIREWALL_00010,Add,i23-01-19_681,Complete,193.1.99.120,SKYNET00002,All,-,-,-,Allow outbound access
-SKYNET_FIREWALL_00011,Add,i23-05-18_249,Complete,All,-,193.1.99.75,SKYNET00008,"80, 443",-,For gitlab Access
-SKYNET_FIREWALL_00012,Add,i23-05-18_249,Complete,193.1.99.72 - 193.1.99.126,-,All,-,-,-,"I would also like to extend the outbound access to cover our entire range (193.1.99.72 to 193.1.99.126) to allow for setup for more servers on those ip's (need to download updates and packages).
-I have a few servers I plan to setup over the next two weeks, one after another as the later ones depend on earlier ones.
-In such a case asking for permission for each individual IP would induce several tickets and a few weeks of paperwork going through change control.
-Only a few of these sevices will need inbound ports opened on ITD's firewall, which can be requested when the systems are up, running and secured."
-SKYNET_FIREWALL_00013,Add,i23-05-18_249,Complete,All,-,193.1.99.76,SKYNET00009,"143, 993, 587, 465",-,Email Server
-SKYNET_FIREWALL_00014,Add,i23-06-19_525,Complete,All,-,193.1.99.76,SKYNET00009,"80, 443, 25",-,"Mailserver here, SPF, DKIM and DMARC are all set up"
-SKYNET_FIREWALL_00015,Add,i23-06-19_525,Complete,All,-,193.1.99.79,SKYNET00011,"80, 443",-,Main Skynet webserver
-SKYNET_FIREWALL_00016,Add,i23-06-30_024,Complete,All,-,193.1.96.165,SKYNET00012,22,-,"Skynet user's server
-Outlet is 131 or 132"
-SKYNET_FIREWALL_00017,Add,i23-06-30_024,Complete,193.1.96.165,SKYNET00012,193.1.99.120,SKYNET00002,-,53,Allow Skynet server to use our own internal DNS
-SKYNET_FIREWALL_00018,Add,i23-06-30_024,Complete,193.1.96.165,SKYNET00012,193.1.99.74,SKYNET00007,389/636,-,Allow Skynet server to access LDAP
-,Add,i23-07-28_010,Denied,All,-,193.1.99.74,SKYNET00007,"80, 443",-,Self Service site for Skynet accounts – Only 443 on account modification pages
-SKYNET_FIREWALL_00019,Add,i23-07-28_010,Complete,All,-,193.1.99.74,SKYNET00007,443,-,Self Service site for Skynet accounts
-SKYNET_FIREWALL_00020,Add,i23-09-05_639,Complete,All,-,193.1.96.165,SKYNET00012,"80, 443",-,Web hosting for user sites
-SKYNET_FIREWALL_00021,Add,i23-10-27_014,Complete,All,-,193.1.99.77,SKYNET00014,"80, 443",-,"Nextcloud, selfhosted google services, filestorage and documents"
-SKYNET_FIREWALL_00022,Add,i24-02-01_102,Complete,193.1.96.165,SKYNET00012,103.1.99.109,SKYNET00004,-,53,Give the Skynet server access to ur secondary DNS
-SKYNET_FIREWALL_00023,Add,i24-02-01_102,Complete,193.1.99.78,SKYNET00010,193.1.96.165,SKYNET00012,22,-,Allow our gitlab runner to access and deploy to teh external server
-SKYNET_FIREWALL_00024,Add,i24-02-16_065,Complete,All,-,193.1.99.90,SKYNET00016,"80, 443",-,Games Server Administrative panel
-SKYNET_FIREWALL_00025,Add,i24-02-16_065,Complete,All,-,193.1.99.91,SKYNET00017,25518-25525,"19132, 24418-24425",Minecraft Games server
-SKYNET_FIREWALL_00026,Add,i24-06-04_017,Complete,All,-,193.1.99.76,SKYNET00009,4190,-,"Email sieve to allow members to add email filters to their
-skynet mail."
-SKYNET_FIREWALL_00027,Add,i24-06-04_017,Complete,All,-,193.1.99.82,SKYNET00018,80/443,-,"Public services such as a binary cache, open governance and keyserver"
-,Add,i24-06-04_017,Denied,All,-,193.1.99.90,SKYNET00016,8080,-,"Websocket for admin panel on games management server
-Denied because more information on wat it was for was requested"
-,Add,i24-06-04_017,Denied,193.1.99.74,SKYNET00007,193.1.96.165,SKYNET00012,9000-9020,-,"Metrics collection, not done because not enough info provided"
-SKYNET_FIREWALL_00028,Remove,i24-06-04_017,Complete,-,-,193.1.99.112,SKYNET00019,25565,-,No longer the minecraft game host
-SKYNET_FIREWALL_00029,Add,i24-06-04_017,Complete,All,-,193.1.99.90,SKYNET00016,8080,-,Websocket for admin panel on games management server
-SKYNET_FIREWALL_00030,Add,i24-06-04_017,Complete,193.1.99.83,SKYNET00020,193.1.96.165,SKYNET00012,9000-9010,-,Metrics Collection
-SKYNET_FIREWALL_00031,Add,i24-06-04_017,Complete,All,-,193.1.99.83,SKYNET00020,"80, 443",-,Web interface for Metrics server
-SKYNET_FIREWALL_00032,Remove,i24-06-04_017,Complete,All,-,193.1.99.90,SKYNET00016,8080,-,Had incorrectly opened 8080 on the main panel
-SKYNET_FIREWALL_00033,Add,i24-06-04_017,Complete,All,-,193.1.99.91,SKYNET00017,8080,-,Websocket for admin panel on games management server
-,Add,i24-07-15_112,Denied,193.1.99.75,-,-,-,22,-,Response from ITD - 'Our IT Security team have advised that port 22 and port 2222 are only to be allowed through the VPN and will not be opened to allow inbound ssh connections directly from the internet'
--- a/ITD/Server_Inventory.csv
+++ b/ITD/Server_Inventory.csv
@ -1,24 +0,0 @@
-Index,Name,Status,IP_Address,OS,Description
-SKYNET00001,agentjones,Active,193.1.99.072,Nixos-24.05,Firewall (currently not active)
-SKYNET00002,vendetta,Active,193.1.99.120,Nixos-24.05,DNS Nameserver 1
-SKYNET00003,jarvis,Active,193.1.99.073,Proxmox,VM Host
-SKYNET00004,vigil,Active,193.1.99.109,Nixos-24.05,DNS Nameserver 2
-SKYNET00005,galatea,Active,193.1.99.111,Nixos-24.05,ULFM Radio
-SKYNET00006,optimus,Retired,193.1.99.112,Nixos-24.05,Retired Games server
-SKYNET00007,kitt,Active,193.1.99.074,Nixos-24.05,"LDAP and Self-Service Password/Account management, also hosts our Discord bot"
-SKYNET00008,glados,Active,193.1.99.075,Nixos-24.05,Gitlab server
-SKYNET00009,gir,Active,193.1.99.076,Nixos-24.05,Email and Webmail
-SKYNET00010,wheatly,Active,193.1.99.078,Nixos-24.05,Gitlab Runner
-SKYNET00011,earth,Active,193.1.99.079,Nixos-24.05,Offical website host
-SKYNET00012,skynet,Active,193.1.96.165,Nixos-24.05,Skynet server. (DMZ)
-SKYNET00013,neuromancer,Active,193.1.99.080,Nixos-24.05,Local Backup Server
-SKYNET00014,cadie,Active,193.1.99.077,Nixos-24.05,"Services VM, has nextcloud to start with"
-SKYNET00015,marvin,Active,193.1.99.081,Nixos-24.05,Trainee testing server
-SKYNET00016,optimus,Active,193.1.99.090,Debian-12,Games server manager (replacing SKYNET00006 soon)
-SKYNET00017,bumblebee,Active,193.1.99.091,Debian-12,Game server - Minecraft
-SKYNET00018,calculon,Active,193.1.99.082,Nixos-24.05,"Public Services such as binary cache, Open Governance and Keyserver"
-SKYNET00019,deepthought,Active,193.1.99.112,Nixos-24.05,Backup Test Server using restic
-SKYNET00020,ariia,Active,193.1.99.083,Nixos-24.05,"Metrics, Grafana and Prometheus"
-SKYNET00021,ash,Active,193.1.99.114,NA,Server Room Network access
-SKYNET00022,ultron,Active,193.1.99.084,Proxmox,VM Host
-SKYNET00023,optimus-test,Active,193.1.99.085,Nixos,Testing flake for Pelecian
--- a/ITD/VPN_Admins.csv
+++ b/ITD/VPN_Admins.csv
@ -1,6 +0,0 @@
-Index,First Name,Surname,UL Student Email
-SKYNET_VPN_ADM_001,Brendan,Golden,12136891@studentmail.ul.ie
-SKYNET_VPN_ADM_002,Evan,Cassidy,External
-SKYNET_VPN_ADM_003,Eoghan,Conlon,21310262@studentmail.ul.ie
-SKYNET_VPN_ADM_004,Eliza,Macovei,23382619@studentmail.ul.ie
-SKYNET_VPN_ADM_005,Daragh,Downes,22351159@studentmail.ul.ie
--- a/ITD/VPN_Admins_changes.csv
+++ b/ITD/VPN_Admins_changes.csv
@ -1,7 +0,0 @@
-Date,Date Modified,Action,Ticket,ID
-SKYNET_VPN_ADM_CHANGE_001,2023/04/04,Added,,SKYNET_VPN_ADM_001
-SKYNET_VPN_ADM_CHANGE_002,2023/04/04,Added,,SKYNET_VPN_ADM_002
-SKYNET_VPN_ADM_CHANGE_003,2023/04/04,Added,,SKYNET_VPN_ADM_003
-SKYNET_VPN_ADM_CHANGE_003,2024/07/21,Removed,i24-07-22_760,SKYNET_VPN_ADM_003
-SKYNET_VPN_ADM_CHANGE_004,2024/07/21,Added,i24-07-22_760,SKYNET_VPN_ADM_004
-SKYNET_VPN_ADM_CHANGE_005,2024/07/21,Added,i24-07-22_760,SKYNET_VPN_ADM_005
--- a/ITD_Firewall.csv
+++ b/ITD_Firewall.csv
@ -0,0 +1,19 @@
+Index,Status,Name,IP_Address,DNS_Name,Ports TCP,Ports UDP,Tunnel,Ports_Requested,Related_Tickets,Description
+SKYNET00001,Active,agentjones,193.1.99.72,agentjones,,,,,,Firewall (currently not active)
+SKYNET00002,Active,vendetta,193.1.99.120,vendetta/ns1,,53,,,,DNS Nameserver 1
+SKYNET00003,Active,jarvis,193.1.99.73,jarvis,,,,,,VM Host
+SKYNET00004,Active,vigil,193.1.99.109,vigil/ns2,,53,,,,DNS Nameserver 2
+SKYNET00005,Active,galatea,193.1.99.111,galatea/stream,80/443 8000,,,,,ULFM Radio
+SKYNET00006,Retired,optimus,193.1.99.112,optimus/games/*.games,80/443 25565,,,,,Retired Games server
+SKYNET00007,Active,kitt,193.1.99.74,kitt/account/api.account,443,,,-> skynet:9000-9020,i23-07-28_010,"LDAP and Self-Service Password/Account management, also hosts our Discord bot"
+SKYNET00008,Active,glados,193.1.99.75,glados/gitlab/*.pages.gitlab,80/443,,,,i23-05-18_249,Gitlab server
+SKYNET00009,Active,gir,193.1.99.76,gir/mail/imap/pop3/smtp,80/443 25/143/993/587/465,,,4190,i23-06-19_525/i23-06-19_525,Email and Webmail
+SKYNET00010,Active,wheatly,193.1.99.78,wheatly,,,-> skynet:22,,,Gitlab Runner
+SKYNET00011,Active,earth,193.1.99.79,earth,80/443,,,,i23-06-19_525,Offical website host
+SKYNET00012,Active,skynet,193.1.96.165,skynet/*.users,22 80/443,,,,i23-06-30_024,Skynet server. (DMZ)
+SKYNET00013,Active,neuromancer,193.1.99.80,neuromancer,,,,,,Local Backup Server
+SKYNET00014,Active,cadie,193.1.99.77,cadie/nextcloud/onlyoffice.nextcloud,80/443,,,,i23-10-27_014,"Services VM, has nextcloud to start with"
+SKYNET00015,Active,marvin,193.1.99.81,marvin,,,,,,Trainee testing server
+SKYNET00016,Active,optimus,193.1.99.90,,80/443,,,8080,i24-02-16_065,Games server manager (replacing SKYNET00006 soon)
+SKYNET00017,Active,bumblebee,193.1.99.91,,25518-25525,19132 24418-24425,,,i24-02-16_065,Game server - Minecraft
+SKYNET00018,Active,calculon,193.1.99.82,,,,,80/443,,"Public Services such as binary cache, Open Governance and Keyserver"
--- a/9
+++ b/9
@ -1,9 +0,0 @@
-MIT License
-
-Copyright (c) 2024 Skynet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/Possible_Server_Names.md
+++ b/Possible_Server_Names.md
@ -1,6 +1,5 @@
 https://web.archive.org/web/20180815150202/https://wiki.skynet.ie/Admin/SkynetMachines   
 https://en.m.wikipedia.org/wiki/Category:Fictional_artificial_intelligences  
-https://en.wikipedia.org/wiki/List_of_artificial_intelligence_films  

 * agentsmith
 * skynet
--- a/README.md
+++ b/README.md
@ -43,7 +43,7 @@ colmena build --on @active-dns
 Deploying is putting (apply-ing) the config tat was built onto the server, there is no need to build first, it will automatically do so.

 While the ***recommended way of deploying is using the CI/CD process*** there are times when you will have to manually deploy the config.  
-One such case is the ``@active-git`` group if either Gitlab or Gitlab-runner got updated.  
+One such case is the ``@active-gitlab`` group if either Gitlab or Gitlab-runner got updated.  
 Another is if ye have fecked up DNS.

 Your ``~/.ssh/config``  should be set up as follows and you should be a member of ``skynet-admins-linux``
@ -60,10 +60,10 @@ Then you can run the following commands like so:
 ```shell
 colmena apply
 colmena apply --on @active-dns
-colmena apply --on @active-git
+colmena apply --on @active-gitlab
 ```

-The CI/CD pipeline has a manual job that can be triggered to update ``@active-git`` if you know it wont cause issues.
+The CI/CD pipeline has a manual job that can be triggered to update ``@active-gitlab`` if you know it wont cause issues.

 ### Agenix

--- a/applications/_base.nix
+++ b/applications/_base.nix
@ -9,24 +9,9 @@ with lib; let
  cfg = config.services.skynet;
 in {
  imports = [
-    # every server needs to have a dns record
-    ./dns/dns.nix
-
-    # every server should have proper certs
    ./acme.nix
+    ./dns.nix
    ./nginx.nix
-
-    # every server may need the firewall config stuff
-    ./firewall.nix
-
-    # every server needs teh ldap client for admins
-    ./ldap/client.nix
-
-    # every server will need the config to backup to
-    ./restic.nix
-
-    # every server will be monitored for grafana
-    ./prometheus.nix
  ];

  options.services.skynet = {
--- a/applications/_retired/games.nix
+++ b/applications/_retired/games.nix
@ -10,6 +10,7 @@ with lib; let
  cfg = config.services.skynet."${name}";
 in {
  imports = [
+    ./dns.nix
    ./nginx.nix
    ./games/minecraft.nix
  ];
--- a/applications/_retired/games/minecraft.nix
+++ b/applications/_retired/games/minecraft.nix
@ -13,6 +13,10 @@ with lib; let
  short_domain = "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}";
 in {
  imports = [
+    ../acme.nix
+    ../dns.nix
+    ../firewall.nix
+    ../nginx.nix
    inputs.arion.nixosModules.arion
  ];

--- a/applications/acme.nix
+++ b/applications/acme.nix
@ -32,15 +32,15 @@ in {

      defaults = {
        email = "admin_acme@skynet.ie";
-        credentialsFile = config.age.secrets.acme.path;
        # we use our own dns authorative server for verifying we own the domain.
        dnsProvider = "rfc2136";
+        credentialsFile = config.age.secrets.acme.path;
      };

      certs = {
        "skynet" = {
          domain = "skynet.ie";
-          extraDomainNames = lists.naturalSort cfg.domains;
+          extraDomainNames = cfg.domains;
        };
      };
    };
--- a/applications/bitwarden/bitwarden-directory-connector-cli.nix
+++ b/applications/bitwarden/bitwarden-directory-connector-cli.nix
@ -0,0 +1,324 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
+  cfg = config.services.bitwarden-directory-connector-cli;
+in {
+  disabledModules = ["services/security/bitwarden-directory-connector-cli.nix"];
+
+  options.services.bitwarden-directory-connector-cli = {
+    enable = mkEnableOption "Bitwarden Directory Connector";
+
+    package = mkPackageOption pkgs "bitwarden-directory-connector-cli" {};
+
+    domain = mkOption {
+      type = types.str;
+      description = lib.mdDoc "The domain the Bitwarden/Vaultwarden is accessible on.";
+      example = "https://vaultwarden.example.com";
+    };
+
+    user = mkOption {
+      type = types.str;
+      description = lib.mdDoc "User to run the program.";
+      default = "bwdc";
+    };
+
+    interval = mkOption {
+      type = types.str;
+      default = "*:0,15,30,45";
+      description = lib.mdDoc "The interval when to run the connector. This uses systemd's OnCalendar syntax.";
+    };
+
+    ldap = mkOption {
+      description = lib.mdDoc ''
+        Options to configure the LDAP connection.
+        If you used the desktop application to test the configuration you can find the settings by searching for `ldap` in `~/.config/Bitwarden\ Directory\ Connector/data.json`.
+      '';
+      default = {};
+      type = types.submodule ({
+        config,
+        options,
+        ...
+      }: {
+        freeformType = types.attrsOf (pkgs.formats.json {}).type;
+
+        config.finalJSON = builtins.toJSON (removeAttrs config (filter (x: x == "finalJSON" || ! options.${x}.isDefined or false) (attrNames options)));
+
+        options = {
+          finalJSON = mkOption {
+            type = (pkgs.formats.json {}).type;
+            internal = true;
+            readOnly = true;
+            visible = false;
+          };
+
+          ssl = mkOption {
+            type = types.bool;
+            default = false;
+            description = lib.mdDoc "Whether to use TLS.";
+          };
+          startTls = mkOption {
+            type = types.bool;
+            default = false;
+            description = lib.mdDoc "Whether to use STARTTLS.";
+          };
+
+          hostname = mkOption {
+            type = types.str;
+            description = lib.mdDoc "The host the LDAP is accessible on.";
+            example = "ldap.example.com";
+          };
+
+          port = mkOption {
+            type = types.port;
+            default = 389;
+            description = lib.mdDoc "Port LDAP is accessible on.";
+          };
+
+          ad = mkOption {
+            type = types.bool;
+            default = false;
+            description = lib.mdDoc "Whether the LDAP Server is an Active Directory.";
+          };
+
+          pagedSearch = mkOption {
+            type = types.bool;
+            default = false;
+            description = lib.mdDoc "Whether the LDAP server paginates search results.";
+          };
+
+          rootPath = mkOption {
+            type = types.str;
+            description = lib.mdDoc "Root path for LDAP.";
+            example = "dc=example,dc=com";
+          };
+
+          username = mkOption {
+            type = types.str;
+            description = lib.mdDoc "The user to authenticate as.";
+            example = "cn=admin,dc=example,dc=com";
+          };
+        };
+      });
+    };
+
+    sync = mkOption {
+      description = lib.mdDoc ''
+        Options to configure what gets synced.
+        If you used the desktop application to test the configuration you can find the settings by searching for `sync` in `~/.config/Bitwarden\ Directory\ Connector/data.json`.
+      '';
+      default = {};
+      type = types.submodule ({
+        config,
+        options,
+        ...
+      }: {
+        freeformType = types.attrsOf (pkgs.formats.json {}).type;
+
+        config.finalJSON = builtins.toJSON (removeAttrs config (filter (x: x == "finalJSON" || ! options.${x}.isDefined or false) (attrNames options)));
+
+        options = {
+          finalJSON = mkOption {
+            type = (pkgs.formats.json {}).type;
+            internal = true;
+            readOnly = true;
+            visible = false;
+          };
+
+          removeDisabled = mkOption {
+            type = types.bool;
+            default = true;
+            description = lib.mdDoc "Remove users from bitwarden groups if no longer in the ldap group.";
+          };
+
+          overwriteExisting = mkOption {
+            type = types.bool;
+            default = false;
+            description =
+              lib.mdDoc "Remove and re-add users/groups, See https://bitwarden.com/help/user-group-filters/#overwriting-syncs for more details.";
+          };
+
+          largeImport = mkOption {
+            type = types.bool;
+            default = false;
+            description = lib.mdDoc "Enable if you are syncing more than 2000 users/groups.";
+          };
+
+          memberAttribute = mkOption {
+            type = types.str;
+            description = lib.mdDoc "Attribute that lists members in a LDAP group.";
+            example = "uniqueMember";
+          };
+
+          creationDateAttribute = mkOption {
+            type = types.str;
+            description = lib.mdDoc "Attribute that lists a user's creation date.";
+            example = "whenCreated";
+          };
+
+          useEmailPrefixSuffix = mkOption {
+            type = types.bool;
+            default = false;
+            description = lib.mdDoc "If a user has no email address, combine a username prefix with a suffix value to form an email.";
+          };
+          emailPrefixAttribute = mkOption {
+            type = types.str;
+            description = lib.mdDoc "The attribute that contains the users username.";
+            example = "accountName";
+          };
+          emailSuffix = mkOption {
+            type = types.str;
+            description = lib.mdDoc "Suffix for the email, normally @example.com.";
+            example = "@example.com";
+          };
+
+          users = mkOption {
+            type = types.bool;
+            default = false;
+            description = lib.mdDoc "Sync users.";
+          };
+          userPath = mkOption {
+            type = types.str;
+            description = lib.mdDoc "User directory, relative to root.";
+            default = "ou=users";
+          };
+          userObjectClass = mkOption {
+            type = types.str;
+            description = lib.mdDoc "Class that users must have.";
+            default = "inetOrgPerson";
+          };
+          userEmailAttribute = mkOption {
+            type = types.str;
+            description = lib.mdDoc "Attribute for a users email.";
+            default = "mail";
+          };
+          userFilter = mkOption {
+            type = types.str;
+            description = lib.mdDoc "LDAP filter for users.";
+            example = "(memberOf=cn=sales,ou=groups,dc=example,dc=com)";
+            default = "";
+          };
+
+          groups = mkOption {
+            type = types.bool;
+            default = false;
+            description = lib.mdDoc "Whether to sync ldap groups into BitWarden.";
+          };
+          groupPath = mkOption {
+            type = types.str;
+            description = lib.mdDoc "Group directory, relative to root.";
+            default = "ou=groups";
+          };
+          groupObjectClass = mkOption {
+            type = types.str;
+            description = lib.mdDoc "A class that groups will have.";
+            default = "groupOfNames";
+          };
+          groupNameAttribute = mkOption {
+            type = types.str;
+            description = lib.mdDoc "Attribute for a name of group.";
+            default = "cn";
+          };
+          groupFilter = mkOption {
+            type = types.str;
+            description = lib.mdDoc "LDAP filter for groups.";
+            example = "(cn=sales)";
+            default = "";
+          };
+        };
+      });
+    };
+
+    secrets = {
+      ldap = mkOption {
+        type = types.str;
+        description = "Path to file that contains LDAP password for user in {option}`ldap.username";
+      };
+
+      bitwarden = {
+        client_path_id = mkOption {
+          type = types.str;
+          description = "Path to file that contains Client ID.";
+        };
+        client_path_secret = mkOption {
+          type = types.str;
+          description = "Path to file that contains Client Secret.";
+        };
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    users.groups."${cfg.user}" = {};
+    users.users."${cfg.user}" = {
+      isSystemUser = true;
+      group = cfg.user;
+    };
+
+    systemd = {
+      timers.bitwarden-directory-connector-cli = {
+        description = "Sync timer for Bitwarden Directory Connector";
+        wantedBy = ["timers.target"];
+        after = ["network-online.target"];
+        timerConfig = {
+          OnCalendar = cfg.interval;
+          Unit = "bitwarden-directory-connector-cli.service";
+          Persistent = true;
+        };
+      };
+
+      services.bitwarden-directory-connector-cli = {
+        description = "Main process for Bitwarden Directory Connector";
+
+        environment = {
+          BITWARDENCLI_CONNECTOR_APPDATA_DIR = "/tmp";
+          BITWARDENCLI_CONNECTOR_PLAINTEXT_SECRETS = "true";
+        };
+
+        serviceConfig = {
+          Type = "oneshot";
+          User = "${cfg.user}";
+          PrivateTmp = true;
+          ExecStartPre = pkgs.writeShellScript "bitwarden_directory_connector-config" ''
+            set -eo pipefail
+
+            # create the config file
+            ${lib.getExe cfg.package} data-file
+            touch /tmp/data.json.tmp
+            chmod 600 /tmp/data.json{,.tmp}
+
+            ${lib.getExe cfg.package} config server ${cfg.domain}
+
+            # now login to set credentials
+            export BW_CLIENTID="$(< ${escapeShellArg cfg.secrets.bitwarden.client_path_id})"
+            export BW_CLIENTSECRET="$(< ${escapeShellArg cfg.secrets.bitwarden.client_path_secret})"
+            ${lib.getExe cfg.package} login
+
+            ${lib.getExe pkgs.jq} '.authenticatedAccounts[0] as $account
+              | .[$account].directoryConfigurations.ldap |= $ldap_data
+              | .[$account].directorySettings.organizationId |= $orgID
+              | .[$account].directorySettings.sync |= $sync_data' \
+              --argjson ldap_data ${escapeShellArg cfg.ldap.finalJSON} \
+              --arg orgID "''${BW_CLIENTID//organization.}" \
+              --argjson sync_data ${escapeShellArg cfg.sync.finalJSON} \
+              /tmp/data.json \
+              > /tmp/data.json.tmp
+
+            mv -f /tmp/data.json.tmp /tmp/data.json
+
+            # final config
+            ${lib.getExe cfg.package} config directory 0
+            ${lib.getExe cfg.package} config ldap.password --secretfile ${cfg.secrets.ldap}
+          '';
+
+          ExecStart = "${lib.getExe cfg.package} sync";
+        };
+      };
+    };
+  };
+
+  meta.maintainers = with maintainers; [Silver-Golden];
+}
--- a/applications/bitwarden/bitwarden_sync.nix
+++ b/applications/bitwarden/bitwarden_sync.nix
@ -6,7 +6,9 @@
 }: let
  user = "bwdc";
 in {
-  imports = [];
+  imports = [
+    ./bitwarden-directory-connector-cli.nix
+  ];

  options = {};

--- a/applications/bitwarden/vaultwarden.nix
+++ b/applications/bitwarden/vaultwarden.nix
@ -13,6 +13,9 @@ with lib; let
  domain = "${domain_sub}.skynet.ie";
 in {
  imports = [
+    ../acme.nix
+    ../dns.nix
+    ../nginx.nix
  ];

  options.services.skynet."${name}" = {
--- a/applications/discord.nix
+++ b/applications/discord.nix
@ -21,6 +21,7 @@ in {
    #backups = [ "/etc/silver_ul_ical/database.db" ];

    age.secrets.discord_token.file = ../secrets/discord/token.age;
+    age.secrets.discord_ldap.file = ../secrets/discord/ldap.age;
    age.secrets.discord_mail.file = ../secrets/email/details.age;
    age.secrets.discord_wolves.file = ../secrets/wolves/details.age;

@ -30,9 +31,12 @@ in {

      env = {
        discord = config.age.secrets.discord_token.path;
+        ldap = config.age.secrets.discord_ldap.path;
        mail = config.age.secrets.discord_mail.path;
        wolves = config.age.secrets.discord_wolves.path;
      };
+
+      discord.server = "689189992417067052";
    };
  };
 }
--- a/applications/dns/dns.nix
+++ b/applications/dns/dns.nix
@ -3,42 +3,19 @@
  pkgs,
  config,
  nodes,
-  self,
  ...
 }: let
  name = "dns";
  cfg = config.services.skynet."${name}";

  # reads that date to a string (will need to be fixed in 2038)
-  current_date = self.lastModified;
-
-  # this gets a list of all domains we have records for
-  domains = lib.lists.naturalSort (lib.lists.unique (
-    lib.lists.forEach records (x: x.domain)
-  ));
-
-  # get the ip's of our servers
-  servers = lib.lists.naturalSort (lib.lists.unique (
-    lib.lists.forEach (sort_records_a_server records) (x: x.value)
-  ));
-
-  domains_owned = [
-    # for historic reasons we own this
-    "csn.ul.ie"
-    # the main one we use now
-    "skynet.ie"
-    # a backup
-    "ulcompsoc.ie"
-  ];
+  current_date = lib.readFile "${pkgs.runCommand "timestamp" {} "echo -n `date +%s` > $out"}";

  # gets a list of records that match this type
-  filter_records_type = records: r_type: builtins.filter (x: x.r_type == r_type) records;
-  # Get all the A records that are for servers (base record for them)
-  filter_records_a_server = records: builtins.filter (x: builtins.hasAttr "server" x && x.server) (filter_records_type records "A");
-  # Every other A record
-  filter_records_a = records: builtins.filter (x: builtins.hasAttr "server" x && !x.server) (filter_records_type records "A");
+  filter_records_type = r_type: builtins.filter (x: x.r_type == r_type) records;
+  filter_records_server = builtins.filter (x: builtins.hasAttr "server" x && x.server) (filter_records_type "A");
+  filter_records_a = builtins.filter (x: builtins.hasAttr "server" x && !x.server) (filter_records_type "A");

-  # These functions are to get the final 3 digits of an IP address so we can use them for reverse pointer
  process_ptr = records: lib.lists.forEach records (x: process_ptr_sub x);
  process_ptr_sub = record: {
    record = builtins.substring 9 3 record.record;
@ -47,100 +24,87 @@
  };
  ip_ptr_to_int = ip: lib.strings.toInt (builtins.substring 9 3 ip);

-  # filter and sort records so we cna group them in the right place later
-  sort_records_a_server = records: builtins.sort (a: b: a.record < b.record) (filter_records_a_server records);
-  sort_records_a = records: builtins.sort (a: b: (ip_ptr_to_int a.value) < (ip_ptr_to_int b.value)) (filter_records_a records);
-  sort_records_cname = records: builtins.sort (a: b: a.value < b.value) (filter_records_type records "CNAME");
-  sort_records_ptr = records: builtins.sort (a: b: (lib.strings.toInt a.record) < (lib.strings.toInt b.record)) (process_ptr (filter_records_type records "PTR"));
-  sort_records_srv = records: builtins.sort (a: b: a.record < b.record) (filter_records_type records "SRV");
+  sort_records_server = builtins.sort (a: b: a.record < b.record) filter_records_server;
+  sort_records_a = builtins.sort (a: b: (ip_ptr_to_int a.value) < (ip_ptr_to_int b.value)) filter_records_a;
+  sort_records_cname = builtins.sort (a: b: a.value < b.value) (filter_records_type "CNAME");
+  sort_records_ptr = builtins.sort (a: b: (lib.strings.toInt a.record) < (lib.strings.toInt b.record)) (process_ptr (filter_records_type "PTR"));
+  sort_records_srv = builtins.sort (a: b: a.record < b.record) (filter_records_type "SRV");

-  # a tad overkill but type guarding is useful
-  max = x: y:
-    assert builtins.isInt x;
-    assert builtins.isInt y;
-      if x < y
-      then y
-      else x;
+  format_records = records: offset: lib.strings.concatMapStrings (x: "${padString x.record offset} IN ${padString x.r_type 5} ${x.value}\n") records;

-  # get teh max length of a list of strings
-  max_len = records: lib.lists.foldr (a: b: (max a b)) 0 (lib.lists.forEach records (record: lib.strings.stringLength record.record));
-
-  # Now that we can get teh max lenth of a list of strings
-  # we can pad it out to the max len +1
-  # this is so that teh generated file is easier for a human to read
-  format_records = records: let
-    offset = (max_len records) + 1;
-  in
-    lib.strings.concatMapStrings (x: "${padString x.record offset} IN ${padString x.r_type 5} ${x.value}\n") records;
-
-  # small function to add spaces until it reaches teh required length
+  # small function to trim it down a tad
  padString = text: length: fixedWidthString_post length " " text;

  # like lib.strings.fixedWidthString but postfix
-  # recursive function to extend a string up to a limit
  fixedWidthString_post = width: filler: str: let
    strw = lib.stringLength str;
    reqWidth = width - (lib.stringLength filler);
  in
-    # this is here because we were manually setting teh length, now max_len does that for us
    assert lib.assertMsg (strw <= width) "fixedWidthString_post: requested string length (${toString width}) must not be shorter than actual length (${toString strw})";
      if strw == width
      then str
      else (fixedWidthString_post reqWidth filler str) + filler;

  # base config for domains we own (skynet.ie, csn.ul.ie, ulcompsoc.ie)
-  # ";" are comments in this file
  get_config_file = (
-    domain: records: ''
+    domain: ''
      $TTL 60  ; 1 minute
-      ; hostmaster@skynet.ie is an email address that recieves stuff related to dns
-      @ IN SOA ${nameserver}.skynet.ie. hostmaster.skynet.ie. (
+      ; hostmaster@${domain} is an email address that recieves stuff related to dns
+      @ IN SOA ${nameserver}.${domain}. hostmaster.${domain}. (
         ; Serial (YYYYMMDDCC) this has to be updated for each time the record is updated
-         ${toString current_date}
+         ${current_date}
         600        ; Refresh (10 minutes)
         300        ; Retry   (5 minutes)
         604800     ; Expire  (1 week)
         3600       ; Minimum (1 hour)
        )

-      ; @ stands for teh root domain so teh A record below is where ${domain} points to
-      @ NS  ns1.skynet.ie.
-      @ NS  ns2.skynet.ie.
+      @ NS  ns1.${domain}.
+      @ NS  ns2.${domain}.
+        ; @ stands for teh root domain so teh A record below is where ${domain} points to
+      ;@ A   193.1.99.76
+      ;@ MX  5 ${domain}.
+
+      ; can have multiple mailserves
+      @ MX  10 mail.${domain}.
+

      ; ------------------------------------------
      ; Server Names (A Records)
      ; ------------------------------------------
-      ${format_records (sort_records_a_server records)}
+      ${format_records sort_records_server 31}

      ; ------------------------------------------
      ; A (non server names
      ; ------------------------------------------
-      ${format_records (sort_records_a records)}
+      ${format_records sort_records_a 31}

      ; ------------------------------------------
      ; CNAMES
      ; ------------------------------------------
-      ${format_records (sort_records_cname records)}
+      ${format_records sort_records_cname 31}

      ; ------------------------------------------
      ; TXT
      ; ------------------------------------------
-      ${format_records (filter_records_type records "TXT")}
+      ${format_records (filter_records_type "TXT") 31}

      ; ------------------------------------------
      ; MX
      ; ------------------------------------------
-      ${format_records (filter_records_type records "MX")}
+      ${format_records (filter_records_type "MX") 31}

      ; ------------------------------------------
      ; SRV
      ; ------------------------------------------
-      ${format_records (sort_records_srv records)}
+      ${format_records sort_records_srv 65}
+
+
    ''
  );

  # https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/4/html/reference_guide/s2-bind-configuration-zone-reverse
-  # config for our reverse dns pointers (not properly working)
+  # config for our reverse dnspointers (not properly working)
  get_config_file_rev = (
    domain: ''
      $ORIGIN 64-64.99.1.193.in-addr.arpa.
@ -148,7 +112,7 @@
      ; hostmaster@skynet.ie is an email address that recieves stuff related to dns
      @ IN SOA ${nameserver}.skynet.ie. hostmaster.skynet.ie. (
         ; Serial (YYYYMMDDCC) this has to be updated for each time the record is updated
-         ${toString current_date}
+         ${current_date}
         600        ; Refresh (10 minutes)
         300        ; Retry   (5 minutes)
         604800     ; Expire  (1 week)
@ -161,37 +125,55 @@
      ; ------------------------------------------
      ; PTR
      ; ------------------------------------------
-      ${format_records (sort_records_ptr records)}
+      ${format_records sort_records_ptr 3}
    ''
  );

-  # arrays  of teh two nameservers
-  nameserver_1 = ["193.1.99.109"];
-  nameserver_2 = ["193.1.99.120"];
+  # domains we dont have proper ownship over, only here to ensure the logs dont get cluttered.
+  get_config_file_old_domains = (
+    domain: ''
+      $TTL 60  ; 1 minute
+      ; hostmaster@skynet.ie is an email address that recieves stuff related to dns
+      @ IN SOA ${nameserver}.skynet.ie. hostmaster.skynet.ie. (
+         ; Serial (YYYYMMDDCC) this has to be updated for each time the record is updated
+         ${current_date}
+         600        ; Refresh (10 minutes)
+         300        ; Retry   (5 minutes)
+         604800     ; Expire  (1 week)
+         3600       ; Minimum (1 hour)
+        )
+
+      @ NS  ns1.skynet.ie.
+      @ NS  ns2.skynet.ie.
+
+    ''
+  );
+
+  # arrys  of teh two nameservers
+  tmp1 = ["193.1.99.109"];
+  tmp2 = ["193.1.99.120"];

  primaries = (
    if cfg.server.primary
    then
      # primary servers have no primaries (ones they listen to)
      []
-    else if builtins.elem cfg.server.ip nameserver_1
-    then nameserver_2
-    else nameserver_1
+    else if builtins.elem cfg.server.ip tmp1
+    then tmp2
+    else tmp1
  );

  secondaries = (
    if cfg.server.primary
    then
-      if builtins.elem cfg.server.ip nameserver_1
-      then nameserver_2
-      else nameserver_1
+      if builtins.elem cfg.server.ip tmp1
+      then tmp2
+      else tmp1
    else []
  );

  # small function to tidy up the spam of the cache networks, would use teh subnet except all external traffic has the ip of teh router
-  # now limited explicitly to servers that we are administering
-  # See i24-09-30_050 for more information
-  create_cache_networks = map (x: "${toString x}/32") servers;
+  create_cache_networks = map (x: "193.1.99.${toString x}/32") (lib.lists.range 71 126);

  # standard function to create the etc file, pass in the text and domain and it makes it
  create_entry_etc_sub = domain: text: {
@ -203,38 +185,27 @@
      # The UNIX file mode bits
      mode = "0664";

-      # content of the file
      text = text;
    };
  };
+  # (text.owned "csn.ul.ie")

  # standard function to create the etc file, pass in the text and domain and it makes it
-  create_entry_etc = domain: type: let
-    domain_records = lib.lists.filter (x: x.domain == domain) records;
-  in
-    # this is the main type of record that most folks are used to
+  create_entry_etc = domain: type:
    if type == "owned"
-    then create_entry_etc_sub domain (get_config_file domain domain_records)
-    # reverse lookups allow for using an IP to find domains pointing to it
+    then create_entry_etc_sub domain (text.owned domain)
    else if type == "reverse"
-    then create_entry_etc_sub domain (get_config_file_rev domain)
+    then create_entry_etc_sub domain (text.reverse domain)
+    else if type == "old"
+    then create_entry_etc_sub domain (text.old domain)
    else {};

-  create_entry_zone = domain: let
-    if_primary_and_owned =
-      if cfg.server.primary && (lib.lists.any (item: item == domain) domains_owned)
-      then ''
-        allow-update { key rfc2136key.skynet.ie.; };
-        dnssec-policy default;
-        inline-signing yes;
-      ''
-      else "";
-  in {
+  create_entry_zone = domain: extraConfig: {
    "${domain}" = {
      extraConfig = ''
-        ${if_primary_and_owned}
+        ${extraConfig}
        // for bumping the config
-        // ${toString current_date}
+        // ${current_date}
      '';
      # really wish teh nixos config didnt use master/slave
      master = cfg.server.primary;
@ -247,16 +218,69 @@
    };
  };

+  text = {
+    owned = domain: get_config_file domain;
+    reverse = domain: get_config_file_rev domain;
+    old = domain: get_config_file_old_domains domain;
+  };
+
+  extraConfig = {
+    owned =
+      if cfg.server.primary
+      then ''
+        allow-update { key rfc2136key.skynet.ie.; };
+
+        dnssec-policy default;
+        inline-signing yes;
+      ''
+      else "";
+
+    # no extra config for reverse
+    reverse = "";
+
+    old = "";
+  };
+
  records =
    config.skynet.records
-    /*
-    Need to "manually" grab it from each server.
-    Nix is laxy evalusted so if it does not need to open a file it wont.
-    This is to iterate through each server (node) and evaluate the dns records for that server.
-    */
    ++ builtins.concatLists (
      lib.attrsets.mapAttrsToList (
-        key: value: value.config.services.skynet.dns.records
+        key: value: let
+          details_server = value.config.services.skynet."${name}".server;
+          details_records = value.config.services.skynet."${name}".records;
+        in
+          if builtins.hasAttr "dns" value.config.services.skynet
+          then
+            (
+              # got to handle habing a dns record for the dns serves themselves.
+              if details_server.enable
+              then
+                (
+                  if details_server.primary
+                  then
+                    details_records
+                    ++ [
+                      {
+                        record = "ns1";
+                        r_type = "A";
+                        value = details_server.ip;
+                        server = false;
+                      }
+                    ]
+                  else
+                    details_records
+                    ++ [
+                      {
+                        record = "ns2";
+                        r_type = "A";
+                        value = details_server.ip;
+                        server = false;
+                      }
+                    ]
+                )
+              else details_records
+            )
+          else []
      )
      nodes
    );
@ -267,7 +291,8 @@
    else "ns2";
 in {
  imports = [
-    ../../config/dns.nix
+    ./firewall.nix
+    ../config/dns.nix
  ];

  options.services.skynet."${name}" = {
@ -291,11 +316,28 @@ in {
      };
    };

+    # mirrorred in ../config/dns.nix
    records = lib.mkOption {
      description = "Records, sorted based on therir type";
-      type = lib.types.listOf (lib.types.submodule (import ./options-records.nix {
-        inherit lib;
-      }));
+      type = with lib.types;
+        listOf (submodule {
+          options = {
+            record = lib.mkOption {
+              type = str;
+            };
+            r_type = lib.mkOption {
+              type = enum ["A" "CNAME" "TXT" "PTR" "SRV" "MX"];
+            };
+            value = lib.mkOption {
+              type = str;
+            };
+            server = lib.mkOption {
+              description = "Core record for a server";
+              type = bool;
+              default = false;
+            };
+          };
+        });
    };
  };

@ -314,40 +356,29 @@ in {
      "ip daddr ${cfg.server.ip} udp dport 53 counter packets 0 bytes 0 accept"
    ];

-    services.skynet.dns.records = [
-      {
-        record = nameserver;
-        r_type = "A";
-        value = config.services.skynet.host.ip;
-      }
-    ];
+    services.bind.zones =
+      (create_entry_zone "csn.ul.ie" extraConfig.owned)
+      // (create_entry_zone "skynet.ie" extraConfig.owned)
+      // (create_entry_zone "ulcompsoc.ie" extraConfig.owned)
+      // (create_entry_zone "64-64.99.1.193.in-addr.arpa" extraConfig.reverse)
+      // (create_entry_zone "conradcollins.net" extraConfig.old)
+      // (create_entry_zone "edelharty.net" extraConfig.old);

-    services.bind.zones = lib.attrsets.mergeAttrsList (
-      # uses teh domains lsited in teh records
-      (lib.lists.forEach domains (domain: (create_entry_zone domain)))
-      # we have to do a reverse dns
-      ++ [
-        (create_entry_zone "64-64.99.1.193.in-addr.arpa")
-      ]
-    );
-
-    environment.etc = lib.attrsets.mergeAttrsList (
-      # uses teh domains lsited in teh records
-      (lib.lists.forEach domains (domain: (create_entry_etc domain "owned")))
-      # we have to do a reverse dns
-      ++ [
-        (create_entry_etc "64-64.99.1.193.in-addr.arpa" "reverse")
-      ]
-    );
+    environment.etc =
+      (create_entry_etc "csn.ul.ie" "owned")
+      // (create_entry_etc "skynet.ie" "owned")
+      // (create_entry_etc "ulcompsoc.ie" "owned")
+      // (create_entry_etc "64-64.99.1.193.in-addr.arpa" "reverse")
+      // (create_entry_etc "conradcollins.net" "old")
+      // (create_entry_etc "edelharty.net" "old");

    # secrets required
    age.secrets.dns_dnskeys = {
-      file = ../../secrets/dns_dnskeys.conf.age;
+      file = ../secrets/dns_dnskeys.conf.age;
      owner = "named";
      group = "named";
    };

-    # basic but ensure teh dns ports are open
    networking.firewall = {
      allowedTCPPorts = [53];
      allowedUDPPorts = [53];
--- a/applications/dns/options-records.nix
+++ b/applications/dns/options-records.nix
@ -1,31 +0,0 @@
-/*
-Define the options for dns records here.
-They are imported into anything that needs to use them
-*/
-{lib, ...}:
-with lib; {
-  options = {
-    domain = lib.mkOption {
-      description = "Domain this record is for";
-      type = lib.types.str;
-      default = "skynet.ie";
-    };
-    record = lib.mkOption {
-      description = "What you want to name the subdomain.";
-      type = lib.types.str;
-    };
-    r_type = lib.mkOption {
-      description = "Type of record that this is.";
-      type = lib.types.enum ["A" "CNAME" "TXT" "PTR" "SRV" "MX"];
-    };
-    value = lib.mkOption {
-      description = "What the record points to, normally ip or another record.";
-      type = lib.types.str;
-    };
-    server = lib.mkOption {
-      description = "Core record for a server";
-      type = lib.types.bool;
-      default = false;
-    };
-  };
-}
--- a/applications/email.nix
+++ b/applications/email.nix
@ -92,7 +92,7 @@ with lib; let
    }
  ];

-  sieveConfigFile =
+  configFile =
    # https://doc.dovecot.org/configuration_manual/sieve/examples/#plus-addressed-mail-filtering
    pkgs.writeText "basic_sieve"
    ''
@ -105,36 +105,24 @@ with lib; let

      # this should be close to teh last step
      if allof (
-        address  :localpart ["To", "Cc"] ["${toString create_config_to}"],
-        address  :domain ["To", "Cc"] "skynet.ie"
-        ){
-        if address :matches ["To", "Cc"] "*@skynet.ie" {
-          if header :is "X-Spam" "Yes" {
-            fileinto :create "''${1}.Junk";
-            stop;
-          } else {
-            fileinto :create "''${1}";
-            stop;
+          address  :localpart ["To"] ["${toString create_config_to}"],
+          address  :domain ["To"] "skynet.ie"
+          ){
+          if address :matches ["To"] "*@skynet.ie" {
+            if header :is "X-Spam" "Yes" {
+              fileinto :create "''${1}.Junk";
+              stop;
+            } else {
+              fileinto :create "''${1}";
+            }
          }
-        }
-      }
-      if allof (
-        address  :localpart ["From"] ["${toString create_config_to}"],
-        address  :domain ["From"] "skynet.ie"
-        ){
-        if address :matches ["From"] "*@skynet.ie" {
-          if header :is "X-Spam" "Yes" {
-            fileinto :create "''${1}.Junk";
-            stop;
-          } else {
-            fileinto :create "''${1}";
-            stop;
-          }
-        }
      }
    '';
 in {
  imports = [
+    ./dns.nix
+    ./acme.nix
+    ./nginx.nix
    inputs.simple-nixos-mailserver.nixosModule

    # for teh config
@ -202,7 +190,7 @@ in {

  config = mkIf cfg.enable {
    services.skynet.backup.normal.backups = [
-      #"/var/vmail"
+      "/var/vmail"
      "/var/dkim"
    ];

@ -282,109 +270,95 @@ in {
    };

    # set up dns record for it
-    services.skynet.dns.records =
-      [
-        # core record
-        {
-          record = "@";
-          r_type = "MX";
-          # the number is the priority in teh case of multiple mailservers
-          value = "10 mail.${cfg.domain}.";
-        }
+    services.skynet.dns.records = [
+      # basic one
+      {
+        record = "mail";
+        r_type = "A";
+        value = config.services.skynet.host.ip;
+      }
+      #DNS config for K-9 Mail
+      {
+        record = "imap";
+        r_type = "CNAME";
+        value = "mail";
+      }
+      {
+        record = "pop3";
+        r_type = "CNAME";
+        value = "mail";
+      }
+      {
+        record = "smtp";
+        r_type = "CNAME";
+        value = "mail";
+      }

-        # basic one
-        {
-          record = "mail";
-          r_type = "A";
-          value = config.services.skynet.host.ip;
-        }
-        #DNS config for K-9 Mail
-        {
-          record = "imap";
-          r_type = "CNAME";
-          value = "mail";
-        }
-        {
-          record = "pop3";
-          r_type = "CNAME";
-          value = "mail";
-        }
-        {
-          record = "smtp";
-          r_type = "CNAME";
-          value = "mail";
-        }
-
-        # TXT records, all tehse are inside escaped strings to allow using ""
-
-        # reverse pointer
-        {
-          record = config.services.skynet.host.ip;
-          r_type = "PTR";
-          value = "${cfg.sub}.${cfg.domain}.";
-        }
-
-        # SRV records to help gmail on android etc find the correct mail.skynet.ie domain for config rather than just defaulting to skynet.ie
-        # https://serverfault.com/questions/935192/how-to-setup-auto-configure-email-for-android-mail-app-on-your-server/1018406#1018406
-        # response should be:
-        # _imap._tcp       SRV  0 1 143 imap.example.com.
-        {
-          record = "_imaps._tcp";
-          r_type = "SRV";
-          value = "0 1 993 ${cfg.sub}.${cfg.domain}.";
-        }
-        {
-          record = "_imap._tcp";
-          r_type = "SRV";
-          value = "0 1 143 ${cfg.sub}.${cfg.domain}.";
-        }
-        {
-          record = "_submissions._tcp";
-          r_type = "SRV";
-          value = "0 1 465 ${cfg.sub}.${cfg.domain}.";
-        }
-        {
-          record = "_submission._tcp";
-          r_type = "SRV";
-          value = "0 1 587 ${cfg.sub}.${cfg.domain}.";
-        }
-      ]
+      # TXT records, all tehse are inside escaped strings to allow using ""
      # SPF record
-      ++ [
-        {
-          record = "${cfg.domain}.";
-          r_type = "TXT";
-          value = ''"v=spf1 a:${cfg.sub}.${cfg.domain} ip4:${config.services.skynet.host.ip} -all"'';
-        }
-      ]
+      {
+        record = "${cfg.domain}.";
+        r_type = "TXT";
+        value = ''"v=spf1 a:${cfg.sub}.${cfg.domain} -all"'';
+      }
+
      # DKIM keys
-      ++ [
-        {
-          record = "mail._domainkey.skynet.ie.";
-          r_type = "TXT";
-          value = ''"v=DKIM1; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCxju1Ie60BdHwyFVPNQKovL/cX9IFPzBKgjnHZf+WBzDCFKSBpf7NvnfXajtFDQN0poaN/Qfifid+V55ZCNDBn8Y3qZa4Y69iNiLw2DdvYf0HdnxX6+pLpbmj7tikGGLJ62xnhkJhoELnz5gCOhpyoiv0tSQVaJpaGZmoll861/QIDAQAB"'';
-        }
-        {
-          domain = "ulcompsoc.ie";
-          record = "mail._domainkey.ulcompsoc.ie.";
-          r_type = "TXT";
-          value = ''"v=DKIM1; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDl8ptSASx37t5sfmU2d2Y6yi9AVrsNFBZDmJ2uaLa4NuvAjxGQCw4wx+1Jui/HOuKYLpntLsjN851wgPR+3i51g4OblqBDvcHn9NYgWRZfHj9AASANQjdsaAbkXuyKuO46hZqeWlpESAcD6a4Evam4fkm+kiZC0+rccb4cWgsuLwIDAQAB"'';
-        }
-      ]
+      {
+        record = "mail._domainkey.skynet.ie.";
+        r_type = "TXT";
+        value = ''"v=DKIM1; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCxju1Ie60BdHwyFVPNQKovL/cX9IFPzBKgjnHZf+WBzDCFKSBpf7NvnfXajtFDQN0poaN/Qfifid+V55ZCNDBn8Y3qZa4Y69iNiLw2DdvYf0HdnxX6+pLpbmj7tikGGLJ62xnhkJhoELnz5gCOhpyoiv0tSQVaJpaGZmoll861/QIDAQAB"'';
+      }
+      {
+        record = "mail._domainkey.ulcompsoc.ie.";
+        r_type = "TXT";
+        value = ''"v=DKIM1; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDl8ptSASx37t5sfmU2d2Y6yi9AVrsNFBZDmJ2uaLa4NuvAjxGQCw4wx+1Jui/HOuKYLpntLsjN851wgPR+3i51g4OblqBDvcHn9NYgWRZfHj9AASANQjdsaAbkXuyKuO46hZqeWlpESAcD6a4Evam4fkm+kiZC0+rccb4cWgsuLwIDAQAB"'';
+      }
+
      # DMARC
-      ++ [
-        {
-          record = "_dmarc.${cfg.domain}.";
-          r_type = "TXT";
-          # p     : quarantine => sends to spam, reject => never sent
-          # rua   : mail that receives reports about DMARC activity
-          # pct   : percentage of unathenticated messages that DMARC stops
-          # adkim : alignment policy for DKIM, s => Strict, subdomains arent allowed, r => relaxed, subdomains allowed
-          # aspf  : alignment policy for SPF, s => Strict, subdomains arent allowed, r => relaxed, subdomains allowed
-          # sp    : DMARC policy for subdomains, none => no action, reports to rua, quarantine => spam, reject => never sent
-          value = ''"v=DMARC1; p=quarantine; rua=mailto:mailman@skynet.ie; pct=100; adkim=s; aspf=s; sp=quarantine"'';
-        }
-      ];
+      {
+        record = "_dmarc.${cfg.domain}.";
+        r_type = "TXT";
+        # p     : quarantine => sends to spam, reject => never sent
+        # rua   : mail that receives reports about DMARC activity
+        # pct   : percentage of unathenticated messages that DMARC stops
+        # adkim : alignment policy for DKIM, s => Strict, subdomains arent allowed, r => relaxed, subdomains allowed
+        # aspf  : alignment policy for SPF, s => Strict, subdomains arent allowed, r => relaxed, subdomains allowed
+        # sp    : DMARC policy for subdomains, none => no action, reports to rua, quarantine => spam, reject => never sent
+        value = ''"v=DMARC1; p=quarantine; rua=mailto:mailman@skynet.ie; pct=100; adkim=s; aspf=s; sp=none"'';
+      }
+
+      # reverse pointer
+      {
+        record = config.services.skynet.host.ip;
+        r_type = "PTR";
+        value = "${cfg.sub}.${cfg.domain}.";
+      }
+
+      # SRV records to help gmail on android etc find the correct mail.skynet.ie domain for config rather than just defaulting to skynet.ie
+      # https://serverfault.com/questions/935192/how-to-setup-auto-configure-email-for-android-mail-app-on-your-server/1018406#1018406
+      # response should be:
+      # _imap._tcp       SRV  0 1 143 imap.example.com.
+      {
+        record = "_imaps._tcp";
+        r_type = "SRV";
+        value = "0 1 993 ${cfg.sub}.${cfg.domain}.";
+      }
+      {
+        record = "_imap._tcp";
+        r_type = "SRV";
+        value = "0 1 143 ${cfg.sub}.${cfg.domain}.";
+      }
+      {
+        record = "_submissions._tcp";
+        r_type = "SRV";
+        value = "0 1 465 ${cfg.sub}.${cfg.domain}.";
+      }
+      {
+        record = "_submission._tcp";
+        r_type = "SRV";
+        value = "0 1 587 ${cfg.sub}.${cfg.domain}.";
+      }
+    ];

    #https://nixos-mailserver.readthedocs.io/en/latest/add-roundcube.html
    users.groups.nginx = {};
@ -477,40 +451,7 @@ in {
    };

    services.dovecot2.sieve.scripts = {
-      before = sieveConfigFile;
-    };
-
-    # This is to add a bcc to outgoing mail
-    # this then interacts with teh filters to put it in the right folder
-    # we can directly add to the postfix service here
-    services.postfix = let
-      # mostly copied from the upstream mailserver config/functions
-      mappedFile = name: "hash:/var/lib/postfix/conf/${name}";
-
-      sender_bcc_maps_file = let
-        content = lookupTableToString create_skynet_service_bcc;
-      in
-        builtins.toFile "sender_bcc_maps" content;
-
-      lookupTableToString = attrs: let
-        valueToString = value: lib.concatStringsSep ", " value;
-      in
-        lib.concatStringsSep "\n" (lib.mapAttrsToList (name: value: "${name} ${valueToString value}") attrs);
-
-      # convert the mailboxes config to something that can be used here
-      create_skynet_email_bcc = mailbox: {
-        name = "${mailbox}@skynet.ie";
-        value = ["${mailbox}@skynet.ie"];
-      };
-      create_skynet_service_bcc = builtins.listToAttrs (map (mailbox: (create_skynet_email_bcc mailbox.account)) service_mailboxes);
-    in {
-      mapFiles."sender_bcc_maps" = sender_bcc_maps_file;
-
-      config = {
-        sender_bcc_maps = [
-          (mappedFile "sender_bcc_maps")
-        ];
-      };
+      before = configFile;
    };

    # tune the spam filter
--- a/applications/games/minecraft.nix
+++ b/applications/games/minecraft.nix
@ -1,60 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  inputs,
-  ...
-}: let
-  # function to create the cname record for eachs erver
-  create_cname = configs:
-    lib.lists.forEach configs (
-      c: {
-        record = "${c.address}.games";
-        r_type = "CNAME";
-        value = config.services.skynet.host.name;
-      }
-    );
-
-  # function to create the srv record
-  # this allows us to change the port without impacting (java) users
-  create_srv = configs:
-    lib.lists.forEach configs (c: {
-      record = "_minecraft._tcp.${c.address}.games.skynet.ie.";
-      r_type = "SRV";
-      value = "0 10 ${c.port} ${config.services.skynet.host.name}.skynet.ie.";
-    });
-
-  servers = [
-    {
-      address = "minecraft.compsoc";
-      port = "25518";
-    }
-    {
-      address = "minecraft-classic.compsoc";
-      port = "25518";
-    }
-    {
-      address = "minecraft-aged.compsoc";
-      port = "25519";
-    }
-    {
-      address = "minecraft.gsoc";
-      port = "25521";
-    }
-    {
-      address = "minecraft.phildeb";
-      port = "25522";
-    }
-    {
-      address = "minecraft.anime";
-      port = "25523";
-    }
-  ];
-in {
-  imports = [
-  ];
-
-  config = {
-    services.skynet.dns.records = (create_cname servers) ++ (create_srv servers);
-  };
-}
--- a/applications/git/forgejo.nix
+++ b/applications/git/forgejo.nix
@ -1,129 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-with lib; let
-  name = "forgejo";
-  cfg = config.services.skynet."${name}";
-
-  domain_base = "${cfg.domain.base}.${cfg.domain.tld}";
-  domain_full = "${cfg.domain.sub}.${domain_base}";
-in {
-  imports = [
-  ];
-
-  options.services.skynet."${name}" = {
-    enable = mkEnableOption "Skynet Forgejo";
-
-    domain = {
-      tld = mkOption {
-        type = types.str;
-        default = "ie";
-      };
-
-      base = mkOption {
-        type = types.str;
-        default = "skynet";
-      };
-
-      sub = mkOption {
-        type = types.str;
-        default = name;
-      };
-    };
-
-    forgejo = {
-      port = mkOption {
-        type = types.port;
-        default = 3000;
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    #    age.secrets.forgejo-mailer-password = {
-    #      file = ../../secrets/forgejo/mailer-password.age;
-    #      mode = "400";
-    #      owner = "forgejo";
-    #    };
-
-    services.skynet.acme.domains = [
-      "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}"
-    ];
-
-    # using https://nixos.org/manual/nixos/stable/index.html#module-services-gitlab as a guide
-    services.skynet.dns.records = [
-      {
-        record = cfg.domain.sub;
-        r_type = "CNAME";
-        value = config.services.skynet.host.name;
-      }
-    ];
-
-    services.nginx.virtualHosts = {
-      # main site
-      "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}" = {
-        forceSSL = true;
-        useACMEHost = "skynet";
-        locations."/" = {
-          proxyPass = "http://localhost:${toString cfg.forgejo.port}";
-          extraConfig = ''
-            client_max_body_size 1000M;
-          '';
-        };
-      };
-    };
-
-    # for signing reasons
-    programs.gnupg.agent = {
-      enable = true;
-      enableSSHSupport = true;
-    };
-
-    services.forgejo = {
-      enable = true;
-      package = pkgs.forgejo;
-      database.type = "sqlite3";
-      # Enable support for Git Large File Storage
-      lfs.enable = true;
-      settings = {
-        server = {
-          DOMAIN = "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}";
-          # You need to specify this to remove the port from URLs in the web UI.
-          ROOT_URL = "https://${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}/";
-          HTTP_PORT = cfg.forgejo.port;
-        };
-
-        # You can temporarily allow registration to create an admin user.
-        service.DISABLE_REGISTRATION = true;
-
-        # Add support for actions, based on act: https://github.com/nektos/act
-        actions = {
-          ENABLED = true;
-          DEFAULT_ACTIONS_URL = "github";
-        };
-
-        # Allow for signing off merge requests
-        #        "repository.signing" = {
-        #          SIGNING_KEY = "5B2DED0FE9F8627A";
-        #          SIGNING_NAME = "Skynet";
-        #          SIGNING_EMAIL = "forgejo@glados.skynet.ie";
-        #          MERGES = "always";
-        #        };
-
-        # Sending emails is completely optional
-        # You can send a test email from the web UI at:
-        # Profile Picture > Site Administration > Configuration >  Mailer Configuration
-        #          mailer = {
-        #            ENABLED = true;
-        #            SMTP_ADDR = "mail.${cfg.domain.base}.${cfg.domain.tld}";
-        #            FROM = "noreply@${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}";
-        #            USER = "noreply@${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}";
-        #          };
-      };
-      #        mailerPasswordFile = config.age.secrets.forgejo-mailer-password.path;
-    };
-  };
-}
--- a/applications/git/forgejo_runner.nix
+++ b/applications/git/forgejo_runner.nix
@ -1,159 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  inputs,
-  ...
-}:
-with lib; let
-  name = "forgejo_runner";
-  cfg = config.services.skynet."${name}";
-in {
-  imports = [
-  ];
-
-  options.services.skynet."${name}" = {
-    enable = mkEnableOption "Skynet ForgeJo Runner";
-
-    runner = {
-      name = mkOption {
-        type = types.str;
-        default = config.networking.hostName;
-      };
-
-      website = mkOption {
-        default = "https://forgejo.skynet.ie";
-        type = types.str;
-      };
-
-      user = mkOption {
-        default = "gitea-runner";
-        type = types.str;
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    # https://search.nixos.org/options?from=0&size=50&sort=alpha_desc&type=packages&query=services.gitlab-runner.
-    environment.systemPackages = with pkgs; [
-      forgejo-actions-runner
-    ];
-
-    age.secrets.forgejo_runner_token = {
-      file = ../../secrets/forgejo/runners/token.age;
-      owner = cfg.runner.user;
-      group = cfg.runner.user;
-    };
-
-    # make sure the ssh config stuff is in teh right palce
-    systemd.tmpfiles.rules = [
-      #"d  /home/${cfg.runner.user}             0755 ${cfg.runner.user} ${cfg.runner.user}"
-      "L+ /home/${cfg.runner.user}/.ssh/config 0755 ${cfg.runner.user} ${cfg.runner.user}  -   ${./ssh_config}"
-    ];
-    age.secrets.forgejo_runner_ssh = {
-      file = ../../secrets/forgejo/runners/ssh.age;
-      mode = "600";
-      owner = "${cfg.runner.user}";
-      group = "${cfg.runner.user}";
-      symlink = false;
-      path = "/home/${cfg.runner.user}/.ssh/skynet/root";
-    };
-
-    nix = {
-      settings = {
-        trusted-users = [
-          # allow the runner to build nix stuff and to use the cache
-          "gitea-runner"
-        ];
-        trusted-public-keys = [
-          "skynet-cache:zMFLzcRZPhUpjXUy8SF8Cf7KGAZwo98SKrzeXvdWABo="
-          "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-        ];
-        substituters = [
-          "https://nix-cache.skynet.ie/skynet-cache/"
-          "https://cache.nixos.org/"
-        ];
-        trusted-substituters = [
-          "https://nix-cache.skynet.ie/skynet-cache/"
-          "https://cache.nixos.org/"
-        ];
-      };
-    };
-
-    # very basic setup to always be watching for changes in teh cache
-    systemd.services.attic-uploader = {
-      enable = true;
-      serviceConfig = {
-        ExecStart = "${pkgs.attic-client}/bin/attic watch-store skynet-cache";
-        User = "root";
-        Restart = "always";
-        RestartSec = 1;
-      };
-    };
-
-    # give teh runner user a home to store teh ssh config stuff
-    systemd.services.gitea-runner-default.serviceConfig = {
-      DynamicUser = lib.mkForce false;
-      User = lib.mkForce cfg.runner.user;
-    };
-    users = {
-      groups."${cfg.runner.user}" = {};
-      users."${cfg.runner.user}" = {
-        #isSystemUser = true;
-        isNormalUser = true;
-        group = cfg.runner.user;
-        createHome = true;
-        shell = pkgs.bash;
-      };
-    };
-
-    boot.kernel.sysctl."net.ipv4.ip_forward" = true; # 1
-    virtualisation.docker.enable = true;
-
-    # taken from https://github.com/NixOS/nixpkgs/issues/245365#issuecomment-1663854128
-    virtualisation.docker.listenOptions = ["/run/docker.sock" "127.0.0.1:2375"];
-
-    # the actual runner
-    services.gitea-actions-runner = {
-      package = pkgs.forgejo-actions-runner;
-      instances.default = {
-        enable = true;
-        name = cfg.runner.name;
-        url = cfg.runner.website;
-        tokenFile = config.age.secrets.forgejo_runner_token.path;
-        labels = [
-          ## optionally provide native execution on the host:
-          "nix:host"
-          "docker:docker://node:22-bookworm"
-          "ubuntu-latest:docker://node:22-bookworm"
-        ];
-
-        hostPackages = with pkgs; [
-          # default ones
-          bash
-          coreutils
-          curl
-          gawk
-          git
-          gnused
-          nodejs
-          wget
-
-          # useful to have in path
-          jq
-          which
-          dpkg
-          zip
-          git-lfs
-
-          # used in deployments
-          inputs.colmena.defaultPackage."x86_64-linux"
-          attic-client
-          lix
-          openssh
-          sudo
-        ];
-      };
-    };
-  };
-}
--- a/applications/git/ssh_config
+++ b/applications/git/ssh_config
@ -1,5 +0,0 @@
-Host *.skynet.ie 193.1.99.* 193.1.96.165
-   User root
-   IdentityFile ~/.ssh/skynet/root
-   IdentitiesOnly yes
-
--- a/applications/git/gitlab.nix
+++ b/applications/git/gitlab.nix
@ -12,6 +12,10 @@ with lib; let
  domain_full = "${cfg.domain.sub}.${domain_base}";
 in {
  imports = [
+    ./acme.nix
+    ./dns.nix
+    ./firewall.nix
+    ./nginx.nix
  ];

  options.services.skynet."${name}" = {
@ -56,32 +60,32 @@ in {
    # grep -r --exclude-dir={docker,containers,log,sys,nix,proc}  gitlab /

    age.secrets.gitlab_pw = {
-      file = ../../secrets/gitlab/pw.age;
+      file = ../secrets/gitlab/pw.age;
      owner = cfg.user;
      group = cfg.user;
    };
    age.secrets.gitlab_secrets_db = {
-      file = ../../secrets/gitlab/secrets_db.age;
+      file = ../secrets/gitlab/secrets_db.age;
      owner = cfg.user;
      group = cfg.user;
    };
    age.secrets.gitlab_secrets_secret = {
-      file = ../../secrets/gitlab/secrets_secret.age;
+      file = ../secrets/gitlab/secrets_secret.age;
      owner = cfg.user;
      group = cfg.user;
    };
    age.secrets.gitlab_secrets_otp = {
-      file = ../../secrets/gitlab/secrets_otp.age;
+      file = ../secrets/gitlab/secrets_otp.age;
      owner = cfg.user;
      group = cfg.user;
    };
    age.secrets.gitlab_secrets_jws = {
-      file = ../../secrets/gitlab/secrets_jws.age;
+      file = ../secrets/gitlab/secrets_jws.age;
      owner = cfg.user;
      group = cfg.user;
    };
    age.secrets.gitlab_db_pw = {
-      file = ../../secrets/gitlab/db_pw.age;
+      file = ../secrets/gitlab/db_pw.age;
      owner = cfg.user;
      group = cfg.user;
    };
--- a/applications/gitlab_runner.nix
+++ b/applications/gitlab_runner.nix
@ -0,0 +1,122 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+with lib; let
+  name = "gitlab_runner";
+  cfg = config.services.skynet."${name}";
+in {
+  imports = [
+  ];
+
+  options.services.skynet."${name}" = {
+    enable = mkEnableOption "Skynet Gitlab Runner";
+
+    runner = {
+      name = mkOption {
+        type = types.str;
+      };
+
+      gitlab = mkOption {
+        default = "https://gitlab.skynet.ie";
+        type = types.str;
+      };
+
+      description = mkOption {
+        default = cfg.runner.name;
+        type = types.str;
+      };
+
+      docker = {
+        image = mkOption {
+          default = "alpine:3.18.4";
+          type = types.str;
+        };
+
+        cleanup_dates = mkOption {
+          # https://man.archlinux.org/man/systemd.time.7#CALENDAR_EVENTS
+          # it will use a lot of storage so clear it daily, may change to hourly if required
+          default = "daily";
+          type = types.str;
+        };
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    # https://search.nixos.org/options?from=0&size=50&sort=alpha_desc&type=packages&query=services.gitlab-runner.
+    environment.systemPackages = [
+      pkgs.gitlab-runner
+    ];
+
+    age.secrets.runner_01_nix.file = ../secrets/gitlab/runners/runner01.age;
+    age.secrets.runner_02_general.file = ../secrets/gitlab/runners/runner02.age;
+
+    boot.kernel.sysctl."net.ipv4.ip_forward" = true; # 1
+    virtualisation.docker.enable = true;
+
+    # taken from https://github.com/NixOS/nixpkgs/issues/245365#issuecomment-1663854128
+    virtualisation.docker.listenOptions = ["/run/docker.sock" "127.0.0.1:2375"];
+
+    services.gitlab-runner = {
+      enable = true;
+
+      #      clear-docker-cache = {
+      #        enable = true;
+      #        dates = cfg.runner.docker.cleanup_dates;
+      #      };
+
+      services = {
+        # might make a function later to have multiple runners, might never need it though
+        runner_nix = {
+          cloneUrl = cfg.runner.gitlab;
+          description = "For Nix only";
+          registrationFlags = ["--docker-host" "tcp://127.0.0.1:2375"];
+          registrationConfigFile = config.age.secrets.runner_01_nix.path;
+          dockerImage = cfg.runner.docker.image;
+
+          # from https://nixos.wiki/wiki/Gitlab_runner
+          dockerVolumes = [
+            "/nix/store:/nix/store:ro"
+            "/nix/var/nix/db:/nix/var/nix/db:ro"
+            "/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket:ro"
+          ];
+          dockerDisableCache = true;
+          preBuildScript = pkgs.writeScript "setup-container" ''
+            mkdir -p -m 0755 /nix/var/log/nix/drvs
+            mkdir -p -m 0755 /nix/var/nix/gcroots
+            mkdir -p -m 0755 /nix/var/nix/profiles
+            mkdir -p -m 0755 /nix/var/nix/temproots
+            mkdir -p -m 0755 /nix/var/nix/userpool
+            mkdir -p -m 1777 /nix/var/nix/gcroots/per-user
+            mkdir -p -m 1777 /nix/var/nix/profiles/per-user
+            mkdir -p -m 0755 /nix/var/nix/profiles/per-user/root
+            mkdir -p -m 0700 "$HOME/.nix-defexpr"
+            . ${pkgs.nix}/etc/profile.d/nix-daemon.sh
+            ${pkgs.nix}/bin/nix-channel --add https://nixos.org/channels/nixos-unstable nixpkgs # 3
+            ${pkgs.nix}/bin/nix-channel --update nixpkgs
+            ${pkgs.nix}/bin/nix-env -i ${concatStringsSep " " (with pkgs; [nix cacert git openssh])}
+          '';
+          environmentVariables = {
+            ENV = "/etc/profile";
+            USER = "root";
+            NIX_REMOTE = "daemon";
+            PATH = "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin";
+            NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt";
+          };
+          tagList = ["nix"];
+        };
+
+        runner_general = {
+          cloneUrl = cfg.runner.gitlab;
+          description = "General Runner";
+          registrationFlags = ["--docker-host" "tcp://127.0.0.1:2375"];
+          registrationConfigFile = config.age.secrets.runner_02_general.path;
+          dockerImage = cfg.runner.docker.image;
+        };
+      };
+    };
+  };
+}
--- a/applications/grafana.nix
+++ b/applications/grafana.nix
@ -9,6 +9,8 @@ with lib; let
  port = 4444;
 in {
  imports = [
+    ./acme.nix
+    ./dns.nix
  ];

  options.services.skynet."${name}" = {
--- a/applications/ldap/backend.nix
+++ b/applications/ldap/backend.nix
@ -11,6 +11,9 @@ with lib; let
  port_backend = "8087";
 in {
  imports = [
+    ../acme.nix
+    ../dns.nix
+    ../nginx.nix
    inputs.skynet_ldap_backend.nixosModule."x86_64-linux"
    ../../config/users.nix
  ];
@ -40,6 +43,7 @@ in {
    #backups = [ "/etc/silver_ul_ical/database.db" ];

    age.secrets.ldap_details.file = ../../secrets/ldap/details.age;
+    age.secrets.ldap_discord.file = ../../secrets/discord/ldap.age;
    age.secrets.ldap_mail.file = ../../secrets/email/details.age;
    age.secrets.ldap_wolves.file = ../../secrets/wolves/details.age;

@ -68,6 +72,7 @@ in {
      # contains teh password in env form
      env = {
        ldap = config.age.secrets.ldap_details.path;
+        discord = config.age.secrets.ldap_discord.path;
        mail = config.age.secrets.ldap_mail.path;
        wolves = config.age.secrets.ldap_wolves.path;
      };
--- a/applications/ldap/server.nix
+++ b/applications/ldap/server.nix
@ -15,6 +15,9 @@ with lib; let
 in {
  # these are needed for teh program in question
  imports = [
+    ../acme.nix
+    ../dns.nix
+    ../nginx.nix
  ];

  options.services.skynet."${name}" = {
--- a/applications/nextcloud.nix
+++ b/applications/nextcloud.nix
@ -10,6 +10,9 @@ with lib; let
  domain = "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}";
 in {
  imports = [
+    ./acme.nix
+    ./dns.nix
+    ./nginx.nix
  ];

  options.services.skynet."${name}" = {
@ -45,7 +48,6 @@ in {
    services.skynet.acme.domains = [
      domain
      "onlyoffice.${domain}"
-      "whiteboard.${domain}"
    ];

    services.skynet.dns.records = [
@ -59,18 +61,13 @@ in {
        r_type = "CNAME";
        value = config.services.skynet.host.name;
      }
-      {
-        record = "whiteboard.${cfg.domain.sub}";
-        r_type = "CNAME";
-        value = config.services.skynet.host.name;
-      }
    ];

    # /var/lib/nextcloud/data

    services.nextcloud = {
      enable = true;
-      package = pkgs.nextcloud30;
+      package = pkgs.nextcloud28;
      hostName = domain;
      https = true;

@ -84,10 +81,9 @@ in {

      appstoreEnable = true;

-      extraApps = {
-        inherit (config.services.nextcloud.package.packages.apps) richdocuments;
+      extraApps = with config.services.nextcloud.package.packages.apps; {
+        inherit forms groupfolders maps notes onlyoffice polls;
      };
-      extraAppsEnable = true;

      settings = {
        trusted_proxies = ["193.1.99.65"];
@ -97,21 +93,10 @@ in {
      };
    };

-    environment.etc."nextcloud-whiteboard-secret".text = ''
-      JWT_SECRET_KEY=test123
-    '';
-
-    services.nextcloud-whiteboard-server = {
-      enable = true;
-      settings.NEXTCLOUD_URL = "https://nextcloud.skynet.ie";
-      secrets = ["/etc/nextcloud-whiteboard-secret"];
-    };
-
    nixpkgs.config.allowUnfree = true;
-    # impacted by https://github.com/NixOS  /nixpkgs/issues/352443
-    #    services.onlyoffice = {
-    #      enable = true;
-    #    };
+    services.onlyoffice = {
+      enable = true;
+    };

    services.nginx.virtualHosts = {
      ${domain} = {
@ -123,14 +108,6 @@ in {
        useACMEHost = "skynet";
        locations."/".proxyPass = "http://127.0.0.1:8000";
      };
-      "whiteboard.${domain}" = {
-        forceSSL = true;
-        useACMEHost = "skynet";
-        locations."/" = {
-          proxyPass = "http://localhost:3002";
-          proxyWebsockets = true;
-        };
-      };
    };
  };
 }
--- a/applications/nginx.nix
+++ b/applications/nginx.nix
@ -9,6 +9,8 @@
    recommendedGzipSettings = true;
    recommendedProxySettings = true;

+    statusPage = true;
+
    # give Nginx access to our certs
    group = "acme";
  };
--- a/applications/nix_cache/nix_cache.nix
+++ b/applications/nix_cache/nix_cache.nix
@ -15,6 +15,7 @@ https://docs.attic.rs/introduction.html
  lib,
  config,
  pkgs,
+  inputs,
  ...
 }:
 with lib; let
@ -22,6 +23,9 @@ with lib; let
  cfg = config.services.skynet."${name}";
 in {
  imports = [
+    inputs.attic.nixosModules.atticd
+    ../acme.nix
+    ../dns.nix
  ];

  options.services.skynet."${name}" = {
@ -51,7 +55,7 @@ in {
      enable = true;

      # Replace with absolute path to your credentials file
-      environmentFile = "/etc/atticd.env";
+      credentialsFile = "/etc/atticd.env";

      settings = {
        listen = "127.0.0.1:8080";
--- a/applications/open_governance/keyserver.nix
+++ b/applications/open_governance/keyserver.nix
@ -13,6 +13,8 @@ with lib; let
  port = 11371;
 in {
  imports = [
+    ../acme.nix
+    ../dns.nix
  ];

  options.services.skynet."${name}" = {
--- a/applications/open_governance/open_governance.nix
+++ b/applications/open_governance/open_governance.nix
@ -15,6 +15,8 @@ with lib; let
  folder = "/var/skynet/${name}";
 in {
  imports = [
+    ../acme.nix
+    ../dns.nix
  ];

  options.services.skynet."${name}" = {
--- a/applications/pelican/Notes.md
+++ b/applications/pelican/Notes.md
@ -1,6 +0,0 @@
-# Notes on Pelican
-
-## Panel
-
-* ``pelican-install`` is in env that can be used to isntall
-* then go to ``panel-address.skynet.ie/installer`` to finish the setup  
--- a/applications/pelican/pelican-panel-install.nix
+++ b/applications/pelican/pelican-panel-install.nix
@ -1,30 +0,0 @@
-{
-  pkgs,
-  dir,
-}:
-pkgs.writeShellScriptBin "pelican-install" ''
-  DIR=${dir}
-
-  echo "Installing Pelican panel to $DIR ..."
-  if [ -d $DIR ]; then
-    echo "Directory $DIR already exists, exiting"
-    exit 1
-  fi
-  echo "Creating directory ..."
-  mkdir -p $DIR
-  cd $DIR
-
-  echo "Downloading Pelican panel ..."
-  curl -L https://github.com/pelican-dev/panel/releases/latest/download/panel.tar.gz | tar -xzv
-  echo "Installing Pelican panel using composer ..."
-  yes | composer install --no-dev --optimize-autoloader
-
-  echo "Setting up the environment ..."
-  yes "" | php artisan p:environment:setup
-
-  echo "Setting permissions ..."
-  chmod -R 755 storage/* bootstrap/cache/
-  chown -R nginx:acme $DIR
-
-  echo "Pelican panel installed successfully"
-''
--- a/applications/pelican/pelican-panel-update.nix
+++ b/applications/pelican/pelican-panel-update.nix
@ -1,48 +0,0 @@
-{
-  pkgs,
-  dir,
-}:
-pkgs.writeShellScriptBin "pelican-update" ''
-  DIR=${dir}
-
-  echo "Updateing Pelican panel in $DIR ..."
-  if [ -d $DIR ]; then
-    echo "Directory $DIR found, entering maintenance mode ..."
-  else
-    echo "Directory $DIR does not exist, exiting"
-    exit 1
-  fi
-
-  cd $DIR
-  php artisan down
-
-  echo "Downloading Pelican panel update ..."
-  curl -L https://github.com/pelican-dev/panel/releases/latest/download/panel.tar.gz | tar -xzv
-
-  echo "Setting permissions ..."
-  chmod -R 755 storage/* bootstrap/cache
-
-  echo "Updating Pelican panel using composer ..."
-  yes | composer install --no-dev --optimize-autoloader
-
-  echo "Clearing compiled template cache ..."
-  php artisan view:clear
-  php artisan config:clear
-
-  echo "Optimizing Pelican panel ..."
-  php artisan filament:optimize
-
-  echo "Updating the database ..."
-  php artisan migrate --seed --force
-
-  echo "Setting permissions ..."
-  chown -R nginx:acme $DIR
-
-  echo "Restart Pelican queue service ..."
-  systemctl restart pelican-queue.service
-
-  echo "Exiting maintenance mode ..."
-  php artisan up
-
-  echo "Pelican panel updated successfully"
-''
--- a/applications/pelican/pelican-wing-package.nix
+++ b/applications/pelican/pelican-wing-package.nix
@ -1,24 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchurl,
-  docker,
-  gnutar,
-}:
-stdenv.mkDerivation rec {
-  pname = "pelican-wings";
-  version = "v1.0.0-beta9";
-
-  src = fetchurl {
-    url = "https://github.com/pelican-dev/wings/releases/download/${version}/wings_linux_amd64";
-    hash = "sha256-YaS1bthNSeWXH5drc2yensRqsRAOa2VXvivJOaPybqc=";
-  };
-
-  buildInputs = [docker gnutar];
-
-  phases = ["installPhase"];
-
-  installPhase = ''
-    install -D $src $out/bin/wings
-  '';
-}
--- a/applications/pelican/pelican.nix
+++ b/applications/pelican/pelican.nix
@ -1,323 +0,0 @@
-{
-  inputs,
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-with lib; let
-  name = "pelican";
-  cfg = config.services.skynet."${name}";
-  php_pool = name;
-  domain_panel = "${cfg.panel.domain.sub}.${cfg.panel.domain.base}.${cfg.panel.domain.tld}";
-
-  packages = let
-    dir = cfg.panel.dir;
-  in [
-    pkgs.curl
-    pkgs.gnutar
-    pkgs.unzip
-    pkgs.gzip
-    pkgs.php83
-    pkgs.php83Packages.composer
-    pkgs.php83Extensions.gd
-    pkgs.php83Extensions.mysqli
-    pkgs.php83Extensions.mbstring
-    pkgs.php83Extensions.bcmath
-    pkgs.php83Extensions.xml
-    pkgs.php83Extensions.curl
-    pkgs.php83Extensions.zip
-    pkgs.php83Extensions.intl
-    pkgs.php83Extensions.sqlite3
-    (import ./pelican-panel-update.nix {
-      inherit pkgs;
-      inherit dir;
-    })
-  ];
-in {
-  imports = [
-  ];
-
-  options.services.skynet."${name}" = {
-    panel = {
-      enable = mkEnableOption "Pelican Panel";
-
-      dir = mkOption {
-        type = types.str;
-        default = "/var/lib/pelican_panel";
-      };
-
-      domain = {
-        tld = mkOption {
-          type = types.str;
-          default = "ie";
-        };
-
-        base = mkOption {
-          type = types.str;
-          default = "skynet";
-        };
-
-        sub = mkOption {
-          type = types.str;
-          #default = name;
-          default = "panel.games";
-        };
-      };
-    };
-
-    wing = {
-      enable = mkEnableOption "Pelican Wing";
-
-      node_name = mkOption {
-        type = types.str;
-      };
-    };
-  };
-
-  config = mkMerge [
-    (mkIf cfg.panel.enable {
-      services.skynet.acme.domains = [
-        domain_panel
-      ];
-
-      # using https://nixos.org/manual/nixos/stable/index.html#module-services-gitlab as a guide
-      services.skynet.dns.records = [
-        {
-          record = cfg.panel.domain.sub;
-          r_type = "CNAME";
-          value = config.services.skynet.host.name;
-        }
-      ];
-
-      environment.systemPackages = packages;
-
-      systemd.timers."pelican-cron" = {
-        wantedBy = ["timers.target"];
-        timerConfig = {
-          OnBootSec = "5m";
-          OnUnitActiveSec = "1m";
-          Unit = "pelican-cron.service";
-        };
-      };
-
-      systemd.services."pelican-cron" = {
-        script = ''
-          ${pkgs.php83}/bin/php ${cfg.panel.dir}/artisan schedule:run >> /dev/null 2>&1
-        '';
-        serviceConfig = {
-          Type = "oneshot";
-        };
-      };
-
-      systemd.services.pelican-queue = {
-        wantedBy = ["multi-user.target"];
-        serviceConfig = {
-          User = config.services.nginx.user;
-          Group = config.services.nginx.group;
-          Restart = "always";
-          ExecStart = "${pkgs.php83}/bin/php -q ${cfg.panel.dir}/artisan queue:work --tries=3";
-          startLimitInterval = 180;
-          startLimitBurst = 30;
-          RestartSec = "5";
-        };
-      };
-
-      systemd.services.pelican-panel-setup = {
-        wantedBy = ["pelican-queue.target" "pelican-cron.target"];
-        partOf = [];
-        path = packages;
-        serviceConfig = {
-          Type = "oneshot";
-          User = "root";
-          Group = "root";
-          TimeoutSec = "infinity";
-          Restart = "on-failure";
-          RemainAfterExit = true;
-          ExecStart = pkgs.writeShellScript "pelican-panel-install" ''
-            DIR=${cfg.panel.dir}
-
-            echo "Installing Pelican panel to $DIR ..."
-            if [ -d $DIR ]; then
-              echo "Directory $DIR already exists, exiting"
-              exit 1
-            fi
-            echo "Creating directory ..."
-            mkdir -p $DIR
-            cd $DIR
-
-            echo "Downloading Pelican panel ..."
-            curl -L https://github.com/pelican-dev/panel/releases/latest/download/panel.tar.gz | tar -xzv
-            echo "Installing Pelican panel using composer ..."
-            yes | composer install --no-dev --optimize-autoloader
-
-            echo "Setting up the environment ..."
-            yes "" | php artisan p:environment:setup
-
-            echo "Setting permissions ..."
-            chmod -R 755 storage/* bootstrap/cache/
-            chown -R ${config.services.nginx.user}:${config.services.nginx.group} $DIR
-
-            echo "Pelican panel installed successfully"
-          '';
-        };
-      };
-
-      services.phpfpm.pools.${php_pool} = {
-        user = config.services.nginx.user;
-        group = config.services.nginx.group;
-        settings = {
-          "listen.owner" = config.services.nginx.user;
-          "listen.group" = config.services.nginx.group;
-          "listen.mode" = "0600";
-          "pm" = "dynamic";
-          "pm.max_children" = 75;
-          "pm.start_servers" = 10;
-          "pm.min_spare_servers" = 5;
-          "pm.max_spare_servers" = 20;
-          "pm.max_requests" = 500;
-          "catch_workers_output" = 1;
-        };
-      };
-
-      services.nginx.virtualHosts."${domain_panel}" = {
-        root = "${cfg.panel.dir}/public";
-
-        forceSSL = true;
-        useACMEHost = "skynet";
-
-        extraConfig = ''
-          index index.html index.htm index.php;
-          charset utf-8;
-
-          access_log off;
-          error_log  /var/log/nginx/pelican.app-error.log error;
-
-          client_max_body_size 100m;
-          client_body_timeout 120s;
-
-          sendfile off;
-
-          ssl_session_cache shared:SSL:10m;
-          ssl_protocols TLSv1.2 TLSv1.3;
-          ssl_ciphers "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384";
-          ssl_prefer_server_ciphers on;
-
-          add_header X-Content-Type-Options nosniff;
-          add_header X-XSS-Protection "1; mode=block";
-          add_header X-Robots-Tag none;
-          add_header Content-Security-Policy "frame-ancestors 'self'";
-          add_header X-Frame-Options DENY;
-          add_header Referrer-Policy same-origin;
-        '';
-
-        locations = {
-          "/" = {
-            extraConfig = ''
-              try_files $uri $uri/ /index.php?$query_string;
-            '';
-          };
-
-          "/favicon.ico".extraConfig = ''
-            access_log off;
-            log_not_found off;
-          '';
-
-          "/robots.txt".extraConfig = ''
-            access_log off;
-            log_not_found off;
-          '';
-
-          "~ \\.php$" = {
-            extraConfig = ''
-              fastcgi_split_path_info ^(.+\.php)(/.+)$;
-              fastcgi_pass unix:${config.services.phpfpm.pools.${php_pool}.socket};
-              fastcgi_index index.php;
-              include ${config.services.nginx.package}/conf/fastcgi_params;
-              fastcgi_param PHP_VALUE "upload_max_filesize = 100M \n post_max_size=100M";
-              fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-              fastcgi_param HTTP_PROXY "";
-              fastcgi_intercept_errors off;
-              fastcgi_buffer_size 16k;
-              fastcgi_buffers 4 16k;
-              fastcgi_connect_timeout 300;
-              fastcgi_send_timeout 300;
-              fastcgi_read_timeout 300;
-            '';
-          };
-
-          "~ /\\.ht".extraConfig = ''
-            deny all;
-          '';
-        };
-      };
-    })
-
-    (mkIf cfg.wing.enable {
-      services.skynet.acme.domains = [
-        "${cfg.wing.node_name}.${domain_panel}"
-      ];
-
-      # using https://nixos.org/manual/nixos/stable/index.html#module-services-gitlab as a guide
-      services.skynet.dns.records = [
-        {
-          record = "${cfg.wing.node_name}.${cfg.panel.domain.sub}";
-          r_type = "CNAME";
-          value = config.services.skynet.host.name;
-        }
-      ];
-      services.nginx.virtualHosts = {
-        "${cfg.wing.node_name}.${domain_panel}" = {
-          forceSSL = true;
-          useACMEHost = "skynet";
-          locations."/".proxyPass = "http://127.0.0.1:8080";
-        };
-      };
-
-      networking.firewall.allowedTCPPorts = [8080 8443];
-
-      virtualisation.docker.enable = true;
-
-      environment.systemPackages = [
-        (pkgs.callPackage ./pelican-wing-package.nix {})
-      ];
-
-      users.groups.pelican = {};
-      users.users.pelican = {
-        #createHome = true;
-        isSystemUser = true;
-        #home = "/etc/pelican";
-        group = "pelican";
-        extraGroups = ["docker" "acme"];
-        # X11 is to ensure the directory can be traversed
-        #homeMode = "711";
-      };
-
-      systemd.services.pelican-wings = {
-        description = "Wings Daemon";
-        after = ["docker.service"];
-        requires = ["docker.service"];
-        partOf = ["docker.service"];
-
-        serviceConfig = {
-          User = "root";
-          WorkingDirectory = "/etc/pelican";
-          LimitNOFILE = 4096;
-          PIDFile = "/var/run/wings/daemon.pid";
-          ExecStart = "/run/current-system/sw/bin/wings";
-          Restart = "on-failure";
-          startLimitInterval = 180;
-          startLimitBurst = 30;
-          RestartSec = "5";
-        };
-
-        wantedBy = ["multi-user.target"];
-      };
-
-      systemd.tmpfiles.rules = [
-        "L+ /etc/letsencrypt/live/${cfg.wing.node_name}.${domain_panel}/fullchain.pem - pelican acme - /var/lib/acme/skynet/fullchain.pem"
-        "L+ /etc/letsencrypt/live/${cfg.wing.node_name}.${domain_panel}/privkey.pem - pelican acme - /var/lib/acme/skynet/key.pem"
-      ];
-    })
-  ];
-}
--- a/applications/prometheus.nix
+++ b/applications/prometheus.nix
@ -21,7 +21,7 @@ with lib; let
      )
      nodes
    );
-    node = lib.attrsets.mapAttrsToList (key: value: "${value.config.deployment.targetHost}:${toString value.config.services.prometheus.exporters.node.port}") nodes;
+    node = lib.attrsets.mapAttrsToList (key: value: "${value.config.deployment.targetHost}:${toString config.services.prometheus.exporters.node.port}") nodes;
  };

  # clears any invalid entries
@ -37,10 +37,8 @@ in {
        type = types.port;
        default = 9001;
      };
-    };

-    external = {
-      node = mkOption {
+      external.node = mkOption {
        type = types.listOf types.str;
        default = [];
        description = ''
@ -48,20 +46,12 @@ in {
        '';
      };
    };
-
-    ports = {
-      node = mkOption {
-        type = types.port;
-        default = 9100;
-      };
-    };
  };

  config = mkMerge [
    {
      services.prometheus.exporters.node = {
        enable = true;
-        port = cfg.ports.node;
        openFirewall = true;
        # most collectors are on by default see https://github.com/prometheus/node_exporter for more options
        enabledCollectors = ["systemd" "processes"];
@ -76,7 +66,7 @@ in {
            job_name = "node_exporter";
            static_configs = [
              {
-                targets = filter_empty (exporters.node ++ cfg.external.node);
+                targets = filter_empty (exporters.node ++ cfg.server.external.node);
              }
            ];
          }
--- a/applications/proxmox-lxc.nix
+++ b/applications/proxmox-lxc.nix
@ -12,19 +12,19 @@ with lib; {
    enable = mkOption {
      default = true;
      type = types.bool;
-      description = lib.mdDoc "Whether to enable the Proxmox VE LXC module.";
+      description = lib.mdDoc "Whether to enable the ProxmoxLXC.";
    };
    privileged = mkOption {
      type = types.bool;
      default = false;
-      description = ''
+      description = lib.mdDoc ''
        Whether to enable privileged mounts
      '';
    };
    manageNetwork = mkOption {
      type = types.bool;
      default = false;
-      description = ''
+      description = lib.mdDoc ''
        Whether to manage network interfaces through nix options
        When false, systemd-networkd is enabled to accept network
        configuration from proxmox.
@ -33,7 +33,7 @@ with lib; {
    manageHostName = mkOption {
      type = types.bool;
      default = false;
-      description = ''
+      description = lib.mdDoc ''
        Whether to manage hostname through nix options
        When false, the hostname is picked up from /etc/hostname
        populated by proxmox.
@ -68,8 +68,6 @@ with lib; {
        loader.initScript.enable = true;
      };

-      console.enable = true;
-
      networking = mkIf (!cfg.manageNetwork) {
        useDHCP = false;
        useHostResolvConf = false;
@ -83,14 +81,13 @@ with lib; {
        startWhenNeeded = mkDefault true;
      };

-      systemd = {
-        mounts = mkIf (!cfg.privileged) [
+      systemd.mounts =
+        mkIf (!cfg.privileged)
+        [
          {
-            enable = false;
            where = "/sys/kernel/debug";
+            enable = false;
          }
        ];
-        services."getty@".unitConfig.ConditionPathExists = ["" "/dev/%I"];
-      };
    };
 }
--- a/applications/restic.nix
+++ b/applications/restic.nix
@ -83,6 +83,9 @@ with lib; let
  ));
 in {
  imports = [
+    ./dns.nix
+    ./nginx.nix
+    ./acme.nix
  ];

  # using https://github.com/greaka/ops/blob/818be4c4dea9129abe0f086d738df4cb0bb38288/apps/restic/options.nix as a base
@ -142,6 +145,20 @@ in {
        default = false;
      };
    };
+
+    nuked = {
+      enable = mkEnableOption "Nuked Backup server";
+
+      port = mkOption {
+        type = types.port;
+        default = 8765;
+      };
+
+      appendOnly = mkOption {
+        type = types.bool;
+        default = false;
+      };
+    };
  };

  config = mkMerge [
@ -195,5 +212,58 @@ in {
        }
      ];
    })
+
+    # restic -r rest:https://skynet:testing@nuked.skynet.ie/ init
+    (mkIf cfg.nuked.enable {
+      assertions = [
+        {
+          assertion = !cfg.server.enable;
+          message = "Our backup and Nuked backup cannot co-exist";
+        }
+      ];
+
+      services.skynet.acme.domains = [
+        "nuked.skynet.ie"
+      ];
+
+      services.skynet.dns.records = [
+        {
+          record = "nuked";
+          r_type = "CNAME";
+          value = config.services.skynet.host.name;
+        }
+      ];
+
+      services.nginx.virtualHosts = {
+        "nuked.skynet.ie" = {
+          forceSSL = true;
+          useACMEHost = "skynet";
+          locations."/" = {
+            proxyPass = "http://${config.services.restic.server.listenAddress}";
+            proxyWebsockets = true;
+          };
+        };
+      };
+
+      networking.firewall.allowedTCPPorts = [
+        cfg.nuked.port
+      ];
+
+      age.secrets.restic_pw = {
+        file = ../secrets/backup/nuked.age;
+        path = "${config.services.restic.server.dataDir}/.htpasswd";
+        symlink = false;
+        mode = "770";
+        owner = "restic";
+        group = "restic";
+      };
+
+      services.restic.server = {
+        enable = true;
+        listenAddress = "${config.services.skynet.host.ip}:${toString cfg.server.port}";
+        appendOnly = cfg.nuked.appendOnly;
+        privateRepos = true;
+      };
+    })
  ];
 }
--- a/applications/skynet.ie/skynet.ie.nix
+++ b/applications/skynet.ie/skynet.ie.nix
@ -10,11 +10,8 @@ with lib; let
  cfg = config.services.skynet."${name}";
 in {
  imports = [
-    # import in past website versions, available at $year.skynet.ie
-    # at teh end of teh year add it here
-    (import ./old_site.nix {year = "2023";})
-    (import ./old_site.nix {year = "2017";})
-    (import ./old_site.nix {year = "2009";})
+    ./acme.nix
+    ./dns.nix
  ];

  options.services.skynet."${name}" = {
@ -23,9 +20,11 @@ in {

  config = mkIf cfg.enable {
    services.skynet.acme.domains = [
-      "www.skynet.ie"
+      # the root one is already covered by teh certificate
+      "2016.skynet.ie"
      "discord.skynet.ie"
      "public.skynet.ie"
+      "renew.skynet.ie"
    ];

    services.skynet.dns.records = [
@ -36,7 +35,7 @@ in {
        value = config.services.skynet.host.ip;
      }
      {
-        record = "www";
+        record = "2016";
        r_type = "CNAME";
        value = config.services.skynet.host.name;
      }
@ -50,15 +49,23 @@ in {
        r_type = "CNAME";
        value = config.services.skynet.host.name;
      }
+      {
+        record = "renew";
+        r_type = "CNAME";
+        value = config.services.skynet.host.name;
+      }
    ];

    services.nginx = {
-      virtualHosts = let
-        main_site = {
+      virtualHosts = {
+        # main site
+        "skynet.ie" = {
          forceSSL = true;
          useACMEHost = "skynet";
          locations = {
-            "/".root = "${inputs.skynet_website.defaultPackage."x86_64-linux"}";
+            "/" = {
+              root = "${inputs.skynet_website.defaultPackage."x86_64-linux"}";
+            };

            # this redirects old links to new format
            "~* ~(?<username>[a-z_0-9]*)(?<files>\\S*)$" = {
@ -67,10 +74,13 @@ in {
            };
          };
        };
-      in {
-        # main site
-        "www.skynet.ie" = main_site;
-        "skynet.ie" = main_site;
+
+        # archive of teh site as it was ~2012 to 2016
+        "2016.skynet.ie" = {
+          forceSSL = true;
+          useACMEHost = "skynet";
+          root = "${inputs.skynet_website_2016.defaultPackage."x86_64-linux"}";
+        };

        # a custom discord url, because we are too cheap otehrwise
        "discord.skynet.ie" = {
@ -85,6 +95,13 @@ in {
          root = "${inputs.compsoc_public.packages.x86_64-linux.default}";
          locations."/".extraConfig = "autoindex on;";
        };
+
+        # for alumni members to renew their account
+        "renew.skynet.ie" = {
+          forceSSL = true;
+          useACMEHost = "skynet";
+          root = "${inputs.skynet_website_renew.defaultPackage."x86_64-linux"}";
+        };
      };
    };
  };
--- a/applications/skynet.ie/old_site.nix
+++ b/applications/skynet.ie/old_site.nix
@ -1,34 +0,0 @@
-{year}: {
-  config,
-  pkgs,
-  lib,
-  inputs,
-  ...
-}:
-with lib; {
-  imports = [];
-
-  config = {
-    services.skynet.acme.domains = [
-      "${year}.skynet.ie"
-    ];
-
-    services.skynet.dns.records = [
-      {
-        record = year;
-        r_type = "CNAME";
-        value = config.services.skynet.host.name;
-      }
-    ];
-
-    services.nginx = {
-      virtualHosts = {
-        "${year}.skynet.ie" = {
-          forceSSL = true;
-          useACMEHost = "skynet";
-          root = "${inputs."skynet_website_${year}".defaultPackage."x86_64-linux"}";
-        };
-      };
-    };
-  };
-}
--- a/applications/skynet.ie/wiki.nix
+++ b/applications/skynet.ie/wiki.nix
@ -1,64 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  inputs,
-  ...
-}:
-with lib; let
-  name = "wiki";
-  cfg = config.services.skynet."${name}";
-in {
-  imports = [
-  ];
-
-  options.services.skynet."${name}" = {
-    enable = mkEnableOption "Skynet Wiki";
-  };
-
-  config = mkIf cfg.enable {
-    services.skynet.acme.domains = [
-      "renew.skynet.ie"
-      "wiki.skynet.ie"
-    ];
-
-    services.skynet.dns.records = [
-      {
-        record = "renew";
-        r_type = "CNAME";
-        value = config.services.skynet.host.name;
-      }
-      {
-        record = "wiki";
-        r_type = "CNAME";
-        value = config.services.skynet.host.name;
-      }
-    ];
-
-    services.nginx = {
-      virtualHosts = {
-        "wiki.skynet.ie" = {
-          forceSSL = true;
-          useACMEHost = "skynet";
-          root = "${inputs.skynet_website_wiki.defaultPackage."x86_64-linux"}";
-          # https://stackoverflow.com/a/38238001/11964934
-          extraConfig = ''
-            location / {
-              if ($request_uri ~ ^/(.*)\.html) {
-                return 302 /$1;
-              }
-              try_files $uri $uri.html $uri/ =404;
-            }
-          '';
-        };
-
-        # redirect old links to the new wiki
-        "renew.skynet.ie" = {
-          forceSSL = true;
-          useACMEHost = "skynet";
-          locations."/".return = "307 https://wiki.skynet.ie";
-        };
-      };
-    };
-  };
-}
--- a/applications/skynet_users.nix
+++ b/applications/skynet_users.nix
@ -11,6 +11,9 @@ with lib; let
  php_pool = name;
 in {
  imports = [
+    ./acme.nix
+    ./dns.nix
+    ./nginx.nix
  ];

  options.services.skynet."${name}" = {
@ -18,10 +21,7 @@ in {
  };

  config = {
-    # we havea  more limited ports range on the skynet server
-    services.skynet.prometheus.ports = {
-      node = 9000;
-    };
+    # ssh access

    # allow more than admins access
    services.skynet.ldap_client = {
@ -85,20 +85,6 @@ in {
    };

    services.nginx.virtualHosts = {
-      "outinul.ie" = {
-        forceSSL = true;
-        enableACME = true;
-        locations = {
-          "/" = {
-            alias = "/home/outinul/public_html/";
-            index = "index.html";
-            extraConfig = ''
-              autoindex on;
-            '';
-            tryFiles = "$uri$args $uri$args/ /index.html";
-          };
-        };
-      };
      # main site
      "*.users.skynet.ie" = {
        forceSSL = true;
--- a/applications/ulfm.nix
+++ b/applications/ulfm.nix
@ -9,6 +9,10 @@ with lib; let
  cfg = config.services.skynet."${name}";
 in {
  imports = [
+    ./acme.nix
+    ./dns.nix
+    ./firewall.nix
+    ./nginx.nix
  ];

  options.services.skynet."${name}" = {
--- a/config/dns.nix
+++ b/config/dns.nix
@ -1,59 +1,92 @@
 {lib, ...}: {
  imports = [
+    # Paths to other modules.
+    # Compose this module out of smaller ones.
  ];

+  # this needs to mirror ../applications/dns.nix
  options.skynet.records = lib.mkOption {
    description = "Records, sorted based on therir type";
-    type = lib.types.listOf (lib.types.submodule (import ../applications/dns/options-records.nix {
-      inherit lib;
-    }));
+    type = with lib.types;
+      listOf (submodule {
+        options = {
+          record = lib.mkOption {
+            type = str;
+          };
+          r_type = lib.mkOption {
+            type = enum ["A" "CNAME" "TXT" "PTR" "SRV" "MX"];
+          };
+          value = lib.mkOption {
+            type = str;
+          };
+          server = lib.mkOption {
+            description = "Core record for a server";
+            type = bool;
+            default = false;
+          };
+        };
+      });
  };

  config = {
-    skynet.records =
-      [
-        # Proxmox hosts
-        {
-          record = "jarvis";
-          r_type = "A";
-          value = "193.1.99.73";
-          server = true;
-        }
-        {
-          record = "ultron";
-          r_type = "A";
-          value = "193.1.99.84";
-          server = true;
-        }
-        # wifi in server room
-        {
-          record = "ash";
-          r_type = "A";
-          value = "193.1.99.114";
-          server = true;
-        }
-      ]
-      # non skynet domains
-      ++ [
-        {
-          domain = "conradcollins.net";
-          record = "www";
-          r_type = "CNAME";
-          value = "skynet.skynet.ie.";
-        }
-
-        {
-          domain = "edelharty.net";
-          record = "www";
-          r_type = "CNAME";
-          value = "skynet.skynet.ie.";
-        }
-        {
-          domain = "damienconroy.com";
-          record = "www";
-          r_type = "CNAME";
-          value = "skynet.skynet.ie.";
-        }
-      ];
+    skynet.records = [
+      {
+        record = "optimus";
+        r_type = "A";
+        value = "193.1.99.90";
+        server = true;
+      }
+      {
+        record = "panel.games";
+        r_type = "CNAME";
+        value = "optimus";
+      }
+      {
+        record = "bumblebee";
+        r_type = "A";
+        value = "193.1.99.91";
+        server = true;
+      }
+      {
+        record = "minecraft.compsoc.games";
+        r_type = "CNAME";
+        value = "bumblebee";
+      }
+      {
+        record = "_minecraft._tcp.minecraft.compsoc.games.skynet.ie.";
+        r_type = "SRV";
+        value = "0 10 25518 minecraft.compsoc.games.skynet.ie.";
+      }
+      {
+        record = "minecraft-classic.compsoc.games";
+        r_type = "CNAME";
+        value = "bumblebee";
+      }
+      {
+        record = "_minecraft._tcp.minecraft-classic.compsoc.games.skynet.ie.";
+        r_type = "SRV";
+        value = "0 10 25520 minecraft-classic.compsoc.games.skynet.ie.";
+      }
+      {
+        record = "minecraft.gsoc.games";
+        r_type = "CNAME";
+        value = "bumblebee";
+      }
+      {
+        record = "_minecraft._tcp.minecraft.gsoc.games.skynet.ie.";
+        r_type = "SRV";
+        value = "0 10 25521 minecraft.gsoc.games.skynet.ie.";
+      }
+      {
+        record = "minecraft.phildeb.games";
+        r_type = "CNAME";
+        value = "bumblebee";
+      }
+      {
+        record = "_minecraft._tcp.minecraft.phildeb.games.skynet.ie.";
+        r_type = "SRV";
+        value = "0 10 25522 minecraft.phildeb.games.skynet.ie.";
+      }
+    ];
  };
 }
--- a/config/users.nix
+++ b/config/users.nix
@ -1,11 +1,6 @@
-{
-  lib,
-  config,
-  ...
-}:
+{lib, ...}:
 with lib; let
  port_backend = "8087";
-  cfg = config.skynet.users;
 in {
  options.skynet = {
    users = {
@ -49,37 +44,29 @@ in {

  config.skynet = {
    users = {
-      committee = lib.lists.unique (
-        # Committee - Core
-        [
-          "silver"
-          "eoghanconlon73"
-          "nanda"
-          "emily1999"
-          "dgr"
-        ]
-        # Committee - OCM
-        ++ [
-          "skyapples"
-          "eliza"
-          "amymucko"
-          "archiedms"
-          "kaiden"
-        ]
-        # Committee - SISTEM
-        ++ [
-          "peace"
-        ]
-        # Admins are part of Committee as well
-        ++ cfg.admin
-      );
+      committee = [
+        "silver"
+        "eoghanconlon73"
+        "sidhiel"
+        "maksimsger1"
+        "kaiden"
+        "pine"
+        "nanda"
+        "sourabh1805"
+        "kronsy"
+        "skyapples"
+      ];
      admin = [
        "silver"
        "evanc"
+        "eoghanconlon73"
        "eliza"
        "esy"
      ];
-      trainee = [];
+      trainee = [
+        "milan"
+        "kronsy"
+      ];
      lifetime = [];
      banned = [];

--- a/flake.lock
+++ b/flake.lock
--- a/flake.nix
+++ b/flake.nix
@ -7,57 +7,76 @@
    # Return to using unstable once the current master is merged in
    # nixpkgs.url = "nixpkgs/nixos-unstable";

-    lix-module = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
    # utility stuff
    flake-utils.url = "github:numtide/flake-utils";
    agenix.url = "github:ryantm/agenix";
    arion.url = "github:hercules-ci/arion";
    alejandra = {
-      url = "github:kamadorueda/alejandra";
+      url = "github:kamadorueda/alejandra/3.0.0";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    colmena.url = "github:zhaofengli/colmena";
+    attic.url = github:zhaofengli/attic;

-    # we host our own
+    # email
+    # simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
    simple-nixos-mailserver = {
      inputs.nixpkgs.follows = "nixpkgs";
-      url = "git+https://forgejo.skynet.ie/Skynet/misc_nixos-mailserver";
+      type = "gitlab";
+      host = "gitlab.skynet.ie";
+      owner = "compsoc1%2Fskynet";
+      repo = "misc%2Fnixos-mailserver";
    };

-    ######################
-    ### skynet backend ###
-    ######################
-    skynet_ldap_backend.url = "git+https://forgejo.skynet.ie/Skynet/ldap_backend";
-    skynet_ldap_frontend.url = "git+https://forgejo.skynet.ie/Skynet/ldap_frontend";
-    skynet_website_wiki.url = "git+https://forgejo.skynet.ie/Skynet/wiki";
-    skynet_website_games.url = "git+https://forgejo.skynet.ie/Skynet/website_games";
-    skynet_discord_bot.url = "git+https://forgejo.skynet.ie/Skynet/discord-bot";
-    # for testing a local build
-    # skynet_discord_bot.url = "git+file:/_college/CompSoc/Skynet/discord_bot?shallow=1";
-
-    #####################
-    ### compsoc stuff ###
-    #####################
-    compsoc_public.url = "git+https://forgejo.skynet.ie/Computer_Society/presentations_compsoc";
-
-    #################
-    ### skynet.ie ###
-    #################
-
-    # this should always point to teh current website
-    skynet_website.url = "git+https://forgejo.skynet.ie/Skynet/website_2017";
-
-    # these are past versions of teh website
-    skynet_website_2023.url = "git+https://forgejo.skynet.ie/Skynet/website_2017?rev=c4d61c753292bf73ed41b47b1607cfc92a82a191";
-    # this is not 100% right since this is from teh archive from 2022 or so
-    skynet_website_2017.url = "git+https://forgejo.skynet.ie/Skynet/website_2017?rev=edd922c5b13fa1f520e8e265a3d6e4e189852b99";
-
-    # this is more of 2012 than 2009 but started in 2009
-    skynet_website_2009.url = "git+https://forgejo.skynet.ie/Skynet/website_2009";
+    # account.skynet.ie
+    skynet_ldap_backend = {
+      type = "gitlab";
+      host = "gitlab.skynet.ie";
+      owner = "compsoc1%2Fskynet";
+      repo = "ldap%2Fbackend";
+    };
+    skynet_ldap_frontend = {
+      type = "gitlab";
+      host = "gitlab.skynet.ie";
+      owner = "compsoc1%2Fskynet";
+      repo = "ldap%2Ffrontend";
+    };
+    skynet_website = {
+      type = "gitlab";
+      host = "gitlab.skynet.ie";
+      owner = "compsoc1%2Fskynet";
+      repo = "website%2F2023";
+    };
+    skynet_website_2016 = {
+      type = "gitlab";
+      host = "gitlab.skynet.ie";
+      owner = "compsoc1%2Fskynet";
+      repo = "website%2F2016";
+    };
+    skynet_website_renew = {
+      type = "gitlab";
+      host = "gitlab.skynet.ie";
+      owner = "compsoc1%2Fskynet";
+      repo = "website%2Falumni-renew";
+    };
+    skynet_website_games = {
+      type = "gitlab";
+      host = "gitlab.skynet.ie";
+      owner = "compsoc1%2Fskynet";
+      repo = "website%2Fgames.skynet.ie";
+    };
+    skynet_discord_bot = {
+      type = "gitlab";
+      host = "gitlab.skynet.ie";
+      owner = "compsoc1%2Fskynet";
+      repo = "discord-bot";
+    };
+    compsoc_public = {
+      type = "gitlab";
+      host = "gitlab.skynet.ie";
+      owner = "compsoc1%2Fcompsoc";
+      repo = "presentations%2Fpresentations";
+    };
  };

  nixConfig = {
@ -97,7 +116,7 @@
          overlays = [];
        };
        specialArgs = {
-          inherit inputs self;
+          inherit inputs;
        };
      };

@ -146,14 +165,7 @@
      # Public Services
      calculon = import ./machines/calculon.nix;

-      # metrics
-      ariia = import ./machines/ariia.nix;
-
-      # games server - panel
-      optimus = import ./machines/optimus.nix;
-
-      # games server - host
-      bumblebee = import ./machines/bumblebee.nix;
+      deepthought = import ./machines/deepthought.nix;
    };
  };
 }
--- a/machines/_base.nix
+++ b/machines/_base.nix
@ -18,11 +18,23 @@ in {
    # for the secrets
    inputs.agenix.nixosModules.default

-    # base application config for all servers
+    # base config for all servers
    ../applications/_base.nix

-    #
-    inputs.lix-module.nixosModules.default
+    # every sever may need the firewall config stuff
+    ../applications/firewall.nix
+
+    # every sever needs to have a dns record
+    ../applications/dns.nix
+
+    # every server needs teh ldap client for admins
+    ../applications/ldap/client.nix
+
+    # every server will need the config to backup to
+    ../applications/restic.nix
+
+    # every server will be monitored for grafana
+    ../applications/prometheus.nix
  ];

  options.skynet = {
@ -120,20 +132,19 @@ in {
    # https://discourse.nixos.org/t/systemd-networkd-wait-online-934764-timeout-occurred-while-waiting-for-network-connectivity/33656/9
    systemd.network.wait-online.enable = false;

-    environment.systemPackages = with pkgs; [
+    environment.systemPackages = [
      # for flakes
-      git
-      git-lfs
+      pkgs.git
      # useful tools
-      ncdu_2
-      htop
-      nano
-      nmap
-      bind
-      zip
-      traceroute
-      openldap
-      screen
+      pkgs.ncdu_2
+      pkgs.htop
+      pkgs.nano
+      pkgs.nmap
+      pkgs.bind
+      pkgs.zip
+      pkgs.traceroute
+      pkgs.openldap
+      pkgs.screen
    ];
  };
 }
--- a/machines/_template.nix
+++ b/machines/_template.nix
@ -1,56 +0,0 @@
-/*
-Name:     Link to where information on the name can be found
-Why:      Why is it named this
-Type:     VM/Physical
-Hardware: - if its a VM, the hardware (PowerEdge r210) if its physical
-From:     2023/2024/2025/...
-Role:     What role does it have in teh cluster
-Notes:
-*/
-{
-  pkgs,
-  lib,
-  nodes,
-  ...
-}: let
-  # name of the server, sets teh hostname and record for it
-  name = "name";
-  # Assigned IP address
-  ip_pub = "193.1.99.000";
-
-  # dont need to change these
-  hostname = "${name}.skynet.ie";
-  host = {
-    ip = ip_pub;
-    name = name;
-    hostname = hostname;
-  };
-in {
-  # what configurrations to import, email in this example
-  imports = [
-    ../applications/email.nix
-  ];
-
-  deployment = {
-    # dont need to change these
-    targetHost = hostname;
-    targetPort = 22;
-    targetUser = null;
-
-    # deployment option: active-dns/active-core/active-ext/active
-    tags = [
-      "active"
-    ];
-  };
-
-  services.skynet = {
-    # pass in the details of the host server
-    host = host;
-
-    # enable the backup service
-    backup.enable = true;
-
-    # enable the imported service
-    email.enable = true;
-  };
-}
--- a/machines/ariia.nix
+++ b/machines/ariia.nix
@ -1,47 +0,0 @@
-/*
-
-Name:     https://en.wikipedia.org/wiki/Eagle_Eye
-Why:      ARIIA - Autonomous Reconnaissance Intelligence Integration Analyst
-Type:     VM
-Hardware: -
-From:     2024
-Role:     Metrics gathering and Analysis
-Notes:
-*/
-{
-  config,
-  pkgs,
-  lib,
-  nodes,
-  ...
-}: let
-  # name of the server, sets teh hostname and record for it
-  name = "ariia";
-  ip_pub = "193.1.99.83";
-  hostname = "${name}.skynet.ie";
-  host = {
-    ip = ip_pub;
-    name = name;
-    hostname = hostname;
-  };
-in {
-  imports = [
-    ../applications/grafana.nix
-  ];
-
-  deployment = {
-    targetHost = hostname;
-    targetPort = 22;
-    targetUser = null;
-
-    tags = ["active-core"];
-  };
-
-  services.skynet = {
-    host = host;
-    backup.enable = true;
-
-    prometheus.server.enable = true;
-    grafana.enable = true;
-  };
-}
--- a/machines/bumblebee.nix
+++ b/machines/bumblebee.nix
@ -1,51 +0,0 @@
-/*
-
-Name:     https://en.wikipedia.org/wiki/Bumblebee_(Transformers)
-Why:      Created to sell toys so this vm is for games
-Type:     VM
-Hardware: -
-From:     2024
-Role:     Game host
-Notes:
-*/
-{
-  pkgs,
-  lib,
-  nodes,
-  arion,
-  ...
-}: let
-  # name of the server, sets teh hostname and record for it
-  name = "bumblebee";
-  ip_pub = "193.1.99.91";
-  hostname = "${name}.skynet.ie";
-  host = {
-    ip = ip_pub;
-    name = name;
-    hostname = hostname;
-  };
-in {
-  imports = [
-    ../applications/pelican/pelican.nix
-    ../applications/games/minecraft.nix
-  ];
-
-  deployment = {
-    targetHost = hostname;
-    targetPort = 22;
-    targetUser = null;
-
-    tags = ["active"];
-  };
-
-  services.skynet = {
-    host = host;
-    backup.enable = true;
-    pelican = {
-      wing = {
-        enable = true;
-        node_name = "node01";
-      };
-    };
-  };
-}
--- a/machines/deepthought.nix
+++ b/machines/deepthought.nix
@ -0,0 +1,42 @@
+/*
+
+Name:     https://hitchhikers.fandom.com/wiki/Deep_Thought
+Why:      Our home(page)
+Type:     VM
+Hardware: -
+From:     2023
+Role:     Public Backup
+Notes:
+*/
+{
+  pkgs,
+  lib,
+  nodes,
+  inputs,
+  ...
+}: let
+  name = "deepthought";
+  ip_pub = "193.1.99.112";
+  hostname = "${name}.skynet.ie";
+  host = {
+    ip = ip_pub;
+    name = name;
+    hostname = hostname;
+  };
+in {
+  imports = [
+  ];
+
+  deployment = {
+    targetHost = ip_pub;
+    targetPort = 22;
+    targetUser = null;
+
+    tags = ["active-core"];
+  };
+
+  services.skynet = {
+    host = host;
+    backup.nuked.enable = true;
+  };
+}
--- a/machines/earth.nix
+++ b/machines/earth.nix
@ -25,8 +25,7 @@ Notes:
  };
 in {
  imports = [
-    ../applications/skynet.ie/skynet.ie.nix
-    ../applications/skynet.ie/wiki.nix
+    ../applications/skynet.ie.nix
  ];

  deployment = {
@ -41,6 +40,5 @@ in {
    host = host;
    backup.enable = true;
    website.enable = true;
-    wiki.enable = true;
  };
 }
--- a/machines/glados.nix
+++ b/machines/glados.nix
@ -26,8 +26,7 @@ Notes:    Each user has roughly 20gb os storage
  };
 in {
  imports = [
-    ../applications/git/gitlab.nix
-    ../applications/git/forgejo.nix
+    ../applications/gitlab.nix
  ];

  deployment = {
@ -35,13 +34,12 @@ in {
    targetPort = 22;
    targetUser = null;

-    tags = ["active-git"];
+    tags = ["active-gitlab"];
  };

  services.skynet = {
    host = host;
    backup.enable = true;
    gitlab.enable = true;
-    forgejo.enable = true;
  };
 }
--- a/machines/kitt.nix
+++ b/machines/kitt.nix
@ -31,6 +31,8 @@ in {
    ../applications/discord.nix
    ../applications/bitwarden/vaultwarden.nix
    ../applications/bitwarden/bitwarden_sync.nix
+    ../applications/grafana.nix
+    ../applications/prometheus.nix
  ];

  deployment = {
@ -54,5 +56,7 @@ in {

    # committee/admin services
    vaultwarden.enable = true;
+    prometheus.server.enable = true;
+    grafana.enable = true;
  };
 }
--- a/machines/retired/ash.nix
+++ b/machines/retired/ash.nix
@ -22,6 +22,9 @@ Notes:    Thius vpn is for admin use only, to give access to all the servers via
  hostname = ip_pub;
 in {
  imports = [
+    # applications for this particular server
+    ../applications/firewall.nix
+    ../applications/dns.nix
  ];

  deployment = {
--- a/machines/retired/optimus.nix
+++ b/machines/retired/optimus.nix
@ -17,7 +17,7 @@ Notes:
 }: let
  # name of the server, sets teh hostname and record for it
  name = "optimus";
-  ip_pub = "193.1.99.90";
+  ip_pub = "193.1.99.112";
  hostname = "${name}.skynet.ie";
  host = {
    ip = ip_pub;
@ -26,7 +26,7 @@ Notes:
  };
 in {
  imports = [
-    ../applications/pelican/pelican.nix
+    ../applications/games.nix
  ];

  deployment = {
@ -40,8 +40,6 @@ in {
  services.skynet = {
    host = host;
    backup.enable = true;
-    pelican = {
-      panel.enable = true;
-    };
+    games.enable = true;
  };
 }
--- a/machines/wheatly.nix
+++ b/machines/wheatly.nix
@ -25,7 +25,7 @@ Notes:
  };
 in {
  imports = [
-    ../applications/git/forgejo_runner.nix
+    ../applications/gitlab_runner.nix
  ];

  deployment = {
@ -33,12 +33,16 @@ in {
    targetPort = 22;
    targetUser = null;

-    tags = ["active-git"];
+    tags = ["active-gitlab"];
  };

  services.skynet = {
    host = host;
    backup.enable = true;
-    forgejo_runner.enable = true;
+
+    gitlab_runner = {
+      enable = true;
+      runner.name = "runner01";
+    };
  };
 }
--- a/.mailmap
+++ b/.mailmap
--- a/secrets/backup/nuked.age
+++ b/secrets/backup/nuked.age
@ -0,0 +1,17 @@
+age-encryption.org/v1
+-> ssh-ed25519 V1pwNA dgJJTGIzBXLeK17bfgeYeXXN5YrByBOTbhyIkx+Z2TI
+zgujS6RYpXEzbUYZc1DRz0RlWAGurFNzAJnE4j4zhjY
+-> ssh-ed25519 4PzZog U7EUVcL+2Acv3mBpz88t2ZwVJm4YyNlwXzXpSkZfjk8
+LKQqiFcJ3pIWJG5DSbBbcEzg0dIPFOfiwcKCuR2zfhA
+-> ssh-ed25519 5Nd93w Rsjby+9wJr4PnaixDgUk32319SnfJCxgnC8fQ9Gc0yM
+7jmxPtgrIZ9ZF5c04bMzgYBLLPoqKFfwmU/qG6hF+9s
+-> ssh-ed25519 q8eJgg p5+dL0VBijPOTihOZuDQdE/yLQA+BHlEVSq12gRaizw
+MzQcGLTaUhgarzvJ7h/XfHIyPUb+i6YkbgkbvhOONEo
+-> ssh-ed25519 KVr8rw W9+d0ot3036q0YPNYaY1MS/4EiTU0MnLmq56dvUamE0
+wuIORoGvEG8lqrirf07ycIHawiw/DsjvTUwZrIEjSjk
+-> ssh-ed25519 fia1eQ c5cadKGZlONyUKivzegA+swGqgpb8oLDe5bk7Sb8XBI
+NNrb+ezMjYuKkaDUGumflNYrKPzxnPULoMslxH5/bFI
+-> ssh-ed25519 DVzSig 6uvtkJC55iEwnCPZGAqMrLzW+IuHX9YDhtCX3eHtxkA
+JNmstGPHqh2if+C4j1S19v2bCpbib+Wthp/OCusCSc8
+--- teGaaxnvHxEkKCtyNsBV/yhl3Ohn9BD3nfjl6jq3OcM
+³Êb_Â^ìòõŠ<C3B5>aX¹&6LFîœ…Ào8Ë˜¯œC.ƒ ~ÿˆŽœž—k3âÃî;¯1Ž²”Iôd*
ÚûV®Ïƒj¦áÖùñÅí?D©´Õd%buš^Øa"Q2„<m<>oãm©œc6Ò¹‚5!…HÂé8Žj9Ä <C384>1º»þ‘àT›@½Îoíâ‹vÂœ¦ß<>&E„áÅË(èˆH©n®}³ÞQÉhe5JãfàåÓ\.,~X<isÅpŽpÆkøb ‘ÿp8aÒfÞ†½0ˆ*‘n¦›»0ù;Øy:hl
--- a/secrets/backup/restic.age
+++ b/secrets/backup/restic.age
--- a/secrets/backup/restic_pw.age
+++ b/secrets/backup/restic_pw.age
@ -1,20 +1,18 @@
 age-encryption.org/v1
-> ssh-ed25519 V1pwNA mGy7a3SPHMxFaJ5S68jaRkPk16Ahxqp7C2YGnK6A4nM
-TrEf7fz6yY7G2HXNxhnM4v7QkVrR5D6vdh+eUVbWbdQ
-> ssh-ed25519 4PzZog 5ixIvICVbbk2z8gqvodMAhCevBWdnfmpskWupnpMm04
-r33h6oeu1jQQGs3mP15xtbRq50FGpKwtbbqWbSTQ1jE
-> ssh-ed25519 dA0vRg gUxwHHDBhxpYMxBE+UfTYJ4I8nY7cEdWG1XBSLLWtlY
-pNawroXlES4EyNZSUUiEPNy+WNdG9AnHnUl+7qLB5Os
-> ssh-ed25519 5Nd93w AchMesYdEdLHtphyfCumqrdCRFABzNOEf7KfFgQWFAk
-Xnier5jnPDl9n8F5r/R4CjBoEvmwAJRLQWnoWoAudec
-> ssh-ed25519 q8eJgg AgmUpmYT5z1qAFZ+uUY5a7huZ8Bhifs1ZuDBlg7ZJxU
-kgaKF9t8cEKBc715dNocxA3o+2dwpK8erRo42NzeP9A
-> ssh-ed25519 KVr8rw AafFkG0axLsqGVs/k0DrzLFsKk4uXtqRbJIFhuAmj18
-shiQFq5ZznBovnNXWfTNvSVX/O1X47hK6g13P8r6xN4
-> ssh-ed25519 fia1eQ AKbaMyAtdDHSpP5taXQQjaunzvO6yZuCOUjgV2+4iDc
-yDFZ54QNklvVHUD1AkiaQ0sntqiRxkMGZw9yos/IvcI
-> ssh-ed25519 3pl/Kw KD86EfxdUwpfFW7wqf283Wmdw8o/qnVzXxTCrtNPsWI
-L1a9WXktp4a9s1GxF6O7VV14ZPQOp/VqwS286Dqa3Tk
--- +jytGaOhLk0unuAlkbbtAFNde8Z+tKJ/3l3Y3tBgcFQ
-€¡VV÷õÍ7Pø=ñOý]àbZêëj§p¸QKaXIúµNl¢_vž
-ŠÐHsh3~<7E>F«ŒW/¿Ÿ<>ÝÌ ^áa\´¼Ô	#/¤Ú‡i[÷Üfbó¶•áúXøØ
+-> ssh-ed25519 V1pwNA Q6fzzE0ZuVtBGR3fFnmw45hrQU/vKj2y2aEzYA2cvAs
+c0A5Ieu188qIE3QKvC+6DqjDxAC4HqfBUbPu3m72NTA
+-> ssh-ed25519 4PzZog AzQaulqa+X3fxgk/sP5jjFfPGAPMzGlbacGIQdKpSxs
+d5OgkPftJ8wqrMlfGcxLld+DWVQ58/SvXGOmPj79SUQ
+-> ssh-ed25519 5Nd93w u+Fu4cNNKnHht6Gj8NgCK96U8SL4h+hFv9SZ+DSMrGg
+zy6Jf8ZBInhOVDuFuFAZso6KJl8gLlklqWCayPqb14w
+-> ssh-ed25519 q8eJgg s6jAIb95QqWDKGEx2lbnJruSfp6mgERcI2SzTip+Gnw
+IHPOcqeagr79owKNqyk9dLjz5Qz1fQ1A/vOxt+NPlu4
+-> ssh-ed25519 KVr8rw VO/YREcq6mknjN2JdAr3GWg91Hml4k1Ojx1tUMXAXks
+1BhUi7kRCZV+c9TROQIFeNt2WSL9Xa14J40vo/qyJ70
+-> ssh-ed25519 fia1eQ w6T0/iajXe7pgvX75tm/94HueS6OlKlXAo3IgIIlcm0
+Cun2Xmb7fbXCg18lLmsdhqViEG8lqOAGGoghJlvunu0
+-> ssh-ed25519 3pl/Kw cpVAh+pifXN3ohww8TqmyCrCRWU06OAPPdLX/5DBUwo
+GQ7xCXSJp6nwGymXD+9AqeZC7ScJl4a/A/2XWQzKbA
+--- GhvvZMgI8VzeGNtLQ+EUIPYpR6EgLpxiuxn9Upu6o7g
+ðKihãPSëÔd~p‹{%<25>Pàbªc•£„ã't«kÀÙ?[e0¤þbþë
+éŠ<EFBFBD>{<7B>ÚÆ&$tWŠë.<2E>œ"ûÆX˜f¥\-‹vIýL{]”óõš¡Õ1;ûúüU¦<55>
--- a/secrets/bitwarden/details.age
+++ b/secrets/bitwarden/details.age
--- a/secrets/bitwarden/id.age
+++ b/secrets/bitwarden/id.age
@ -1,19 +1,17 @@
 age-encryption.org/v1
-> ssh-ed25519 V1pwNA +Bzh++C1+jxdz1VwwhxPpO3XWn8fy7bsP2wX4mlQ63A
-1GZxY76fwUOo/t/XeoCOEuxxq+oiU8+GDaasH7VTOkA
-> ssh-ed25519 4PzZog lkqPlBejVuYcBQwAZX96296VjJqyz3Q7J7O7OzfSDmw
-x+bGIiw4SYhEePIkF5PLK6KK7EJ8Iay1oQIOJ18DtQY
-> ssh-ed25519 dA0vRg o0tqstSEhdxxdu4Bu8T/r8al3XJpIHvXp7xe8YNbJgo
-m1OKX0L8Nn6ZrXI0Sk61fe8JIRbh+os7p0wzCMtdi6Y
-> ssh-ed25519 5Nd93w pYmPUfDB3HfJZDPgNh4Vmdu3UlTimrX4+EtUzSONyw4
-C/URv/SZEtUlI2SBPNTfni4oI+bsYZ/Wq3xilcS6mMc
-> ssh-ed25519 q8eJgg k5Ml805g9vQ5Wv3hozSCAq8EGzvczTfpssrOeBlB+GE
-IxRgNIg7Xi1RN9MthSqjsHoaLpsFWoUVd9f+ak9Qm08
-> ssh-ed25519 KVr8rw 5YvUQVmarpS4FgsFI8EFLz8tucmvs3V3Q8I0hT9q1i8
-Lifm2EUWhv5hDU9mwkOu4fH8zyjEtGXW1qVBbC4dfvs
-> ssh-ed25519 fia1eQ sSzTT/AeSH5y4vyKt1Vl0bnkT11ZXINQi/pGU+M3oh0
-Qm0ktboSsC0/+HBCIsOu2Oa+EAdT/DlStNLRpC+EOtw
-> ssh-ed25519 IzAMqA DhHry81R6JO3xWujL4l3uOmtqvdmk40srcWuXCU03kg
-L4AWjbf1+bNXSMfBpC6DTKU1hvql+1mIRemeHZCFXos
--- Jlkn7bKGiezveI2e56iV/3B08/z/JxsJxgyvgZ6WhN0
-·Ô|’s<E28099> ÆX#Ïâ”˜²?ÿWÔÊÆîÙº«Wñ(¡ßåˆ@†L[^tŒní‚ÃhGc÷¢Šæ\¿zž^¡><3E>¤üå^D{*.! b
+-> ssh-ed25519 V1pwNA abYqfp05DkkiK7wdTOn+E9+FU9iX8y/UcoVNUJQ1wwQ
+BLIH6HkjumaaeKntAMm5BXC4ADfqLRh3vsq26gVB470
+-> ssh-ed25519 4PzZog gNCidb7IlrQLJah7iqpLKLFzlhe/4RLk5hexSq96My0
+ynnNvbbit8U8CNel3cBEeel006ftNPArV+oAFNdmv/4
+-> ssh-ed25519 5Nd93w YnGe4yzhVDQD1z7Mq58KgnF2GJjkBLyiOZBmCygazRU
+dZg81Rb+XSoeho2Xbth+pIza+6F4TbAuN6s5BbP1OLM
+-> ssh-ed25519 q8eJgg H9L5QhInkMWBndRYQHIQTmuMVBrMtaXqCrpEXV/hpBE
+QL24qbdGbfdmv2bgS1uYjRHB5fKPrfmbmMidjI9dEIg
+-> ssh-ed25519 KVr8rw GqmHdNfgOFKcZ6+zxKDWg/ImAVEXHTSpzDmBe8f/vmo
+4u2ek5DHeDuBizYx0nRee02Gf6492fjWM8U7/HL2XwQ
+-> ssh-ed25519 fia1eQ zYA2FI8k6675UAQn1AlwWzPV5e52dAmv/ESDFMmSQlA
+rup+vtydMspXXeQQ9In4s0HQnBNY4IvqRIlIdKPVaZk
+-> ssh-ed25519 IzAMqA QOiOSUOx76IICb8rSo0OxTtyZnyyA8nZ/pvuDZcVfUI
+vDUSgB6dfzKNIpA4/0PbvJ/KzcVgW9l5KqqV6rKbyhM
+--- 7Lo9nyTOtFbzsGyr/5Kanvj+yoszus8bUMWquX2rG90
+¡Çä4†ª+¡¦ÂÐQÍ–BFY2°“$žÄ8sñ¼Ñ„qš.U¾È<C2BE>ª5õ<35>†â–Q·yKëog§ „8^ÏËhîú.±=<3D>ÎæŸ³ŒÉE
--- a/secrets/bitwarden/secret.age
+++ b/secrets/bitwarden/secret.age
--- a/secrets/discord/ldap.age
+++ b/secrets/discord/ldap.age
@ -1,26 +1,23 @@
 age-encryption.org/v1
-> ssh-ed25519 V1pwNA 6NKUbOSUbwVjzW/ZUpl8qEiUTTegFlji4+tVJyqY3SE
-fRQvaKnLMkVBboTEriQpWlGY9VBAP3ppsEbAB2QTScs
-> ssh-ed25519 4PzZog mp/+b5LpB+DvRduqAZiKWqkZq6+tlyQgVTZz7Oge2Us
-OycqmZyDr3levWSfRFxypJOkITLDix0Q15Todya6BNc
-> ssh-ed25519 dA0vRg yp/4LvS9DbdatHFWFsP5qhH8CP8Bs0IjVSenUtG4+Xs
-hHiJEtl1ffYXltsJzuEMLGUl2i/i3pFzv4bjbx/cbOI
-> ssh-ed25519 5Nd93w BTngmy4NGLGKhC8lPos63QEVBKoQT82KswQ22EypcQQ
-OCnJMkOwwXQVbtCitUizXM4nynC6a1tiPSkm7MxulWA
-> ssh-ed25519 q8eJgg NaEjVcDBVICRgXuJchEdE4vg3qmkNmJAbDDxLq1fX0M
-YFwUmEPwJIik5YJ2SV5IAmqGlY+h24voJJlrBaoCBwA
-> ssh-ed25519 KVr8rw ZnyVITZFkuozEs/rbTdxXDQNS3Nggo+JkBL1Icht2SM
-B4jVVts5lK1kIlOWMl0eiN7TpsTeJZWIu7NqildxeGE
-> ssh-ed25519 fia1eQ kvzARRScl/eypC2a5cY66sXcH+TZqz4sYg4W/k9iJxQ
-Ga+4TVvXiQ6i5/+fgUQ3E5tJiLqdBsEsXjenXEpRV/A
-> ssh-ed25519 IzAMqA 5sizvlhLhAhAR1bViHJtRJ8fAIO56TAuLVSOwE177QE
-b9oJ8BC2xiBjvc3D0H0EF7bSNDlpvIidyBCTf04ndJI
-> ssh-ed25519 uZzB3g g9y66zNmQbqP6Rbhg2t06W3YOgy8DkRvJZbWVegT71s
-2dH7E76tDMrWQJbLPefyORP66iaPHQnSjwu8NCdSyJo
-> ssh-ed25519 Hb0ipQ azOzBLXfshInlFVpV0PzIBidL/VzA/+kKRXFFVD6ZF4
-iXBF/Wcv4KWo5qUXUlyimuo0l6aClKxOCtkm3MxAIBc
-> ssh-ed25519 IzAMqA EWitYyV8RsPIB6HEFE2OI/C1zcC6WfBEeDI62rGVmkk
-Bk9tdSqIjLjat21J2LM8RXAt9GwdQxYdfPzqDtCjunE
--- waY7j+HMEOdqEZs/TcLEhUY9gJs6ZSc51VNfuCmCxJ4
-Ý;dÙ9A‡vÔé±nq<“ê;TèáƒBØ‡$ÐGÌvï¯h
-»\^Žé§lÖ¯`š¼ÄÎ?l¸<0C>au~üÐ§×yâ[×šju²üvÂ;]!œ6Ëè±ãXIs4ÇŒ!Ù@ßÏ¶û¬‘|›úïª">eÈÿ[VVŠž´,ÿ5˜ý8N§¹Œh<04><>[ƒ×´ZD,zý&âñíó¡”õIØ>ŠØù¡<C3B9>|ÎézÉm
+-> ssh-ed25519 V1pwNA FJbuXA9iZkVimh/bRdl2MnswKZpHkF6HmIqG/cmE62s
+2vP3FNg2f1ijAMwWGcLa7aZQD7/Tq8iXwf6+/bMEgb8
+-> ssh-ed25519 4PzZog 75e7m7A1i4/XjB+b9OozGjKttQ3VzJuoNwKV6z1xYB4
+9/czRQ3V/Kb/8p9h3cdiXXbNBECeZfLLEWg8gR+WBE4
+-> ssh-ed25519 5Nd93w Kier0iAHycxtmgq9n5Mq/eLR2akqKB2Z/JBA2ACjaE8
+HokkZ2jHa7DV6KqODEH5rF+YprwNwBIjLLFGbfXdkrc
+-> ssh-ed25519 q8eJgg cFNBrJQ1R4tDi4HTI/1lGEy44cjCDpnUXGYsXQ4daA4
+GPJ3fX/AxxhUjvfnAJNREQDEGp/Bz4zvfiTWHD5bwMI
+-> ssh-ed25519 KVr8rw hzHh/c9qM7v7eFFpvD/uvCcDD12kSaTabVVA8CKosgI
+3bwDd/aWeYWmYf8b2ko4N37XXgTP5LeP98qYXSlaxwM
+-> ssh-ed25519 fia1eQ gol262stWS/VMaXgAJNC/VK5QkNb/UHN8X2khm3PHFQ
+3eBj1/cUkTSNBGANSYp6S7IvMU+8dKKEtZxqo7kMzxY
+-> ssh-ed25519 IzAMqA Z70Jqsw7IR9vk4uLef56F1+YCQtK2YvDC950d+WVNHk
+nXqGHPrbh3VS2DMToRKs9FxBsn8PftR6HTkeA2KXRLU
+-> ssh-ed25519 uZzB3g Zrc8idjRB+ZPHq9ScsCnXDqipGM83pio/V8mO6YYa0I
+JFVQ8V3Jkn8vxklAZzwGpmOcaKUd8QBDFO/+gAyb3Ug
+-> ssh-ed25519 Hb0ipQ Yhn/pwNTNmMdW3L2RV2MJECEYRlAzNTYztcA5MfRCjk
+S3rkfwU9Nln8WFPSr102lX+H96wnHWVZa6z8upTRgvk
+-> ssh-ed25519 IzAMqA 8SVaC/2C2+xmeCP07Mu+/xGFSB1UXrIlVJ/i8YfQXUU
+y4mt/hZRuc0+5OXFs3VjYH/Q/nEACAd30YlyUyNzSqw
+--- M8Emn3XUVeSu5qTgSbR7/93DjFawmR5iZ2qxQEJ9gd0
+zg*õFŒô·ç½xÍ?¬7,¬ò”‘ïaƒ1'Ü¥ôtmR t[øVFÝl=ç+Mç¸îmáœ´ÙÑj;¿Ä”Fy6—O\î<>™Ó¬µ²Òªo=¹UG#%{®ÇÛoæÛ<²Àèi*à,RO;L2Oy¤ðŠð×NŠ”¡`g‰*î$‚yÄÜ’R]-õo¼böÑ05Q/ÂXˆýk[dE’Õ_…i	é’
åï+KP8Kÿ
--- a/secrets/discord/token.age
+++ b/secrets/discord/token.age
--- a/secrets/dns_certs.secret.age
+++ b/secrets/dns_certs.secret.age
--- a/secrets/dns_dnskeys.conf.age
+++ b/secrets/dns_dnskeys.conf.age
@ -1,23 +1,19 @@
 age-encryption.org/v1
-> ssh-ed25519 V1pwNA UBWTUleT3gH3VTd/ahMfx1iSc1JTTlZWKxD4Sx61Dmk
-rGgE6UbDrVFRBbCfw2+o49aIlk4qOHDNYD5nQnt97vU
-> ssh-ed25519 4PzZog OGYMrxkoi+q8ysF/6+HYm+RQshv6jhZyjqQr+d5/vlk
-1PY3xrn9dHVnXOOlEukTwnF0S5KL6AsDRXh5MvWioyo
-> ssh-ed25519 dA0vRg eVrtU8/e3XSCjOHFeujDNIZHPWDq3qcot/+RXmBwYyk
-mOFaEqWEnYtKxlilozF2QRyKPsOP3HvNWnQ3KLRON9Q
-> ssh-ed25519 5Nd93w WXvBheSNZ8CJOtyxeK6GBLRgt3n1hgYGGnksp4pUhBM
-0mr6EjSJnnJezPk1nXIEpaIMmn30tAFJj7pmpS7vHzc
-> ssh-ed25519 q8eJgg SLkAt5hvW2niDBIqeKjcYZvDR9CkJzu4wf1y+0Fizzo
-ZNm7qSf+Bl981GJuZPPjRL1HcCJbZ58eOUQe+jFE7K0
-> ssh-ed25519 KVr8rw xfJAoIGIRNVyRsPxjlARAFXm3jDnYxBZws0/8mkqr2E
-w//2SGsPl3BjEgGIWAsomH8jGwnOKCpn0SJsbb4y2EU
-> ssh-ed25519 fia1eQ MjtOJN21srAeob/eGpKQON1FGebBqvZo1bKfQFz2bhY
-eSRZ3DTQ/HfueI4k56nkAmUdy7MARgcNYgPGD5amCTM
-> ssh-ed25519 NtlN/A n5uN0giDnRaRrfa0jCpqkDnzx1x6hQipumVP/dM9Sw0
-J5Z3ETAYMQbugOUsak+k0suWd3SInz2kfRDrJhP5ObA
-> ssh-ed25519 v2Y09A KxmOke5LEOx90sSm3W5gdNHTxk9Smrwya36g8rxFyhw
-2FUiiEe5v1CUG/Gkyu1Gw0/tmo64wCIq/vsCjevL3l8
--- eFkoeakUQHfc0nofk2Sm/k0ujxlkKkahdm/MmMqPHrg
-Å  
-üúa
-–Î5ùäÁ'?åc0øí¿5SÚîh hª	mÈ<6D>fœZ–’Gõ¢+>6øçu½¹Ï¿rèôâ«ïzYÐ<59>‹á•Þ¯ÇÑ¦Jé|ä·a>îò»˜Å7iÕÝƒ‡Y«˜a‘‰.P&ðÖdKZS£Ì©/J±r;ñ×¾ioÜå±9hN¸Ã¦çË¶
+-> ssh-ed25519 V1pwNA QUveqW1V2eyNUoLz3VlbU1eoeKqpMhKhM3xidvLzmAc
+ONNE8H73iwIqsGOugXQdeH12oro0eAU2qBgIMc6/OS0
+-> ssh-ed25519 4PzZog oYUJKbA2TI8onEnEDLBLpRDqXBZlX4Wa5qk/vT165iY
+J9LPEQfwudit3Fa7Po4tR+ZGMGJEVAL6QWD8S2pVeXk
+-> ssh-ed25519 5Nd93w r3fH+siDMDiuo7MAYUzxpcCk+SM/kY/cL/ndRWn4OhA
+zPQrQS9E7narD++03B1ECfz3w7Wtckbk3nC002GkjD0
+-> ssh-ed25519 q8eJgg l4ZcaUycpCI4o4NDfsQlsnl/BzS4UKhxSEYKbIclmik
+lqT4jCsxhtK2tNNzRIiiZmB5iHFfzMR9w2TayZlTuvs
+-> ssh-ed25519 KVr8rw CRuDx3JbAfKvRQ1SyD5whrlw2MpFnlP33YMiClgXvC4
+LKZIzgEEjLvKQgDJOZUi6tP9hi/lXehYQyodLOiNrYg
+-> ssh-ed25519 fia1eQ uOoglDTy0OlQm+aUqsg3KfPFXynHnJi7d7WStsw7hmQ
+Vt214X0k+A+BWzDwbk3JHX9/lOY74bUPVt0CdYUxHHg
+-> ssh-ed25519 NtlN/A yAVmup2BnnPIyRVQD4+e3Fh0RTfc6mJZRLKTPV69AHw
+dEAj8GqDaIMq84hU5DHEQsba5d7Fvp71xaMVQfMD6CQ
+-> ssh-ed25519 v2Y09A 5rxrWgwLfUKqbWIyPzODXJiFSCPYB+Xlchj+9wF2RTg
+x9qWFO8KJ6R2EUqbdkFVFYMs7nHelnqZ9XF4bZ6bx8k
+--- XvVzqiGGv9j443pVSwh9lZYRjgSuUn98bICJichEzhY
+åõ×/—"cÅ–R"_`QS‹ÚÂéyp)öê<C3B6>¯¼»	z¼ÔeNÆîó–júÉTéõc:9%I™ùƒ÷	}$~Û¢<C39B>RW`0Qä'©XÕÍûVJƒ[’@VÛ]$,‚¢ÁžˆËÀÑ±ô[?òuwK½»!à¼Ì¹÷ÔÿáÌuBâç:) xÄ·æÁ‡Ý<E280A1>Ñâi
--- a/secrets/email/details.age
+++ b/secrets/email/details.age
@ -1,25 +1,23 @@
 age-encryption.org/v1
-> ssh-ed25519 V1pwNA rR7/KSP2skc5HZDN98g30IIXuNDJsghQWfyVF57glW0
-oSpYnVqLObrE/MQNHonzOmpGk/BcDyMxwPPQauUB8Zo
-> ssh-ed25519 4PzZog bUKm5Fqx40JQ/8BdJvP15xQvIjwTAxuAqsoPIAyRDi0
-xGvp4hTdaiqD7cxjJTjmJHgehY8VCOVqvvXNIQoGrRU
-> ssh-ed25519 dA0vRg Ty2EEwt35A8ZigOkVmYlLgXbMePI3WALtM1McsFtQnQ
-ygu01cCNYlaW9e0APNrDGPjfJE1KkNq1nqi5d6fwqm8
-> ssh-ed25519 5Nd93w UwOXbO00n1/2pxpz98BZ7yIaEr1PXEvOg7F3Nl80yTY
-+E2VbVQXngXUHUQlc2P6ebU0/anioRu/EZgpdf/N8/Q
-> ssh-ed25519 q8eJgg 82IpLMlE/9Wp4fD8PHIiKsff9jJYJtoPF58xCnb6GAU
-Ip27egoy6jMgvvTRg6q5NXeTlv9EFhK9PM8rCFu8LhU
-> ssh-ed25519 KVr8rw xEE59aHcuIIB/5pbH3bZuZQ7W2CDUCoyT6EmdOWiZ2s
-2uaA7Nx8DNbmGvY/ns/DRHZ1zTZ+JifkR4eVtSzCRd8
-> ssh-ed25519 fia1eQ /YtGDHVjZTzDO7baOphkGvY0zCgElNT9UMpMhhjFCEw
-03+ungOpBCqgTj/kyH1hz1LWTHSlkZ6Qb0c4i9bwOZ0
-> ssh-ed25519 IzAMqA kSa3Kbz9SyIe1pXTBi39RxVMi6QQV0rjAPgdbEmmJRA
-SO7M5B6LR1aZ8r7mFjFAF+Zl1tlsq3j/3/BVkSPWFcE
-> ssh-ed25519 uZzB3g 1WjjfJ50NZO2C7qKp4WOtDHEUlkF0CFmiehMsY8/6Wk
-TP6FwDJp0nKd+FaB0tnZa9XoD8tQponT8wK2xZ/k/A4
-> ssh-ed25519 Hb0ipQ vRwS9w7tO0yryHoip+sqbsD67lqXLD+6hJDNi9YClAU
-NiIy//77gNuQ9UJgvt1UPqD99QJzfbh4WFld7Ln0GtE
-> ssh-ed25519 IzAMqA J5spaIE4OAKJsvd1hOy3M2cCbmAG0/9l0dsnKlZfxi4
-RT95kFe4vKr0HQVz+6Gfm7pat7HvSahle2zMhEaQ8DM
--- ag6/92VREDBr8oQUKcFbj25qK4gcMdHa+ej3hf+igbc
-År:ºûÛÓfÆ)sºûß;Ë²fI[±g<'òª3rûÃrœõ’Åk×™‡âÝB™º+c‡WÌç|÷ä˜¨~ŒË”7ÓãªãÏµU<C2B5>}ì	ECò ýÊºžq!jÉ7¬Å1VŽ¥Î®<>SØ4ÿG8i9:™ßíHl9VµDmnvS¹Š
+-> ssh-ed25519 V1pwNA 69RgNRqfd9pSNuJMr88rzFViy/xYScupvNucY4jOARE
+KeTB7nbTiKxS7Bl1UPZ7IoL6XlTKxuEDIaUiZyjrsx4
+-> ssh-ed25519 4PzZog R4dDARo9QpqRG9qKjr2ytkpJYGq/822XdiLEBDFOMk8
+N8WWraxJ0HLAgeFM0b5BPeRB1VIP5paWO12Pgruh9x4
+-> ssh-ed25519 5Nd93w VboljaSRjajrkCp1ilMC6qvDv3+ROE670Hs1iNFKRXo
+zUXXzywu/SwRrqmQtNeiq0hoayNDuW18EJuRZY07Z6A
+-> ssh-ed25519 q8eJgg VqbE/b/ddDfl4ShxeW3Id3vjXVJBP1KZKnJVUJsElws
+y7uUlFXj1UlKnQxs0Xkixv4uLU9xRZXktmY2nID/AFE
+-> ssh-ed25519 KVr8rw dCG//gX7lz0frI48guiFNm9TvuoAJ1B9/Q/o4FQiWGo
+wZ+QWN+0YK6DXHCtmdxtBDmtkHtNfOBrKac3ADIxK/U
+-> ssh-ed25519 fia1eQ 1s5iHrqZ/7TdhC1vU7qwO2Cgr9W1EQRdBwXEm7U+XmU
+O8HYon1a/hcQyjEQkjL+uVIvD2aR90k+Ro830hy7QfI
+-> ssh-ed25519 IzAMqA IY4TEBaim4AtxO4N+YJApvUlDifcJkcIrH02bUP20yU
+lQzfhUpnEuQdBep1ZKxdzZ6kIyP2g/BlJG1WxL8SiJw
+-> ssh-ed25519 uZzB3g z/mf484FBG7MNOnAV0iGksnv+NnuEzzfcCRl7UFosjM
+a6fCYyU/6Rq3eKXecch64GJQ/a6bVNd5TJYu4SmUgf4
+-> ssh-ed25519 Hb0ipQ rTavA3BBHDOm1oBTOAeB/E/ZfOumL82FFHbqk1c3rlM
+VBPFpsqo+j6uhTwaXZtuPvzG/JNo0cS90Av1GfAsYnI
+-> ssh-ed25519 IzAMqA xGKLZbl6ErNlp9zH56mnN4cL/YlNakt1qFWqKhOJaxY
+iju55ngxSk4IptEnRZ5435ocDloskNIENnkYGbR151I
+--- ypGNmAjP0+RusrsXWCdDwWXJiqO6b1gnnzSyLGcQHLo
+¶÷ÎO¨¬´˜÷Mˆ›žïhÖÆœçIt^þ=Ô½5ÒÎãìõ´!ø±1¢ÂŽo†-4+^¥à<C2A5>’†7Ê-„<>{•¡ìmªPŸôÞK†ž{T"ã…íìjdç/. 	¾M°ËÍbïä€T{Óˆüy†Æ(*ê¢–yBž¦óËƒÀU›oßû1´Ã¦
--- a/secrets/forgejo/runners/ssh.age
+++ b/secrets/forgejo/runners/ssh.age
@ -1,21 +0,0 @@
-age-encryption.org/v1
-> ssh-ed25519 V1pwNA EiRnc8zfDCi967uONlFaqhMRz7IvL46RPzXshMa/OXI
-6QS20RCZm8NJUURK0LX7TYtdO3tqZ+RMHLF/kvhVIvs
-> ssh-ed25519 4PzZog 8rgxGN03Mz96nPHanIQvOckstmhTgOkN1DRo2Uly2As
-qMe+yPWSIG/o0i/6U/0y2q13NUICHiwnjj8byN1oFxY
-> ssh-ed25519 dA0vRg 4zMtlLeWQz3i9md+fmHt/JOYpok2oe7a4TgTU5VKoDY
-GTC7VnQ/hXR8qVFKV0DInAx0NmLEMh+RlGFrURbVJUU
-> ssh-ed25519 5Nd93w wihWssLONatQLpXcLTk35E2dCuQ/KwEn5Fr40fSMDgc
-xSdbcJVETSr2aUUAuMbbMqjrE3GigBZgViJ03QwDN/8
-> ssh-ed25519 q8eJgg zkdxmoghRUdp5vi04AnNc3DRaGBrTIybaoLqgZY1Kyo
-i2ZvHIQH/+Pv0zLcz2GC2QmnvI4NcqGc4hEHlZTi9lc
-> ssh-ed25519 KVr8rw ueWGIZvtlBR90Brt5EfxdN4GVTCYwlav+5pv9RV/33g
-pvzHIVe42wuMpTVCZINI7IURkPMAisvlnSOsW7dhhjo
-> ssh-ed25519 fia1eQ BDwGY8xWwCyQ1+yoVcz5eP9GZBEsOjqDK3IWQAVeaEM
-5pPdRCPHdNhkCXri/ZGVHU1s5xIsKJar23wZVQJDfzk
-> ssh-ed25519 CqOTGQ IFEEpuieC/oKfrwvmXHTe7f/9cPWNo+0oTOqtysI4RE
-y5mBTGBw/aIx5K4jfHlrLOWcNAm1DgpXDmNGQ9Yeo7E
--- uRX6sh2kk/EFQwiX6PbxMOhohwzkhnmG965eL1NKE8s
-iÕ<EFBFBD>%Æíïzb‰)D›pŒÃ@0òP§Í÷.õ†Ë¡¡ëöMÂ|õyµP3À‘Í/ñvyv‚ÖÅý#u‡åWÄQâoæf«ê
-r@ð$£Ž«+‚¼ÿ*TO$He=½Â0bò)<29>±ã àáòØ{¯«·Å/wZ˜4æRAh³£fCê·à¡]·zî7¹ÉÆæóÖ•YåÅ
-ZO7?[Ý*Z+†:Ò?ÈL<C388>ë<0C>í¦<>ÁvéQÏÉÕ/[¨ª÷P—÷QÎ?qôþ7²Å¾ÆvQY<FL=O²©r•¯eíÃ?XùÆc¬ËI‡ÄA	ì~Ú¿¶‰êÃV¡ž\Š5å¯]p³´R5¼hI–&4\ñ~HxèöŸ5C†)BíÌ@è'f»<c#zdßÈ<Ü2ÊÑ{'‘EÞ©îˆêÍ<C3AA>\5—¤ayÂ´Ö…Æ1Y"^”½ø/&ú~îæ®¨'´!¡ä´$!´\yÚ¢I7AÊ‚ËÅÄG‰¤#ôui™W7è“`&1<Å7.×:†X÷ {Ã(<28>Mä-Möþu`Å•×`‡Xr
--- a/secrets/forgejo/runners/token.age
+++ b/secrets/forgejo/runners/token.age
@ -1,19 +0,0 @@
-age-encryption.org/v1
-> ssh-ed25519 V1pwNA kZ6MC1GXuminn2Hlomkep1wIv1lp6KpJOJcpXkhQWWM
-K1B58FSyb4QpINlhuvVv4dGFNjTChU1KNoezZcS/a6Y
-> ssh-ed25519 4PzZog pbxwzRvcsOgY9hd48BZEOH6VHFLn93gJ8yDHQyNIiSI
-Fa/Z6si9vyox/pmPvWTndyYCQxo7tcvdlRuTgw6IY9g
-> ssh-ed25519 dA0vRg OW2y/LkN/287NVuRRlSpihR+k/MZ+a0R5cIrHFne6RI
-U0ZqipfDlpz9LeXKNWkl7tYCnsBjSQz8q4mETBVEalI
-> ssh-ed25519 5Nd93w jDy3i1Z1NWYqdVdw4h+maaBjokVWNrSfHtSQotb2bWg
-PtgX9L78wpJHiX4lmP+H0bfRZd/tNfHrUEAShJ38ss8
-> ssh-ed25519 q8eJgg BCaUEZ3H3BglgKPAbl/ITQaEv9Jc2rRAoFuPXhy4WFI
-DMqJu0vjDJ8rIXLSL17Dx4Aoq8Uhdo4jU8g1jTSvMK4
-> ssh-ed25519 KVr8rw dKk0SN9SXTQsPwMFiKKMuoRwzTHJB8kr33nadRzBoDc
-m2xPKYFMC/y5fKkgaBc+5TVg9ZH+zVSM9I4I3htSm7I
-> ssh-ed25519 fia1eQ NGl1o/38iTm6QiQB7pl0NBkohMZGLMeaXZ37TV184B4
-zk/DTLhuGfhDU3gNA7S0BjGOowteEhR9v5oNmOkWTGU
-> ssh-ed25519 CqOTGQ JbZYKqGfWeVu/JEAAeC6wE4QvKLEeidvggQnm6beJxA
-ArogOkTDAnvC1SKPkSGapNix2W6yvku1QFOFs9bvuGA
--- yWZoUAOfSIL4FbWSAvhVkOEbUA1u3XPGKB1gNka/xfo
-Á¡þzòõ´lÐþÈ‘ L‚´C$’ì?Hc´®ìì|¥çÛ¹„.-øýÜå¡jõ	©lÂ}9:KÓ®U…Á^§<>í¯Ì“ôŽIO6µ
--- a/secrets/gitlab/db_pw.age
+++ b/secrets/gitlab/db_pw.age
@ -1,20 +1,18 @@
 age-encryption.org/v1
-> ssh-ed25519 V1pwNA TtxqHD3bJI046SXF61CKfpDRI+HHTRpc/iznIMdQiUs
-WWgm2OdnPjj29tIrAMa2sJCNEaR2iTAl/hMfPLv2QoY
-> ssh-ed25519 4PzZog 0I9h+D7DjRwupkHWDUKIxJlVBUWwbCTR1nx8UcEm6Xg
-NIYzimYGAo8ou93B/tzjmB1K7hu2tXy4XMRiwlDqI0k
-> ssh-ed25519 dA0vRg 1U+1fUueu2k7FaY8GVN4BAbiF71OvKbGOC4oZ4mV3ko
-/fKxmEFW/L9A/1fDIteeTcz/SOv24HNct88oakdAkn0
-> ssh-ed25519 5Nd93w IjwMC1ZruM915vwA+lExdIq/OFT/4SlWgwOm9xgUPAQ
-mOOTbPdcDjORB1GhS0m4/p3MA6TfHXzWXvAMzKhw/n0
-> ssh-ed25519 q8eJgg mODUrCPf9GAix0jaPaKUs4ws1D9BM4huHbK2mst0SH4
-7qbxM/Wa9pMpB7TjQZgBojXR5qDJUBZvplsrI6EdSO0
-> ssh-ed25519 KVr8rw ybBiUHmEOyesWxdTEa1LPwI5J/PQaxYi02QJCAuYyGA
-LoRQ15hQdVGLj9pJY3TabBFhtPGBvU+bnAa2dzrkOY4
-> ssh-ed25519 fia1eQ Qu2RTOQiZY9i2SDs0NVlA1zcert0oFcFA3mXDDl59G0
-6akg1POXrvIrzITX6B8yTDw3cCqlxsD0k40mYnv5r/Y
-> ssh-ed25519 uZzB3g xNdZ8eSTFQZ/RcrNR4BpedX2pfceZwPjvgt9Wd8rMwo
-kMxoKyE0bjXEZ9tNykOUMZ0uHkqdx///QJB5QnLRhcA
--- 1DKMo46SYm7JlzFo3nZwtaK21TFmapfXqxXzxMXWb0Y
-8îé˜Ì‹}æš,æÛ^mmîH¿v`Ž#ð‘?0 «à¤Ð>Ù‘Xï¹;Î»åLÇV’8°=]Ô¬¢sEœˆéhÓâÉ‚Lè(ƒ`ÔýÇ"žZKîc¹1¼.|GØåóç??<3F>eÙÈp<C388>_èã™ËÁ‘¹ìÛ¤ÖÆ
-äá·ŽÏzéùë<>uPåqÏª9ªS«V¶évÆ~§I4õ
+-> ssh-ed25519 V1pwNA a2hqKI7aO4y8QLvINHmeFrAeUthzoE3gcsNiJS87yTk
+iy7zvTi6gh3/t42Pe+f5ylDx4eq1hINSAFhI3S1wOks
+-> ssh-ed25519 4PzZog S4zRlO88rWpco1NY/7yJDQvCtPnRvYjWosE8VNtYkWU
+iX+b3W2Pa3kw+ErHo/Qk+ZTH5B8svQTfMcXdN4IWVZY
+-> ssh-ed25519 5Nd93w WDwhO/1jtbE+DbLq8BkReY/Vdyhdc35win+n3HMqclM
+v2lqyU6RwTm6KX1z99FE78jv1KlyuoAWRG2x/Wq/X6U
+-> ssh-ed25519 q8eJgg J7F4QM4iT3+8HbJo4ARh7iLn5/GBptn1wGM7amyr8ms
+9DuYiyXOOWzXdlUAO7/rUYuPy9MyyxB88w814aM3XE0
+-> ssh-ed25519 KVr8rw BEBn1R3n2JYWqcjgfO5IIRWnrcPnMtI2E/hQGktypVk
+ErzCxi8fht4tWQxzMAvkDnbNUtcbiyBiC9pNdp1vbaY
+-> ssh-ed25519 fia1eQ G6EtgOxK54K97LCUNZ8h87WwWwXrn8cKtkCXa75pKGc
+M86xqkKJ/DtjB7mIE1gPhoXTYzHp2393w0cZMOHQNQQ
+-> ssh-ed25519 uZzB3g /sd3xL4WAKbPxvdqq/fihyAhxkn0FAiBCYydIXB1/VY
+/hdi7E2cEU8U82/CVB+OpGacC+OfVpXXYEu6B8bQnB0
+--- HGKIhGq5mH/k6m63FdnLdO2R1fs7o7K/wlP6zBwopL0
+Ťw×7°Ą1ńµ“×»Áě	}5¨-<2D>g-+GXVŘpŞD’ĺł)IëoróŇŁmŹ´!ňąç®]7ď–Z)»Ĺ<C2BB>±Śý"˙…±šétŻÖu$zâUŢyJ‡g_ż‰<C5BC>Yř'94<39>Th‚Â_*„dĽ%I‚<c$ć!žĆŞF{aBY8.$
+îžú»Jśi†
üűŇÉ*ŞČâçČ
--- a/secrets/gitlab/ldap_pw.age
+++ b/secrets/gitlab/ldap_pw.age
--- a/secrets/gitlab/pw.age
+++ b/secrets/gitlab/pw.age
--- a/secrets/gitlab/runners/runner01.age
+++ b/secrets/gitlab/runners/runner01.age
@ -1,19 +1,17 @@
 age-encryption.org/v1
-> ssh-ed25519 V1pwNA XYyPJyYihZ3p/Ek6fKEvaNU4BmXGdL4Wb0uXH+T3nSI
-o8XtYFyvOLA9gDkfKzTNMzu03V74f+6NBcatQFniKAI
-> ssh-ed25519 4PzZog aqB7IflSlMr2iQKxB5WeCFa0RI1KqZC8OTcAlMg0YHI
-VHW+ch2hxiYAJcWFzF/RCQRui9j5UtV3orzLHa6of8g
-> ssh-ed25519 dA0vRg sgcNg8aztkTWaoDtEtS8veMwaWiKy8Pmn7ygBEE+C08
-/BPatZiqv+Eh9yvhwgQKomAfQ0wL10oFQfEDT+hkndM
-> ssh-ed25519 5Nd93w djTbwVGuMqPwb2xqmwQswlFcmKk9ggb2MaJk3lNYRFc
-sL5qedtBepneL0JdEzAy4n+wpan2qOxqMSBOoSy0+VM
-> ssh-ed25519 q8eJgg ct6G0ocB105he0n1b1Dp0okYKjwCHk/uf3dVmR/eohA
-yzuUTQsUw2Fzkcin/an9kOC0CJnF4+7TCW3250DR19U
-> ssh-ed25519 KVr8rw UU47Xvfy1s2VQbtluzafT/Yor3bEjl70F/aCC7RqYEQ
-wnP/vYiHmrlmnJ3XL5Qdq89MjEfdKfLdj7S/KTFd9CU
-> ssh-ed25519 fia1eQ p2upqBgZt7m93Kliu3vYWqCWLIOGhfI5y8s/AmNIb0k
-DQ7vGs3UQ4Ewn3PabqpekiuaQaPIGxtNO9+h2p829Ww
-> ssh-ed25519 CqOTGQ hwUkZAFhPQL4ixYGPPeryGYUKddeAbDE3lQvJNdwhVo
-Hghp1zBDYxaqXpRbxSjsUOuIxxwFZywEMCYp/6EnAhQ
--- WY6ZRscxKUyXzyTqSHNjtLrNkNJA91epJcZ8889yucU
- ´zz;¦°sºN‚+ó3bÉ*³<¤áç[®i¿±4%:<3A>g—îìê6À”fBWºýârÐFÈó»Ù¢v1ü k<³ðl¤n†FS–&[òÇæ<C387>SkŽÄbÉjæ)N`£‘
h‡ÄÉÚ_kè_ºô–	Ô%g
+-> ssh-ed25519 V1pwNA ho0uObE03nO0vqsvZTMzPnCtKtrDY97NPnB7gEB/jQw
+ACi9I0H6kVueAxy78vk/O9jRCWWg3oNqUpZca9DRxaM
+-> ssh-ed25519 4PzZog tDFtlM+D+UCo4S1mvrsza3oITzMP4Ce5aoA2qHH/cic
+xANLix3cVUbIaDoITNMmeWhGwDBI2Or6dRzHVgX90pc
+-> ssh-ed25519 5Nd93w D0hUE96J87zkA4RFBeWT+DNQ1+Ias22qCBGJqCoNy3E
+T5LQfnfbDroncMKocmQncKNn5hNk8DbHr7PbxRiREsI
+-> ssh-ed25519 q8eJgg AAaT4eLvau98av6noniPXsxO2/hNe5zKhe4/652Q5gY
+Fm8LUMsas1I+7Gk7bgCQLDglgWNBzoU35pOOYhrAhas
+-> ssh-ed25519 KVr8rw di5+pJXvYhhCorxEEMtzCUaVyxAfj4lou7dHGJTa3TA
+BlpXjM4e1nHQMP6l4yDqIyqDeSxBPqY+d00ovsXWxfU
+-> ssh-ed25519 fia1eQ HQh4QEHVWYSUjfnXUa3hBjFiNztpUht3WQfrOdJUHiY
+rBls9Iu1MJVl1kWlcXAuMfkvSUYTBgXX/+Z47zpNGCY
+-> ssh-ed25519 yvS9bw +E73rDWXej0/ZciIvu+femktarnlQoXF7zZUQy6q5TY
+u/+L9EEdQcztppqUIIX46cxFtneEEZXdIeCUQDHhApk
+--- C9L0vzou3KDkzfFX3SvziLf3k14nDFtuCvrO53WKdZM
+Æ#9+ø²±”kí(Â@ñŠ–4“ñ PÀ—›õü$ïp
Æ±<C386>©/7)¡|K'×é©)‹ã,Ï	Î,5§£™hàÍZmÀÚX‹)RÞ—š [m %<17>‡<>ØEÆ”^b_´a"Èwe½?jyc0©L-;
--- a/secrets/gitlab/runners/runner02.age
+++ b/secrets/gitlab/runners/runner02.age
--- a/secrets/gitlab/secrets_db.age
+++ b/secrets/gitlab/secrets_db.age
@ -1,20 +1,17 @@
 age-encryption.org/v1
-> ssh-ed25519 V1pwNA AbGjaacp7Tp3DYhUzCOUzzNlUGXYDTU9vEv1DJpzqww
-grRQCuht2PKdwsdbABRIO/QLX2HikbnnPDYDfRNeeOY
-> ssh-ed25519 4PzZog loCPiNwbEIOtBgQnBRSuiCuizZdrh/l4lbdvv1/SYCQ
-WMu8NXj0LYaWS0qxcuBsG/GdH/E8C8OmbYb2mYuRkrc
-> ssh-ed25519 dA0vRg 4UnugzCjQxs4Xqii2PWA7prXrjS4wP3wJQtUbrQi4QU
-HqjVoiYSZ70DdNRui4yZjR5oGiCyR6Rly+CoM0MEbxI
-> ssh-ed25519 5Nd93w +PwbmFGDmpdwKvuHWLQOJExFZm2P8pl15RpRqeM17Vk
-HvDt20lZsSpyZ8z2BShXHlAOzIM+15UpMonz3sqSwR8
-> ssh-ed25519 q8eJgg SYtYX+5Q35sygmo6PdlUzG04g2bGnSyVGgnYPkJKoCI
-nrZN3mp0jxSQfblj0pDE/7/pO2jAg0byTm4HQOQzQBU
-> ssh-ed25519 KVr8rw CzJ3Fn25Lq8zZOAHKKbLsiHhTHlAMDNHv3yLa7gaqSk
-O1gss3s7y0VfE6ZS2GkdskeCfLJNytTNfFWz/bzEebY
-> ssh-ed25519 fia1eQ WWju+k3tswiyQfc7XR/txDAIaIjX7Xfnv2IcbKH/s2k
-mAxPhLCJjwX68AwGSkJxMSF5PkGPQDSCkBMoCi1Ozf0
-> ssh-ed25519 uZzB3g EbWWbRWM+8jrtg/ZX8AC8VKMOtf3ch0QrBn5QCia6TQ
-8/TISW7rN55/vfkBH9HKx7GKaWAMIEVz6xmtCh5fjfw
--- +L6TvqJA1YZEmK9PDIzh2r5wtzB1BI+qz+i9JotMejk
-úµÄ }“sIc’ïø>}ö5bîTì«ê§Ð¢ÙrÂN1ñó,ˆ4æONÁÔRzfíÝ=Ø§ŽèNx7ˆûÓÒ»[ÇÓä)×G
òÄgè‘Øw¥ˆÄ!sõN‘>#ggâGÒ©¿³\üÐÿÓkØª2šíg#@èÅÊaoï„—‹†ÏÓ47åwxû6mfC„Q<E2809E>2H
-„>ËmaH”ï/uv
+-> ssh-ed25519 V1pwNA nvvDGnr/WMta+0XVEnUlmg8KV3mO+5zX9ZlFQZQS1Bg
+YyVLxI+TxfXXsncaIyi9Su6tzh5KLTbHxHxbWhplXXw
+-> ssh-ed25519 4PzZog zuxuhtcAiEhrr28adZrFPK5Z4399/8gbf8aWoAtI7HU
+vR/0DkXhUQmbfdzMBVAFDd1S/87DDpg9v0gyZDVv2UY
+-> ssh-ed25519 5Nd93w CUTmUrZomxIY6wwemYIwaIBO9CFSPrcQaIWs1tUdMm8
+btVGPdTgvyxqd4rYiuIXLGJcQoF45g1hx5OnTHQgCrg
+-> ssh-ed25519 q8eJgg wKjpIAXn+5FAC09yengwsJmAgPVY4BSNOkzC6bdZUBM
+LUifpX/UNLC0ge/ApqC0VZ6NWwug865Gtp5t2/Fbijw
+-> ssh-ed25519 KVr8rw 0YwXdULrmM1CaWqe4ppSvn3rI4qaHpjVFxZLtE/jFiY
+GXxdfK6NU0M0tBf9Txl9M7SzUEkAoDJ6VhGQuQtDRCg
+-> ssh-ed25519 fia1eQ BoAjwSD4dQG+35NLGjPwYcENbtkukIoEVxo23A3mukE
+1YAgdZedWip4daImkXA1UnHJNGu5LBF5g8t4FotjiTg
+-> ssh-ed25519 uZzB3g g/yGqYocU7fg27BOj75yUgFYHfYhLg5iOA490U7xpUY
+huOnWVaBT71Li8CO/NialjSzBC0jscJIE7Vddc34Aes
+--- 9iDIOye0Eass4rxrC2ZcfxXu09TG0F5SQoMAi7VOsfg
+Ãµm§Od¹åŒ½xõà·o#Ï5i‰¯¢;ËYóÔÜ:>†,n,³Qô¤}K{½)œi¨XêÜU”jvS?jú(ªr@'ó†<C3B3>sç@ö çáLQ…ç<E280A6>ÅÞC^ý¯w‹<77>€XœólqŠcÑOÀ«ÆP¾Ñ<C2BE>Mnç_<C3A7>jÚÁÅÍ<L<…C+¦œå\YüëÜû$Ì3<C38C>|r”ÿN€x<E282AC>2A¹¿~
--- a/secrets/gitlab/secrets_jws.age
+++ b/secrets/gitlab/secrets_jws.age
--- a/secrets/gitlab/secrets_otp.age
+++ b/secrets/gitlab/secrets_otp.age
--- a/secrets/gitlab/secrets_secret.age
+++ b/secrets/gitlab/secrets_secret.age
--- a/secrets/grafana/pw.age
+++ b/secrets/grafana/pw.age
@ -1,19 +1,17 @@
 age-encryption.org/v1
-> ssh-ed25519 V1pwNA CGCG7vFUJ9hUdJWRax68aDpHZEREFnrjo3expN7oUTM
-/eCKERrmnmceosD45BENTxtoyLmjGmGVvxkGWAtCRyI
-> ssh-ed25519 4PzZog DSUIoivSmbzN0AvKIPXhtjTBft9D9AaRioe6biuh6XQ
-XlV7xKGi2BY+sCgJCEiSB9AlpXFoQnbeIxKxNhPRetY
-> ssh-ed25519 dA0vRg sYBG5Ld7lMw+cm5zUgVR9Bi8YVwDrRglII36Tj8Jfl8
-cQMY6UyMrRtfoU6mn0pg47Vf4DB2KcjwiRHEmvU/Rmg
-> ssh-ed25519 5Nd93w H3k1nFMs8wkqsVKzGp3n4CE7MuyxJWRZ+xgSgDbnuzw
-2fff1rsfvE5NikWjF9gkvHuthgLKLOey3PebYG26yNs
-> ssh-ed25519 q8eJgg UR21V4UAJ7/ALE7IcfMVYO3mD2jbanhBu1fj1iEjpBI
-8Yl7/sLlQmCvGJvKZt1B4lJMSnPt6gHi/k1u6Gm2sII
-> ssh-ed25519 KVr8rw ur14/Gp1Z9ODFFVaUf50i4+ELKy9RHmsXjbaj5h9IGI
-FTZn1ZuBixaehBW3hnVjfXrt2m8co1KSp5aUTA+TRdg
-> ssh-ed25519 fia1eQ 5bmpon54otL6GnIhyYT7CbLuCR8vk0td3kPBGxsSWCU
-PSngrN6yQODB/Vmu8ka3vvDv5DkShktyOWrhzC9K1LQ
-> ssh-ed25519 rmrvjw J6YtkhTuDaUtc8LUp/zfvQD3LST00arsbe37bZw4nAY
-r3TDmtyB0Cc7Mx8EXb1yytvpF3+4//6cy4jkK+cWTls
--- mSjAJK/sd2Qj4Ffuee/T5LTADcNLVTCcKL/4VlqZvd0
-RêÛÖU$ìòži‘ŸU«áXô¯Ís<C38D>ÁÓòñãfá—_âƒo/’&cØ&{*¶‡ÙŠ/äh¬Â\œßLµ[%®=,Qòqè
+-> ssh-ed25519 V1pwNA LAEKkf1x39PdLIH97OJtIJfTZX1M6gT8No8qqTYPA3c
+2iOWDr+BbDIaTz58B7AzN4NWT7RwSb7XkuiVJ57B1j0
+-> ssh-ed25519 4PzZog Cw8kkkTDezUXzQ2gphOAv2jSDKVoERI99A6tytjwv3c
+hYNdr4UWSlrn2PwFCBlI0IW3tQClDWcbuNjdAwoteho
+-> ssh-ed25519 5Nd93w Pe1qtfWj87qtN6DWuBiB5NoBLI+aSfSgHoq421na720
+7kb4ChNHhvfp7hM9wd4OZWUlm51cE7/RR3IFdomw12g
+-> ssh-ed25519 q8eJgg p9LYkhCE37NkSDxV/as4eM7UiiITWcK0GIsXitD0Vi0
+T0m6EuQ5oa7EU4X4Dx+BWyGKH+zm8A28QQUvwiaNPmc
+-> ssh-ed25519 KVr8rw XuxmoWmw07yr9Tqi61RMvuwf6oYIVbJUhfT+FgBwgEg
+Hzym4T2/f/6A/UYTdIbBavj3hrq3sGCNO7mwewS/mg8
+-> ssh-ed25519 fia1eQ f2XQkWEUmk0n9DtS7vhZt9o3+aPtgiwro8Eu9mcnvmk
+/43wuhInhHfSPcFziObogHjyZy6qXr7X1jAPTMzulJI
+-> ssh-ed25519 IzAMqA eqAgjVRof9nHZiYzY0m5MRlEzy0LBXxb/yi11K29kkQ
+wS86BxKIoT9ZOW1n8Xo6GomhOlRztBp7DpQNv/s9PRs
+--- axgiJ8IqNurtt+4iAL6j3mRLi73NnjoG5+TMeIKwjI0
+Ô
9ÓŠö†âFÛ„XþX_î(ÝŠ.Œc{<02>¼~™ègÍ}<7D>S¬<>à"92K¬J4„s4×u#1‹	Äæ~ÚëRX/@°K8~áBö
--- a/secrets/ldap/details.age
+++ b/secrets/ldap/details.age
--- a/secrets/ldap/pw.age
+++ b/secrets/ldap/pw.age
@ -1,26 +1,23 @@
 age-encryption.org/v1
-> ssh-ed25519 V1pwNA gbttBwmYtq67vkhosksaN3pMFRD+yIZ9c3jkUqLjzwc
-sKzCx+fRVT08lE9SROuhsKk4umCokWSafCQtK6NzX3s
-> ssh-ed25519 4PzZog 1n6kEJ2pIjIt1u6DUG2P0PL8s8k2316YnPR4cGLgW0I
-EFE4bJ9AkJFAITUIMUSVaFszK01rpffnzg2HXLSskFU
-> ssh-ed25519 dA0vRg g9Xtgji4q1bjaGGiTqvBW9f/N9D2qZQimo9Wz8aNb10
-zj/0VlNRk3jX054Nu9hZGP+Vpx6YsBtxUTdjOOUyzUc
-> ssh-ed25519 5Nd93w xwTEItzkfxNRvwPcncZGqUGeOpY3eSJSYP7vkhWjlmg
-sTTlm+WdWTTKfr+KTUVa5nLJAHv8UcsWJDXAuFqFZOY
-> ssh-ed25519 q8eJgg Jj02qd+MlAOSGLWEsaosZtfo3f0zZyzdT0czSauQr3I
-aKHrwFMt4KvICBXm4fdt57ZaaGkilv1Eau7Y6TPB3ls
-> ssh-ed25519 KVr8rw DKp/IrXZ3Cqh7b7coO22iDR/InZ5xY8iLcm1KFgUCSI
-YUQJ05y952NIoUeChUDcuvO9ku6S7qoBafRwSmCzLUk
-> ssh-ed25519 fia1eQ w1p/K436VeeWLjTtxZAGeOl0oZWeE88C2OfAg4Vc6Vg
-eLcoL3kV2fhtZREEmgIEiX6ci05tU4PypX+WrRaoC4w
-> ssh-ed25519 IzAMqA ItqYQQFlBcabTg8ydW0EEq9ZO7SamcZUGCtZUCAtSmo
-RvtyYRdWEmMhU6uA8WSFhuzow8CsXWZmyJR9m+CDo/g
-> ssh-ed25519 uZzB3g gG0Ku+k9Ct8D7ZuHPsD9IZO0+O36jKps6QDYEyhYSy0
-4npr5UCPapsWmyANaX08JVVCmU3mpgD93kGWvEFP4F4
-> ssh-ed25519 Hb0ipQ jO43lRL6JA0dLRfei2uR4xo7b+hKItvQmYEjauLEvkU
-3RuQqq+Z6V0qASF1EhtiDhn5MZ65sdmJ8hzebRmAlK8
-> ssh-ed25519 IzAMqA 8q3O2zg4eX41Gbh8PSVTxy6ukc28PVvoIROkbKcJqV4
-bnS9VskRrWKZR0KDsh8elU4vhBXuZKV+7sj4Mx8QuXw
--- 3yQiKJMfU9JyNxvcZLea+2FlHsoGWpaAeKQvMLE87uQ
-ÓªvK½ #\ÔñòQ';¼Â—W‹¼Áy¸:·%æ8]¡‹¹^÷ë|>ûÍJMF+!Zð2»<»‰¶@Ê2²6S?`Ð‘CŽÙèñ\Ë˜ôÅ„KÃŒb½ÍWÉžêJéÓ„£˜1Ì×âï±ÚªŒ'In%ÕAŒ˜;Û‘@¸±9L3ÏaÔYMIÂ`î<>nì;tr:÷.P„Ñ<E2809E>î
-×
+-> ssh-ed25519 V1pwNA 87SmLeH/I1VzLSj65xOuPZsPDnVl9xliQ5/CVijnYmM
+2RNAdkwpR7AHsYrh4/NnANF5oNa6NnKF2TvqiuMrxAA
+-> ssh-ed25519 4PzZog BUlnW06UQsJzwcQ3Jtca5Mzgj+iFUunwhisvtIYlv2g
+8zGP78Pcw7Sx2mCWAEBf/v8vH3PXqqQ5GmBXvLQN0jk
+-> ssh-ed25519 5Nd93w 985aPULvm7eHx4VACN0MU9tkZvuhEGfTse5rCILxCWE
+kX2GxHAC1XJe837p6kJtaqnESrNQZgBOnw47zE7enf4
+-> ssh-ed25519 q8eJgg J4Gdo5cacvP19ZyUFSsIQdy6imX6oJDrBIH2nLUC4D4
+d4VhUAvqAyIAYKJjNPg5rsM7GifGQo+nl1+Oyvk7tsQ
+-> ssh-ed25519 KVr8rw cmAn4m7om7xJ8ByH1mWE9sG4NZVOOENZYuqh8yly7CM
+qgZjhu1fvNbDgbF3xFMqVI0klgZOZ0gEuXU/dq7ZziA
+-> ssh-ed25519 fia1eQ xTLCJGaocQf99+Fl6FHXu6hOXLmq2i8aFDoS7RevYV4
+K4JxlKPHjUfQZj9LnVXAryWln2c10lZhrpt4ALCF6k4
+-> ssh-ed25519 IzAMqA VCMeNgMAgywehKU6Fvh9O0nXHWSFD2PkNM8++ZqWYB8
+uCnmYYPiuKt22eplH3Ms0LzBynU1JqMjWDDx9Zep2Q0
+-> ssh-ed25519 uZzB3g OIeb65JzQmV+GPw1RxBYEKrWBovyqD+yUNkvD5ey7Ds
+7RlSzUGmwcuV+NwwOIJ1dAsiBk48lD3vbsnq7U/xJks
+-> ssh-ed25519 Hb0ipQ s5bT1+VXT8ySjSTCoD6dDqc+cU49SDv1AgUIKmaKcno
+oa+M7RQq31nzSccRUdEw1NuHQo4xHaSva6CaIBgz9V8
+-> ssh-ed25519 IzAMqA hvFsxUBn484Uga9+JGPDxsjhZBhmNGlLXn/jX2BxwA4
+pSdMVOfWttPbioa0Pkl2eSjE+TpocHu5+/l0f8IoOFA
+--- B28xN6XA1WfkiAYzDCfdKMxbosPv9ad0V/NFX3KeJNw
+Œí»X˜1«š*Ö‚Hk’—,ïÐè2>è<ÑþÃ„fŽiP# Ù‘3<E28098>ç³h<ßM±RD¥ASe†ö!2`Ž£?¿ª0µ–F¼÷='à<>¿Å§¦øCëõñr<C3B1>¾@ÒêXvÆ˜î{Ç"+s[Ûîš€‹E«‚Ÿ¥65CÚÎx§¡xr°]™Ÿdê3_ä™1J7áÆÚ”¹½Àµº 
--- a/secrets/nextcloud/pw.age
+++ b/secrets/nextcloud/pw.age
@ -1,19 +1,18 @@
 age-encryption.org/v1
-> ssh-ed25519 V1pwNA ZlR8h9qHUL9sOogTAS4jhOkSqgeWOMgrI2jpzZeB43E
-c1B+g2ke5kRtFZ1us5Sb8gxYdb7DUx5l1IzVAfbXxW4
-> ssh-ed25519 4PzZog uPUS/whEnUBue936Q95LCG31yz987AGVTULqCLfQrSs
-cGgATnRDcpNJ7CRUkouyoDk80EYB/QgzkX5snfs2qjg
-> ssh-ed25519 dA0vRg gabrxTdlYIjZWYnRMdID7aLu3hgHKmTG6RQHMMnsdjM
-HIKk6j8Cntw6/SAtbAjDTSDqXhRzItris/gcm3UQT2w
-> ssh-ed25519 5Nd93w 9enbyAo/XabNmXWppWZWC0Do+6hwzjLPc/RgpFSsOkY
-tLBW23QTKZKYZ0nlJ1WDdqsu8u0vsyNoZ10qrk06p3E
-> ssh-ed25519 q8eJgg 4Un1ZATrDODVT5Nr1qNkQzfhBeWcDkujxvFmXumHKl4
-MW1gkllR6yl4FiR/84jV04TgN/B4WEPbmrIWPVG7yKg
-> ssh-ed25519 KVr8rw ld3Xw4y/UIN6RADoJt+2gwnMbcl7qC4sF2X/pJcdJjU
-8b3N70CMfQpXY01EjNxn4dZJ2PwbWG7JgYgfOlGfZT8
-> ssh-ed25519 fia1eQ 5J0q5b+gAlELovtLXXTwr9jfhOl5L5SEy7+qRxUicCQ
-k4Xd1ypatsY4rFPAVZoA89V6NrnLxrIrWBhYCY0BEis
-> ssh-ed25519 YFaxCg UgvKYVP36n85x6AaAIGysm9Kzl4TrMip9GTxVMRuWgM
-HuTioTpbARDViBacuvqHM2WDNvL+hDyDCb8YJW2uukE
--- ig5Vtym6PTLi2FyPk/bdMBeQV8qICqxGONQGU2lGfxI
-z|^Ú<>¬~Á0‹ƒ]é|Ñ¸"ù¸¯¡Q<C2A1>zb§“¡"¢ª—ùú¸gm¸rëƒ<C3AB>u¤ð‰<C3B0>y±õÃe®ñÖëÚÁ¿$çËûc
+-> ssh-ed25519 V1pwNA gR4aFo/u2ow8mMgTInSPElO6gBhgig2s9Wzp+IkGjlY
+mVWoBrKH7AihCbdrspCIzPjF8N0kQGDML6pkybH5Y4U
+-> ssh-ed25519 4PzZog BhiSfpYVlUgTLX6rHisiyzLOmzrqcZ8JKDqwY1lg+D4
+nSxNNHRYPy0C0ufqa2QMIylMr5IPlPUiDcg+d79KkDA
+-> ssh-ed25519 5Nd93w +bZMaaPc0jTIQ/eu/uWWgA41UQnKveaaVjgqoIaAGyw
+elodhm0K17eQQInvae1tkkhFY1aPrbTdaRsviYDEBEg
+-> ssh-ed25519 q8eJgg LlaIdTPw3c2H8R5mDIIam4Ygvvk5gpgPahNJvf9UnB8
+BN901oRUt0j75RnQZnn4uFiLKEtRhCvFtKHug7Ikg8U
+-> ssh-ed25519 KVr8rw Bv9wfs5KP7lvH3Bpnsbzpgzduq1xiQlwVcWndWFL7Qo
+LgGA4X5MOelYhpXWfsX95J+YGjcPzL6ISlPKr9ZNv/w
+-> ssh-ed25519 fia1eQ WaxlI+aHWQdJs2YtttcQ4TzI3aIlkmdbm21mhv71VRE
+yI6QKxZ/TwXRDdaHxt6+ZVldnB7sZRGQFABnd7zeXtE
+-> ssh-ed25519 YFaxCg /V6Ab/BqFQ13K0qN1DOfaw8LLGR049s0S/FuK6dL6WA
+fZbxvQWiPh/MH4/fOzV5trPL+B4H2o2WtVBIPuFsdLE
+--- kUKnoRQARSlp+lGUNu5Zu7KztkK36VZeK9xozWZwmyY
+¼‚‚Ï¶ÞãtT€‚)<29>ÊãQ*12wc¹ÍÛvÑ¶^<5E>ÁE~]ïÀ!³TÎÎB‰3?³
+§R™}ˆDÚ><3E><>º uðÃ-.¿¹<C2BF>9DóŒ
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@ -1,7 +1,6 @@
 let
  admin = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK6DjXTAxesXpQ65l659iAjzEb6VpRaWKSg4AXxifPw9 Skynet Admin";
-  silver_laptop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFQWfVKls31yK1aZeAu5mCE+xycI9Kt3Xoj+gfvEonDg silver@helios";
-  silver_laptop_2 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOmm4CCnpT+tF7vecSrku0+7aDA1z3pQ+PDqZvoCynCR silver@aether";
+  silver_laptop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFQWfVKls31yK1aZeAu5mCE+xycI9Kt3Xoj+gfvEonDg NixOS Laptop";
  silver_desktop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN34yTh0nk7HAz8id5Z/wiIX3H7ptleDyXy5bfbemico Desktop";
  thenobrainer = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKjaKI97NY7bki07kxAvo95196NXCaMvI1Dx7dMW05Q1 thenobrainer";
  eliza = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIJaVEGPDxG/0gbYJovPB+tiODgBDUABlgc1OokmF3WA eliza-skynet";
@ -10,7 +9,6 @@ let
  users = [
    admin
    silver_laptop
-    silver_laptop_2
    silver_desktop
    thenobrainer
    eliza
@ -21,8 +19,9 @@ let
  vendetta = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFvcxiSYE38V1IopHj7Z7ZWP1IqnskYCdhj8yCQohVUM root@vendetta";
  vigil = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICDsz1bjNAThqwF48dKIJGOECsCKHTj/Gn5Gh9XyzoSO root@vigil";
  galatea = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII3Mke5YtaMkLvXJxJ3y7YAIEBesoJk3qJyJsnoLUWgW root@galatea";
+  optimus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIqYbbWy3WWtxvD96Hx+RfTx7fJPPirIEa5bOvUILi9r root@optimus";
  glados = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ6go7ScvOga9vYqC5HglPfh2Nu8wQTpEKpvIZuMAZom root@glados";
-  wheatly = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIPlgCGtyvd3xwYg9ZNyjTJNB/LvUSJO01SzN8PGcDLP root@wheatly";
+  wheatly = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEehcrWqZbTr4+do1ONE9Il/SayP0xXMvhozm845tonN root@wheatly";
  kitt = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPble6JA2O/Wwv0Fztl/kiV0qj+QMjS+jTTj1Sz8k9xK root@kitt";
  gir = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINL2qk/e0QBqpTQ2xDjF7Cv4c92jJ53jW2fuu88hAF/u root@gir";
  neuromancer = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEFAs6lBJSUBRhtZO3zGKhEIlWvqnHFGAQuQ//9FdAn6 root@neuromancer";
@ -31,9 +30,6 @@ let
  cadie = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIACcwg27wzzFVvzuTytcnzRmCfGkhULwlHJA/3BeVtgf root@cadie";
  marvin = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIAme2vuVpGYX4La/JtXm3zunsWNDP+SlGmBk/pWmYkH root@marvin";
  calculon = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGsmeBfh4Jw2GOL7Iyswzn4TVNzalDbxDgh7WuQotFxR root@calculon";
-  ariia = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA4kV6W1/tP/nf2ZWNhRoV1mK04R4pS+c5vdsA1n5gpN root@ariia";
-  optimus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFv0Hb4qfzXUll+Hct1NQOE0bCf0MpE24Cqskd8vAFyj root@optimus";
-  bumblebee = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINF31tsOZTEpPFCu4wZvJjxxvgFhRpxvo9SKyDMNWHZu root@bumblebee";

  systems = [
    agentjones
@ -41,7 +37,6 @@ let
    vigil
    galatea
    optimus
-    bumblebee
    glados
    wheatly
    kitt
@ -52,7 +47,6 @@ let
    cadie
    marvin
    calculon
-    ariia
  ];

  dns = [
@ -80,9 +74,30 @@ let
  ];

  grafana = [
-    ariia
+    kitt
  ];

+  # these need dns stuff
+  webservers =
+    [
+      # ULFM
+      galatea
+      # Games
+      optimus
+      # skynet is a webserver for users
+      skynet
+      # our offical server
+      earth
+
+      # nix
+
+      calculon
+    ]
+    # ldap servers are web facing
+    ++ ldap
+    ++ gitlab
+    ++ nextcloud;
+
  restic = [
    neuromancer
  ];
@ -98,6 +113,10 @@ let
  bitwarden = [
    kitt
  ];
+
+  nuked = [
+    optimus
+  ];
 in {
  # nix run github:ryantm/agenix -- -e secret1.age

@ -117,9 +136,6 @@ in {
  "gitlab/runners/runner01.age".publicKeys = users ++ gitlab_runners;
  "gitlab/runners/runner02.age".publicKeys = users ++ gitlab_runners;

-  "forgejo/runners/token.age".publicKeys = users ++ gitlab_runners;
-  "forgejo/runners/ssh.age".publicKeys = users ++ gitlab_runners;
-
  # for ldap
  "ldap/pw.age".publicKeys = users ++ ldap ++ bitwarden;
  # for use connectring to teh ldap
@ -128,8 +144,10 @@ in {
  # everyone has access to this
  "backup/restic.age".publicKeys = users ++ systems;
  "backup/restic_pw.age".publicKeys = users ++ restic;
+  "backup/nuked.age".publicKeys = users ++ nuked;

  # discord bot and discord
+  "discord/ldap.age".publicKeys = users ++ ldap ++ discord;
  "discord/token.age".publicKeys = users ++ discord;

  # email stuff
--- a/secrets/stream_ulfm.age
+++ b/secrets/stream_ulfm.age
--- a/secrets/wolves/details.age
+++ b/secrets/wolves/details.age
Author	SHA1	Message	Date
Brendan Golden	b77f846a33	Merge remote-tracking branch 'origin/#76-Nuked-Backup' into #76-Nuked-Backup # Conflicts: # secrets/backup/nuked.age	2024-06-07 19:44:51 +01:00
Brendan Golden	097fa21af8	admin: add eliza and esy as admins to teh secrets Actually add the keys this time....	2024-06-07 19:20:52 +01:00
Brendan Golden	3e10c14a4b	feat: Gonna use the space left behind Optimus to test this out Relates to #76	2024-06-07 19:19:55 +01:00
Brendan Golden	223fcb4202	feat: Gonna use the space left behind Optimus to test this out Relates to #76	2024-06-06 23:36:50 +01:00