typo

.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-gitlab
-
-  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

.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-gitlab --show-trace
-        shell: bash

.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 }}"

.gitignore

@@ -4,10 +4,6 @@
 # Microsoft office Lockfiles
 ~$*
 *.tmp
-tmp
-
-# open office tmp lockfiles
-.~lock.*
 
 # Test files
 test.*
@@ -26,8 +22,3 @@ test.*
 
 # Dealing with Mac users
 .DS_Store
-
-# nixos stuff
-result
-/result
-.gcroots

.gitlab-ci.yml

@@ -1,7 +1,7 @@
 # borrowed from https://gitlab.com/nix17/nixos-config/-/blob/main/.gitlab-ci.yml
 
 stages:
-  - misc
+  - flake
   - test
   - deploy
   - deploy_gitlab
@@ -11,7 +11,7 @@ stages:
 # $PACKAGE_NAME = name of the flake that needs to be updated
 # $UPDATE_FLAKE = flag to update the flake
 update:
-  stage: misc
+  stage: flake
   tags:
     - nix
   # from https://forum.gitlab.com/t/git-push-from-inside-a-gitlab-runner/30554/5
@@ -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
@@ -40,24 +40,11 @@ update:
     variables:
       - $UPDATE_FLAKE == "yes"
 
-sync_repos:
-  stage: misc
-  image: registry.gitlab.com/gitlab-ci-utils/curl-jq:2.0.0
-  script:
-    - cd sync
-    - 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
+  - nix-env -if https://github.com/zhaofengli/colmena/tarball/v0.4.0
 
 .scripts_deploy: &scripts_deploy
   # setup ssh key
@@ -66,65 +53,34 @@ sync_repos:
   - mkdir -p ~/.ssh
   - chmod 700 ~/.ssh
 
-.scripts_cache: &scripts_cache
-  - 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
   tags:
     - nix
   before_script:
     - *scripts_base
-    - *scripts_cache
+  only:
-  rules:
+    changes:
-    - if: $UPDATE_FLAKE == "yes"
-      when: never
-    - changes:
       - applications/**/*
       - machines/**/*
       - secrets/**/*
       - flake.*
       - .gitlab-ci.yml
-      - config/**/*
 
 # deploy items only run on main
 .deploy_template: &deployment
   before_script:
     - *scripts_deploy
     - *scripts_base
-    - *scripts_cache
+  only:
-  rules:
+    refs:
-    - if: $UPDATE_FLAKE == "yes"
+      - main
-      when: never
-    - if: '$CI_PROJECT_NAMESPACE == "compsoc1/skynet" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
-      changes:
-        - flake.nix
-        - flake.lock
-        - applications/**/*
-        - machines/**/*
-        - secrets/**/*
-        - config/**/*
-
-linter:
-  <<: *builder
-  stage: test
-  script:
-    - nix --extra-experimental-features 'nix-command flakes' fmt -- --check .
 
 build:
   <<: *builder
   stage: test
   script:
-    - nix --extra-experimental-features 'nix-command flakes' develop
+    - colmena build
-    - 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-gitlab
 
 # dns always has to be deployed first
 deploy_dns:
@@ -132,7 +88,7 @@ deploy_dns:
   <<: *deployment
   stage: deploy
   script:
-    - colmena apply -v --on @active-dns
+    - colmena apply --on @active-dns
 
 deploy_core:
   <<: *builder
@@ -141,7 +97,7 @@ deploy_core:
   needs:
     - deploy_dns
   script:
-    - colmena apply -v --on @active-core
+    - colmena apply --on @active-core
 
 deploy_active:
   <<: *builder
@@ -150,22 +106,12 @@ deploy_active:
   needs:
     - deploy_dns
   script:
-    - colmena apply -v --on @active
+    - colmena apply --on @active
-
-# this is just skynet server
-deploy_ext:
-  <<: *builder
-  <<: *deployment
-  stage: deploy
-  needs:
-    - deploy_dns
-  script:
-    - colmena apply -v --on @active-ext
 
 deploy_gitlab:
   <<: *builder
   <<: *deployment
   stage: deploy_gitlab
   script:
-    - colmena apply -v --on @active-gitlab
+    - colmena apply --on @active-gitlab
   when: manual

.mailmap

@@ -1 +0,0 @@
-Brendan Golden <silver@skynet.ie> <git_laptop@brendan.ie> <git@brendan.ie>

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'

ITD/Server_Inventory.csv

@@ -1,22 +0,0 @@
-Index,Name,Status,IP_Address,OS,Description
-SKYNET00001,agentjones,Active,193.1.99.72,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.73,Nixos-24.05,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.74,Nixos-24.05,"LDAP and Self-Service Password/Account management, also hosts our Discord bot"
-SKYNET00008,glados,Active,193.1.99.75,Nixos-24.05,Gitlab server
-SKYNET00009,gir,Active,193.1.99.76,Nixos-24.05,Email and Webmail
-SKYNET00010,wheatly,Active,193.1.99.78,Nixos-24.05,Gitlab Runner
-SKYNET00011,earth,Active,193.1.99.79,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.80,Nixos-24.05,Local Backup Server
-SKYNET00014,cadie,Active,193.1.99.77,Nixos-24.05,"Services VM, has nextcloud to start with"
-SKYNET00015,marvin,Active,193.1.99.81,Nixos-24.05,Trainee testing server
-SKYNET00016,optimus,Active,193.1.99.90,Debian-12,Games server manager (replacing SKYNET00006 soon)
-SKYNET00017,bumblebee,Active,193.1.99.91,Debian-12,Game server - Minecraft
-SKYNET00018,calculon,Active,193.1.99.82,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.83,Nixos-24.05,"Metrics, Grafana and Prometheus"
-SKYNET00021,ash,Active,193.1.99.114,NA,Server Room Network access

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

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

ITD_Firewall.csv

@@ -0,0 +1,14 @@
+Index,Name,IP_Address,DNS_Name,Ports_Current,Ports_Requested,Related_Tickets,Description
+SKYNET00001,agentjones,193.1.99.72,agentjones,"","","",Firewall (currently not active)
+SKYNET00002,vendetta,193.1.99.120,vendetta/ns1,53,"","",DNS Nameserver 1
+SKYNET00003,jarvis,193.1.99.73,jarvis,"","","",VM Host
+SKYNET00004,vigil,193.1.99.109,vigil/ns2,53,"","",DNS Nameserver 2
+SKYNET00005,galatea,193.1.99.111,galatea/stream,80/443 8000,"","",ULFM Radio
+SKYNET00006,optimus,193.1.99.112,optimus/games/*.games,80/443 25565,"","",Games server
+SKYNET00007,kitt,193.1.99.74,kitt/account/api.account,"",80/443,i23-07-28_010,LDAP and Self-Service Password/Account management
+SKYNET00008,glados,193.1.99.75,glados/gitlab/*.pages.gitlab,80/443,2222,i23-05-18_249,Gitlab server
+SKYNET00009,gir,193.1.99.76,gir/mail,80/443 25/143/993/587/465,"",i23-06-19_525/i23-06-19_525,Email and Webmail
+SKYNET00010,wheatly,193.1.99.78,wheatly,"","","",Gitlab Runner
+SKYNET00011,skynet_internal,193.1.99.79,skynet/skynet.int,80/443,"",i23-06-19_525,"Skynet server, Temp until I can get the DMZ setup properly on my end"
+SKYNET00012,skynet_dmz,193.1.96.165,skynet,22 80/443,"",i23-06-30_024,Skynet server.
+SKYNET00013,neuromancer,193.1.99.80,neuromancer,"","","",Local Backup Server

LICENSE

@@ -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.

Possible_Server_Names.md

@@ -1,20 +0,0 @@
-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
-* caro
-* Lowe - https://westworld.fandom.com/wiki/Bernard_Lowe
-* ultron
-* walle
-* eve
-* calculon
-* deepthought
-* earth
-* flexo
-* bender
-* marvin
-* kitt
-* wopr
-* wintermute

README.md

@@ -46,20 +46,7 @@ While the ***recommended way of deploying is using the CI/CD process*** there ar
 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``
-
-```ini
-Host *.skynet.ie 193.1.99.* 193.1.96.165
-   User username
-   IdentityFile ~/.ssh/skynet/username
-   IdentitiesOnly yes
-```
-
-Then you can run the following commands like so:
-
 ```shell
-colmena apply
-colmena apply --on @active-dns
 colmena apply --on @active-gitlab
 ```
 
@@ -98,16 +85,6 @@ We should be updating ``nixpkgs`` at least once a semester, ideally to teh next
 
 ```shell
 nix flake lock --update-input nixpkgs
-# newser versions
-nix flake update nixpkgs
-```
-
-### Formatting
-Formatting helps keep everything nice and consistent.  
-The pipeline will only run if the file is correctly formatted.  
-
-```shell
-nix fmt
 ```
 
 

applications/_base.nix

@@ -1,74 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  # root service
-  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
-    ./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 = {
-    # since we use this basically everywhere provide a standard way to set it
-    host = {
-      ip = mkOption {
-        type = types.str;
-      };
-      name = mkOption {
-        type = types.str;
-      };
-      hostname = mkOption {
-        type = types.str;
-        default = "${cfg.host.name}.skynet.ie";
-      };
-    };
-  };
-
-  config = {
-    services.skynet.dns.records = [
-      {
-        record = cfg.host.name;
-        r_type = "A";
-        value = cfg.host.ip;
-        server = true;
-      }
-      {
-        record = cfg.host.ip;
-        r_type = "PTR";
-        value = cfg.host.hostname;
-      }
-    ];
-
-    services.nginx = {
-      virtualHosts = {
-        # for every server unless explisitly defined redirect the ip to skynet.ie
-        "${cfg.host.ip}" = {
-          forceSSL = true;
-          useACMEHost = "skynet";
-          locations."/".return = "307 https://skynet.ie";
-        };
-      };
-    };
-  };
-}

applications/_retired/games.nix

@@ -1,69 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  inputs,
-  ...
-}:
-with lib; let
-  name = "games";
-  cfg = config.services.skynet."${name}";
-in {
-  imports = [
-    ./nginx.nix
-    ./games/minecraft.nix
-  ];
-
-  options.services.skynet."${name}" = {
-    enable = mkEnableOption "Skynet Games";
-
-    domain = {
-      tld = mkOption {
-        type = types.str;
-        default = "ie";
-      };
-
-      base = mkOption {
-        type = types.str;
-        default = "skynet";
-      };
-
-      sub = mkOption {
-        type = types.str;
-        default = "games";
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    services.skynet.dns.records = [
-      # need a base domain
-      {
-        record = cfg.domain.sub;
-        r_type = "CNAME";
-        value = config.services.skynet.host.name;
-      }
-    ];
-
-    services.skynet.acme.domains = [
-      "${cfg.domain.sub}.skynet.ie"
-    ];
-
-    services.nginx.virtualHosts = {
-      "${cfg.domain.sub}.skynet.ie" = {
-        forceSSL = true;
-        useACMEHost = "skynet";
-        root = "${inputs.skynet_website_games.defaultPackage.x86_64-linux}";
-      };
-    };
-
-    # the minecraft servers
-    services.skynet.games_minecraft = {
-      enable = true;
-
-      domain = {
-        sub = "minecraft.${cfg.domain.sub}";
-      };
-    };
-  };
-}

applications/acme.nix

@@ -1,16 +1,11 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
+  with lib;
-  pkgs,
+  let
-  lib,
+    cfg = config.skynet_acme;
-  ...
-}:
-with lib; let
-  name = "acme";
-  cfg = config.services.skynet."${name}";
   in {
   imports = [];
 
-  options.services.skynet."${name}" = {
+  options.skynet_acme = {
     domains = lib.mkOption {
       default = [ ];
       type = lib.types.listOf lib.types.str;
@@ -32,15 +27,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;
         };
       };
     };

applications/bitwarden/bitwarden_sync.nix

@@ -1,76 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}: let
-  user = "bwdc";
-in {
-  imports = [];
-
-  options = {};
-
-  config = {
-    age.secrets.bitwarden_sync_id = {
-      file = ../../secrets/bitwarden/id.age;
-      owner = user;
-      group = user;
-    };
-    age.secrets.bitwarden_sync_secret = {
-      file = ../../secrets/bitwarden/secret.age;
-      owner = user;
-      group = user;
-    };
-    age.secrets.bitwarden_sync_ldap = {
-      file = ../../secrets/ldap/pw.age;
-      owner = user;
-      group = user;
-    };
-
-    services.bitwarden-directory-connector-cli = {
-      enable = true;
-
-      user = user;
-
-      domain = "https://pw.skynet.ie";
-
-      ldap = {
-        ssl = false;
-        startTls = false;
-        sslAllowUnauthorized = false;
-        ad = false;
-        port = 389;
-        hostname = "account.skynet.ie";
-        rootPath = "dc=skynet,dc=ie";
-        username = "cn=admin,dc=skynet,dc=ie";
-      };
-
-      sync = {
-        removeDisabled = true;
-        overwriteExisting = false;
-        largeImport = false;
-        memberAttribute = "member";
-        creationDateAttribute = "skCreated";
-
-        users = true;
-        userPath = "ou=users";
-        userObjectClass = "inetOrgPerson";
-        userEmailAttribute = "skMail";
-        userFilter = "(|(memberOf=cn=skynet-committee,ou=groups,dc=skynet,dc=ie)(memberOf=cn=skynet-admins,ou=groups,dc=skynet,dc=ie))";
-
-        groups = true;
-        groupPath = "ou=groups";
-        groupObjectClass = "groupOfNames";
-        groupNameAttribute = "cn";
-      };
-
-      secrets = {
-        ldap = config.age.secrets.bitwarden_sync_ldap.path;
-        bitwarden = {
-          client_path_id = config.age.secrets.bitwarden_sync_id.path;
-          client_path_secret = config.age.secrets.bitwarden_sync_secret.path;
-        };
-      };
-    };
-  };
-}

applications/bitwarden/vaultwarden.nix

@@ -1,83 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  inputs,
-  ...
-}:
-with lib; let
-  name = "vaultwarden";
-  cfg = config.services.skynet."${name}";
-
-  domain_sub = "pw";
-  domain = "${domain_sub}.skynet.ie";
-in {
-  imports = [
-  ];
-
-  options.services.skynet."${name}" = {
-    enable = mkEnableOption "Skynet VaultWarden server";
-  };
-
-  config = mkIf cfg.enable {
-    #backups = [ "/etc/silver_ul_ical/database.db" ];
-
-    # Website config
-    services.skynet.acme.domains = [
-      domain
-    ];
-
-    services.skynet.dns.records = [
-      {
-        record = domain_sub;
-        r_type = "CNAME";
-        value = config.services.skynet.host.name;
-      }
-    ];
-
-    services.nginx.virtualHosts = {
-      "${domain}" = {
-        forceSSL = true;
-        useACMEHost = "skynet";
-        locations."/" = {
-          proxyPass = "http://127.0.0.1:${toString config.services.vaultwarden.config.ROCKET_PORT}";
-        };
-      };
-    };
-
-    # has ADMIN_TOKEN and SMTP_PASSWORD
-    age.secrets.bitwarden_details.file = ../../secrets/bitwarden/details.age;
-
-    services.vaultwarden = {
-      enable = true;
-
-      environmentFile = config.age.secrets.bitwarden_details.path;
-      config = {
-        DOMAIN = "https://${domain}";
-        SENDS_ALLOWED = true;
-        SIGNUPS_ALLOWED = false;
-
-        INVITATION_ORG_NAME = "Skyhold";
-
-        ORG_GROUPS_ENABLED = true;
-
-        USE_SENDMAIL = false;
-
-        SMTP_HOST = "mail.skynet.ie";
-        SMTP_FROM = "vaultwarden@skynet.ie";
-        SMTP_FROM_NAME = "Skynet Bitwarden server";
-        SMTP_SECURITY = "starttls";
-        SMTP_PORT = 587;
-
-        SMTP_USERNAME = "vaultwarden@skynet.ie";
-        SMTP_AUTH_MECHANISM = "Login";
-        SMTP_EMBED_IMAGES = true;
-
-        ROCKET_ADDRESS = "127.0.0.1";
-        ROCKET_PORT = 8222;
-
-        ROCKET_LOG = "critical";
-      };
-    };
-  };
-}

applications/discord.nix

@@ -1,37 +1,38 @@
-{
+{ config, pkgs, lib, inputs,  ... }:
-  config,
+  with lib;
-  pkgs,
+  let
-  lib,
+    cfg = config.services.discord_bot;
-  inputs,
-  ...
-}:
-with lib; let
-  name = "discord_bot";
-  cfg = config.services.skynet."${name}";
   in {
+
   imports = [
     inputs.skynet_discord_bot.nixosModule."x86_64-linux"
   ];
 
-  options.services.skynet."${name}" = {
+  options.services.discord_bot = {
     enable = mkEnableOption "Skynet LDAP backend server";
   };
 
   config = mkIf cfg.enable {
+
     #backups = [ "/etc/silver_ul_ical/database.db" ];
 
     age.secrets.discord_token.file  = ../secrets/discord/token.age;
-    age.secrets.discord_mail.file = ../secrets/email/details.age;
+    age.secrets.discord_ldap.file   = ../secrets/discord/ldap.age;
-    age.secrets.discord_wolves.file = ../secrets/wolves/details.age;
 
-    # this is what was imported
     services.skynet_discord_bot = {
       enable = true;
 
       env = {
         discord = config.age.secrets.discord_token.path;
-        mail = config.age.secrets.discord_mail.path;
+        ldap    = config.age.secrets.discord_ldap.path;
-        wolves = config.age.secrets.discord_wolves.path;
+      };
+
+      discord = {
+        server = "689189992417067052";
+        role = {
+          past    = "689192357727436926";
+          current = "887072218004197418";
+        };
       };
     };
   };

applications/dns.nix

@@ -0,0 +1,400 @@
+{ lib, pkgs, config, nodes, ... }:
+let
+  cfg = config.skynet_dns;
+
+  # reads that date to a string (will need to be fixed in 2038)
+  current_date = lib.readFile "${pkgs.runCommand "timestamp" {} "echo -n `date +%s` > $out"}";
+
+  # gets a list of records that match this type
+  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");
+
+  process_ptr     = records: lib.lists.forEach records (x: process_ptr_sub x);
+  process_ptr_sub = record: {record=(builtins.substring 9 3 record.record); r_type="PTR"; value=record.value;};
+  ip_ptr_to_int   = ip: lib.strings.toInt (builtins.substring 9 3 ip);
+
+  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");
+
+  format_records = records: offset: lib.strings.concatMapStrings (x: "${padString x.record offset} IN ${padString x.r_type 5} ${x.value}\n") records;
+
+  # small function to trim it down a tad
+  padString = text: length: fixedWidthString_post length " " text;
+
+  # like lib.strings.fixedWidthString but postfix
+  fixedWidthString_post = width: filler: str:
+    let
+      strw = lib.stringLength str;
+      reqWidth = width - (lib.stringLength filler);
+    in
+      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)
+  get_config_file = (domain:
+''$TTL 60  ; 1 minute
+; 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
+   ${current_date}
+   600        ; Refresh (10 minutes)
+   300        ; Retry   (5 minutes)
+   604800     ; Expire  (1 week)
+   3600       ; Minimum (1 hour)
+  )
+
+@ 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_server 11}
+
+; ------------------------------------------
+; A (non server names
+; ------------------------------------------
+${format_records sort_records_a 18}
+
+; ------------------------------------------
+; CNAMES
+; ------------------------------------------
+${format_records sort_records_cname 31}
+
+; ------------------------------------------
+; TXT
+; ------------------------------------------
+${format_records (filter_records_type "TXT") 29}
+
+; ------------------------------------------
+; SRV
+; ------------------------------------------
+${format_records sort_records_srv 17}
+
+
+''
+  );
+
+
+    # https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/4/html/reference_guide/s2-bind-configuration-zone-reverse
+    # config for our reverse dnspointers (not properly working)
+    get_config_file_rev = (domain:
+''$ORIGIN 64-64.99.1.193.in-addr.arpa.
+$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.
+
+; ------------------------------------------
+; PTR
+; ------------------------------------------
+${format_records sort_records_ptr 3}
+''
+    );
+
+    # 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 tmp1 then
+      tmp2
+    else
+      tmp1
+  );
+
+  secondaries = (if cfg.server.primary then
+      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
+  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:  {
+    # Creates /etc/skynet/dns/domain
+    "skynet/dns/${domain}" = {
+      user = "named";
+      group = "named";
+
+      # The UNIX file mode bits
+      mode = "0664";
+
+      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:
+    if type == "owned" then
+      create_entry_etc_sub domain (text.owned domain)
+    else if type == "reverse" 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: extraConfig: {
+     "${domain}" = {
+       extraConfig = ''
+${extraConfig}
+// for bumping the config
+// ${current_date}
+'';
+       # really wish teh nixos config didnt use master/slave
+       master = cfg.server.primary;
+       masters = primaries;
+       slaves = secondaries;
+       # need to write this to a file
+       # using the date in it so it will trigger a restart
+       file = "/etc/skynet/dns/${domain}";
+       # no leading whitespace for first line
+     };
+  });
+
+  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 = builtins.concatLists (
+    lib.attrsets.mapAttrsToList (key: value:
+      let
+        details_server = value.config.skynet_dns.server;
+        details_records = value.config.skynet_dns.records;
+      in
+      if builtins.hasAttr "skynet_dns" value.config
+      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
+  );
+
+  nameserver = if cfg.server.primary then "ns1" else "ns2";
+
+in {
+
+  imports = [
+    ../applications/firewall.nix
+  ];
+
+  options = {
+    skynet_dns = {
+      server = {
+        enable = lib.mkEnableOption {
+          default = false;
+          description = "Skynet DNS server";
+          type = lib.types.bool;
+        };
+
+        primary = lib.mkOption {
+          type = lib.types.bool;
+          default = false;
+        };
+
+        ip = lib.mkOption {
+          type = lib.types.str;
+          description = ''
+            ip of this server
+          '';
+        };
+      };
+
+      records = lib.mkOption {
+        description = "Records, sorted based on therir type";
+        type = with lib.types; listOf (submodule {
+          options = {
+            record = lib.mkOption {
+              type = str;
+            };
+            r_type = lib.mkOption {
+              type = enum ["A" "CNAME" "TXT" "PTR" "SRV"];
+            };
+            value = lib.mkOption {
+              type = str;
+            };
+            server = lib.mkOption {
+              description = "Core record for a server";
+              type = bool;
+              default = false;
+            };
+          };
+        });
+      };
+
+    };
+  };
+
+  config = lib.mkIf cfg.server.enable {
+
+    # open the firewall for this
+    skynet_firewall.forward = [
+      "ip daddr ${cfg.server.ip} tcp dport 53 counter packets 0 bytes 0 accept"
+      "ip daddr ${cfg.server.ip} udp dport 53 counter packets 0 bytes 0 accept"
+    ];
+
+    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 );
+
+    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;
+      owner = "named";
+      group = "named";
+    };
+
+    networking.firewall = {
+      allowedTCPPorts = [53];
+      allowedUDPPorts = [53];
+    };
+
+    services.bind = {
+      enable = true;
+
+      ipv4Only = true;
+
+      # need to take a look at https://nixos.org/manual/nixos/unstable/#module-security-acme-config-dns
+      extraConfig = ''
+        include "/run/agenix/dns_dnskeys";
+      '';
+
+      # piles of no valid RRSIG resolving 'com/DS/IN' errors
+      extraOptions = ''
+        dnssec-validation yes;
+      '';
+
+      # set the upstream dns servers
+      # overrides the default dns servers
+      forwarders = [
+        # Cloudflare
+        "1.1.1.1"
+        # Google
+        "8.8.8.8"
+        # Quad9
+        "9.9.9.9"
+      ];
+
+      cacheNetworks  = [
+        # this server itself
+        "127.0.0.0/24"
+        # all of skynet can use this as a resolver
+        /*
+        Origianl idea, however all external traffic had the ip of the router
+        "193.1.99.64/26"
+
+        So to fix this we need to allow smaller ranges? - Didnt work
+        Fallback is explisitly listing each ip we have
+
+        Now have a function for it
+        */
+     ] ++ create_cache_networks;
+    };
+
+    # creates a folder in /etc for the dns to use
+    users.users.named = {
+      createHome = true;
+      home = "/etc/skynet/dns";
+    };
+
+  };
+}

applications/dns/dns.nix

@@ -1,429 +0,0 @@
-{
-  lib,
-  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"
-  ];
-
-  # 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");
-
-  # 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;
-    r_type = "PTR";
-    value = record.value;
-  };
-  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");
-
-  # 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;
-
-  # 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
-  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: ''
-      $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
-         ${toString 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.
-
-      ; ------------------------------------------
-      ; Server Names (A Records)
-      ; ------------------------------------------
-      ${format_records (sort_records_a_server records)}
-
-      ; ------------------------------------------
-      ; A (non server names
-      ; ------------------------------------------
-      ${format_records (sort_records_a records)}
-
-      ; ------------------------------------------
-      ; CNAMES
-      ; ------------------------------------------
-      ${format_records (sort_records_cname records)}
-
-      ; ------------------------------------------
-      ; TXT
-      ; ------------------------------------------
-      ${format_records (filter_records_type records "TXT")}
-
-      ; ------------------------------------------
-      ; MX
-      ; ------------------------------------------
-      ${format_records (filter_records_type records "MX")}
-
-      ; ------------------------------------------
-      ; SRV
-      ; ------------------------------------------
-      ${format_records (sort_records_srv records)}
-    ''
-  );
-
-  # 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)
-  get_config_file_rev = (
-    domain: ''
-      $ORIGIN 64-64.99.1.193.in-addr.arpa.
-      $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
-         ${toString 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.
-
-      ; ------------------------------------------
-      ; PTR
-      ; ------------------------------------------
-      ${format_records (sort_records_ptr records)}
-    ''
-  );
-
-  # arrays  of teh two nameservers
-  nameserver_1 = ["193.1.99.109"];
-  nameserver_2 = ["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
-  );
-
-  secondaries = (
-    if cfg.server.primary
-    then
-      if builtins.elem cfg.server.ip nameserver_1
-      then nameserver_2
-      else nameserver_1
-    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;
-
-  # standard function to create the etc file, pass in the text and domain and it makes it
-  create_entry_etc_sub = domain: text: {
-    # Creates /etc/skynet/dns/domain
-    "skynet/dns/${domain}" = {
-      user = "named";
-      group = "named";
-
-      # The UNIX file mode bits
-      mode = "0664";
-
-      # content of the file
-      text = text;
-    };
-  };
-
-  # 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
-    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
-    else if type == "reverse"
-    then create_entry_etc_sub domain (get_config_file_rev 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 {
-    "${domain}" = {
-      extraConfig = ''
-        ${if_primary_and_owned}
-        // for bumping the config
-        // ${toString current_date}
-      '';
-      # really wish teh nixos config didnt use master/slave
-      master = cfg.server.primary;
-      masters = primaries;
-      slaves = secondaries;
-      # need to write this to a file
-      # using the date in it so it will trigger a restart
-      file = "/etc/skynet/dns/${domain}";
-      # no leading whitespace for first line
-    };
-  };
-
-  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
-      )
-      nodes
-    );
-
-  nameserver =
-    if cfg.server.primary
-    then "ns1"
-    else "ns2";
-in {
-  imports = [
-    ../../config/dns.nix
-  ];
-
-  options.services.skynet."${name}" = {
-    server = {
-      enable = lib.mkEnableOption {
-        default = false;
-        description = "Skynet DNS server";
-        type = lib.types.bool;
-      };
-
-      primary = lib.mkOption {
-        type = lib.types.bool;
-        default = false;
-      };
-
-      ip = lib.mkOption {
-        type = lib.types.str;
-        description = ''
-          ip of this server
-        '';
-      };
-    };
-
-    records = lib.mkOption {
-      description = "Records, sorted based on therir type";
-      type = lib.types.listOf (lib.types.submodule (import ./options-records.nix {
-        inherit lib;
-      }));
-    };
-  };
-
-  config = lib.mkIf cfg.server.enable {
-    # logging
-    services.prometheus.exporters.bind = {
-      enable = true;
-      openFirewall = true;
-    };
-
-    # services.skynet.backup.normal.backups = ["/etc/skynet/dns"];
-
-    # open the firewall for this
-    skynet_firewall.forward = [
-      "ip daddr ${cfg.server.ip} tcp dport 53 counter packets 0 bytes 0 accept"
-      "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 = 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")
-      ]
-    );
-
-    # secrets required
-    age.secrets.dns_dnskeys = {
-      file = ../../secrets/dns_dnskeys.conf.age;
-      owner = "named";
-      group = "named";
-    };
-
-    # basic but ensure teh dns ports are open
-    networking.firewall = {
-      allowedTCPPorts = [53];
-      allowedUDPPorts = [53];
-    };
-
-    services.bind = {
-      enable = true;
-
-      ipv4Only = true;
-
-      # need to take a look at https://nixos.org/manual/nixos/unstable/#module-security-acme-config-dns
-      extraConfig = ''
-        include "/run/agenix/dns_dnskeys";
-
-        statistics-channels {
-          inet 127.0.0.1 port 8053 allow { 127.0.0.1; };
-        };
-      '';
-
-      # piles of no valid RRSIG resolving 'com/DS/IN' errors
-      extraOptions = ''
-        dnssec-validation yes;
-      '';
-
-      # set the upstream dns servers
-      # overrides the default dns servers
-      forwarders = [
-        # Cloudflare
-        "1.1.1.1"
-        # Google
-        "8.8.8.8"
-        # Quad9
-        "9.9.9.9"
-      ];
-
-      cacheNetworks =
-        [
-          # this server itself
-          "127.0.0.0/24"
-
-          # skynet server in the dmz
-          "193.1.96.165/32"
-          # all of skynet can use this as a resolver
-          /*
-          Origianl idea, however all external traffic had the ip of the router
-          "193.1.99.64/26"
-
-          So to fix this we need to allow smaller ranges? - Didnt work
-          Fallback is explisitly listing each ip we have
-
-          Now have a function for it
-          */
-        ]
-        ++ create_cache_networks;
-    };
-
-    systemd.services.bind = {
-      # deletes teh journal files evey start so it no longer stalls out
-      preStart = ''
-        rm -vf /etc/skynet/dns/*.jnl
-        rm -vf /etc/skynet/dns/*.jbk
-      '';
-      restartTriggers = [
-        "${config.environment.etc."skynet/dns/skynet.ie".source}"
-      ];
-    };
-
-    # creates a folder in /etc for the dns to use
-    users.groups.named = {};
-
-    users.users.named = {
-      createHome = true;
-      home = "/etc/skynet/dns";
-      group = "named";
-      # X11 is to ensure the directory can be traversed
-      homeMode = "711";
-    };
-  };
-}

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;
-    };
-  };
-}

applications/email.nix

@@ -1,151 +1,39 @@
-{
+{ config, pkgs, lib, inputs, ...}: with lib;
-  config,
+  let
-  pkgs,
+    cfg = config.services.skynet_email;
-  lib,
-  inputs,
-  ...
-}:
-with lib; let
-  name = "email";
-  cfg = config.services.skynet."${name}";
 
     # create teh new strings
     create_filter_array = map (x: "(memberOf=cn=${x},ou=groups,${cfg.ldap.base})");
 
-  create_filter_join = x: concatStringsSep "" x;
+    create_filter_join = (x: concatStringsSep "" x);
 
     # thought you could escape racket?
-  create_filter = groups: create_filter_join (create_filter_array groups);
+    create_filter = (groups: create_filter_join (create_filter_array groups) );
 
-  # using +mailbox puts the mail in a seperate folder
-  create_skynet_email_int = accounts: mailbox: (map (account: "${account}@skynet.ie") accounts);
-  groups_to_accounts = groups: builtins.concatMap (x: config.skynet.users.${x}) groups;
-  create_skynet_email_attribute = mailbox: groups: (create_skynet_email_int (groups_to_accounts groups) mailbox) ++ ["int_${mailbox}@skynet.ie"];
-  create_skynet_email = mailbox: groups: {
-    name = "${mailbox}@skynet.ie";
-    value = create_skynet_email_attribute mailbox groups;
-  };
-  create_skynet_service_mailboxes = builtins.listToAttrs (map (mailbox: (create_skynet_email mailbox.account mailbox.members)) service_mailboxes);
-
-  create_config_to = concatStringsSep "\",\"" (map (mailbox: "${mailbox.account}") service_mailboxes);
-
-  service_mailboxes = [
-    {
-      account = "root";
-      members = ["admin"];
-    }
-    {
-      account = "abuse";
-      members = ["admin"];
-    }
-    {
-      account = "accounts";
-      members = ["committee"];
-    }
-    {
-      account = "compsoc";
-      members = ["committee"];
-    }
-    {
-      account = "contact";
-      members = ["committee"];
-    }
-    {
-      account = "dbadmin";
-      members = ["admin"];
-    }
-    {
-      account = "dnsadm";
-      members = ["admin"];
-    }
-    {
-      account = "hostmaster";
-      members = ["admin"];
-    }
-    {
-      account = "intersocsrep";
-      members = ["committee"];
-    }
-    {
-      account = "mailman";
-      members = ["admin"];
-    }
-    {
-      account = "security";
-      members = ["admin"];
-    }
-    {
-      account = "sysadm";
-      members = ["admin"];
-    }
-    {
-      account = "webadmin";
-      members = ["admin"];
-    }
-    {
-      account = "pycon2023";
-      members = ["committee"];
-    }
-    {
-      account = "skynet_topdesk";
-      members = ["admin" "trainee"];
-    }
-  ];
-
-  sieveConfigFile =
-    # https://doc.dovecot.org/configuration_manual/sieve/examples/#plus-addressed-mail-filtering
-    pkgs.writeText "basic_sieve"
-    ''
-      require "copy";
-      require "mailbox";
-      require "imap4flags";
-      require ["fileinto", "reject"];
-      require "variables";
-      require "regex";
-
-      # 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;
-          }
-        }
-      }
-      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 = [
-    inputs.simple-nixos-mailserver.nixosModule
 
-    # for teh config
+  imports = [
-    ../config/users.nix
+    ./dns.nix
+    ./acme.nix
+    ./nginx.nix
+    inputs.simple-nixos-mailserver.nixosModule
   ];
 
-  options.services.skynet."${name}" = {
+  options.services.skynet_email = {
     # options that need to be passed in to make this work
 
     enable = mkEnableOption "Skynet Email";
 
+    host = {
+      ip = mkOption {
+        type = types.str;
+      };
+
+      name = mkOption {
+        type = types.str;
+      };
+    };
+
     domain = mkOption {
       type = types.str;
       default = "skynet.ie";
@@ -197,195 +85,62 @@ in {
         default = "cn=admin,${cfg.ldap.base}";
         description = lib.mdDoc "where to find users";
       };
+
     };
   };
 
   config = mkIf cfg.enable {
-    services.skynet.backup.normal.backups = [
+    services.skynet_backup.normal.backups = [
-      #"/var/vmail"
+      "/var/vmail"
       "/var/dkim"
     ];
 
     age.secrets.ldap_pw.file = ../secrets/ldap/pw.age;
 
-    security.acme.certs = {
+    skynet_acme.domains = [
-      "mail" = {
+      "${cfg.sub}.${cfg.domain}"
-        domain = "mail.skynet.ie";
-        extraDomainNames = [
-          "imap.skynet.ie"
-          "pop3.skynet.ie"
-          "smtp.skynet.ie"
     ];
-      };
-
-      "imap" = {
-        domain = "imap.skynet.ie";
-        extraDomainNames = [
-          "mail.skynet.ie"
-          "pop3.skynet.ie"
-          "smtp.skynet.ie"
-        ];
-      };
-
-      "pop3" = {
-        domain = "pop3.skynet.ie";
-        extraDomainNames = [
-          "imap.skynet.ie"
-          "mail.skynet.ie"
-          "smtp.skynet.ie"
-        ];
-      };
-
-      "smtp" = {
-        domain = "smtp.skynet.ie";
-        extraDomainNames = [
-          "imap.skynet.ie"
-          "pop3.skynet.ie"
-          "mail.skynet.ie"
-        ];
-      };
-    };
-
-    # to provide the certs
-    services.nginx.virtualHosts = {
-      "mail.skynet.ie" = {
-        forceSSL = true;
-        useACMEHost = "mail";
-        # override the inbuilt nginx config
-        enableACME = false;
-        serverName = "mail.skynet.ie";
-      };
-
-      "imap.skynet.ie" = {
-        forceSSL = true;
-        useACMEHost = "imap";
-        # override the inbuilt nginx config
-        enableACME = false;
-        serverName = "imap.skynet.ie";
-      };
-
-      "pop3.skynet.ie" = {
-        forceSSL = true;
-        useACMEHost = "pop3";
-        # override the inbuilt nginx config
-        enableACME = false;
-        serverName = "pop3.skynet.ie";
-      };
-
-      "smtp.skynet.ie" = {
-        forceSSL = true;
-        useACMEHost = "smtp";
-        # override the inbuilt nginx config
-        enableACME = false;
-        serverName = "smtp.skynet.ie";
-      };
-    };
 
     # set up dns record for it
-    services.skynet.dns.records =
+    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}.";
-        }
-
       # basic one
-        {
+      {record="mail"; r_type="A"; value=cfg.host.ip;}
-          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 ""
+      # SPF record
+      {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"'';}
+      {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"; value=''"v=DMARC1; p=none"'';}
 
       # reverse pointer
-        {
+      {record=cfg.host.ip; r_type="PTR"; value="${cfg.sub}.${cfg.domain}.";}
-          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 = "_imaps._tcp";
+      {record="_imap._tcp";         r_type="SRV"; value="0 1 143 ${cfg.sub}.${cfg.domain}.";}
-          r_type = "SRV";
+      {record="_submissions._tcp";  r_type="SRV"; value="0 1 465 ${cfg.sub}.${cfg.domain}.";}
-          value = "0 1 993 ${cfg.sub}.${cfg.domain}.";
+      {record="_submission._tcp";   r_type="SRV"; value="0 1 587 ${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}.";
-        }
-      ]
-      # SPF record
-      ++ [
-        {
-          record = "${cfg.domain}.";
-          r_type = "TXT";
-          value = ''"v=spf1 a:${cfg.sub}.${cfg.domain} ip4:${config.services.skynet.host.ip} -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"'';
-        }
-      ]
-      # 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"'';
-        }
     ];
 
+    # to provide the certs
+    services.nginx.virtualHosts = {
+      "${cfg.sub}.${cfg.domain}" = {
+        forceSSL    = true;
+        useACMEHost = "skynet";
+        # override the inbuilt nginx config
+        enableACME = false;
+        serverName  = "${cfg.sub}.${cfg.domain}";
+      };
+    };
+
     #https://nixos-mailserver.readthedocs.io/en/latest/add-roundcube.html
     users.groups.nginx = {};
     users.groups.roundcube = {};
@@ -421,9 +176,6 @@ in {
       '';
     };
 
-    # for https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/issues/275
-    services.dovecot2.sieve.extensions = ["fileinto"];
-
     mailserver = {
       enable = true;
       fqdn = "${cfg.sub}.${cfg.domain}";
@@ -431,12 +183,6 @@ in {
         cfg.domain
       ];
 
-      enableManageSieve = true;
-
-      lmtpSaveToDetailMailbox = "yes";
-
-      extraVirtualAliases = create_skynet_service_mailboxes;
-
       # use the letsencrypt certs
       certificateScheme = "acme";
 
@@ -469,48 +215,14 @@ in {
           uidAttribute = "skMail";
           mailAttribute = "skMail";
         };
+
       };
 
       # feckin spammers
       rejectRecipients = [
+
       ];
-    };
 
-    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")
-        ];
-      };
     };
 
     # tune the spam filter

applications/firewall.nix

@@ -1,9 +1,5 @@
-{
+{lib, pkgs, config, ...}: {
-  lib,
+
-  pkgs,
-  config,
-  ...
-}: {
   # using https://github.com/greaka/ops/blob/818be4c4dea9129abe0f086d738df4cb0bb38288/apps/restic/options.nix as a base
   options = {
     skynet_firewall = {
@@ -46,7 +42,9 @@
               A list of UDP ports for the machiene running the firewall
             '';
           };
+
         };
+
       };
     };
   };
@@ -58,7 +56,8 @@
 
     # fules for the firewall
     # beware of EOL conversion.
-    networking.nftables.ruleset = ''
+    networking.nftables.ruleset =
+      ''
       # using https://oxcrag.net/2021/12/25/build-your-own-router-with-nftables-part-1/ as a guide
 
       # Clear out any existing rules
@@ -166,5 +165,8 @@
         }
       }
       '';
+
   };
+
+
 }

applications/games.nix

@@ -0,0 +1,68 @@
+{ config, pkgs, lib, ... }:
+  with lib;
+  let
+    cfg = config.services.skynet_games;
+  in {
+  imports = [
+    ./dns.nix
+
+    ./games/minecraft.nix
+  ];
+
+
+  options.services.skynet_games = {
+      enable = mkEnableOption "Skynet Games";
+
+      host = {
+        ip = mkOption {
+          type = types.str;
+        };
+
+        name = mkOption {
+          type = types.str;
+        };
+      };
+
+      domain = {
+        tld = mkOption {
+          type = types.str;
+          default = "ie";
+        };
+
+        base = mkOption {
+          type = types.str;
+          default = "skynet";
+        };
+
+        sub = mkOption {
+          type = types.str;
+          default = "games";
+        };
+      };
+
+  };
+
+
+  config = mkIf cfg.enable {
+    skynet_dns.records = [
+      # need a base domain
+      {record=cfg.domain.sub; r_type="CNAME"; value=cfg.host.name;}
+    ];
+
+    # the minecraft servers
+    services.skynet_games_minecraft = {
+      enable = true;
+
+      host = {
+        ip = cfg.host.ip;
+        name = cfg.domain.sub;
+      };
+
+      domain = {
+        sub = "minecraft.${cfg.domain.sub}";
+      };
+    };
+
+
+  };
+}

applications/games/minecraft.nix

@@ -1,24 +1,33 @@
-{
+{ config, pkgs, lib, inputs, ... }:
-  config,
+  with lib;
-  pkgs,
+  let
-  lib,
+    cfg = config.services.skynet_games_minecraft;
-  inputs,
-  ...
-}:
-with lib; let
-  name = "games_minecraft";
-  cfg = config.services.skynet."${name}";
 
     # got tired of how long this is so I created a var for it.
     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
   ];
 
-  options.services.skynet."${name}" = {
+  options.services.skynet_games_minecraft = {
     enable = mkEnableOption "Skynet Games Minecraft";
 
+    host = {
+      ip = mkOption {
+        type = types.str;
+      };
+
+      name = mkOption {
+        type = types.str;
+      };
+    };
+
     domain = {
       tld = mkOption {
         type = types.str;
@@ -39,54 +48,27 @@ in {
 
   config = mkIf cfg.enable {
     skynet_firewall.forward = [
-      "ip daddr ${config.services.skynet.host.ip} tcp dport 80 counter packets 0 bytes 0 accept"
+      "ip daddr ${cfg.host.ip} tcp dport 80 counter packets 0 bytes 0 accept"
-      "ip daddr ${config.services.skynet.host.ip} tcp dport 443 counter packets 0 bytes 0 accept"
+      "ip daddr ${cfg.host.ip} tcp dport 443 counter packets 0 bytes 0 accept"
-      "ip daddr ${config.services.skynet.host.ip} tcp dport 25565 counter packets 0 bytes 0 accept"
+      "ip daddr ${cfg.host.ip} tcp dport 25565 counter packets 0 bytes 0 accept"
     ];
 
-    services.skynet.acme.domains = [
+    skynet_acme.domains = [
         "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}"
       "*.${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}"
     ];
 
-    services.skynet.dns.records = [
+    skynet_dns.records = [
       # the minecraft (web) config server
-      {
+      {record="config.${cfg.domain.sub}";  r_type="CNAME";  value=cfg.host.name;}
-        record = "config.${cfg.domain.sub}";
-        r_type = "CNAME";
-        value = config.services.skynet.host.name;
-      }
 
       # our own minecraft hosts
-      {
+      {record="compsoc_classic.${cfg.domain.sub}";  r_type="CNAME";  value=cfg.host.name;}
-        record = "compsoc_classic.${cfg.domain.sub}";
+      {record="compsoc.${cfg.domain.sub}";  r_type="CNAME";  value=cfg.host.name;}
-        r_type = "CNAME";
-        value = config.services.skynet.host.name;
-      }
-      {
-        record = "compsoc.${cfg.domain.sub}";
-        r_type = "CNAME";
-        value = config.services.skynet.host.name;
-      }
 
       # gsoc servers
-      {
+      {record="gsoc.${cfg.domain.sub}";  r_type="CNAME";  value=cfg.host.name;}
-        record = "gsoc.${cfg.domain.sub}";
+      {record="gsoc_abridged.${cfg.domain.sub}";  r_type="CNAME";  value=cfg.host.name;}
-        r_type = "CNAME";
-        value = config.services.skynet.host.name;
-      }
-      {
-        record = "gsoc_abridged.${cfg.domain.sub}";
-        r_type = "CNAME";
-        value = config.services.skynet.host.name;
-      }
-
-      # phildeb
-      {
-        record = "phildeb.${cfg.domain.sub}";
-        r_type = "CNAME";
-        value = config.services.skynet.host.name;
-      }
     ];
 
     networking.firewall.allowedTCPPorts = [
@@ -95,6 +77,7 @@ in {
     ];
 
     services.nginx.virtualHosts = {
+
       # https://config.minecraft.games.skynet.ie
       "config.${short_domain}" = {
         forceSSL = true;
@@ -111,6 +94,7 @@ in {
         useACMEHost = "skynet";
         locations."/map/".alias = "/etc/games/minecraft/craftycontrol/servers/f4c5eb33-c6d6-421c-81ab-ded31f6e8750/plugins/dynmap/web/";
       };
+
     };
 
     # arion is one way to use docker on nixos
@@ -119,13 +103,14 @@ in {
     virtualisation.arion = {
       backend = "docker";
       projects = {
+
         minecraft.settings.services = {
           mc_proxy.service = {
             image = "itzg/mc-router:1.18.0";
             ports = [ "25565:25565/tcp" ];
             expose = [ "25565" ];
             command = [
-              "--mapping=compsoc_classic.${short_domain}=mc_config:20000,compsoc.${short_domain}=mc_config:20001,gsoc.${short_domain}=mc_config:20002,gsoc.${short_domain}=mc_config:20002,gsoc_abridged.${short_domain}=mc_config:20003,phildeb.${short_domain}=mc_config:20004"
+              "--mapping=compsoc_classic.${short_domain}=mc_config:20000,compsoc.${short_domain}=mc_config:20001,gsoc.${short_domain}=mc_config:20002,gsoc.${short_domain}=mc_config:20002,gsoc_abridged.${short_domain}=mc_config:20003"
             ];
           };
 
@@ -153,9 +138,6 @@ in {
               "20001:20001/tcp"
               # games
               "20002:20002/tcp"
-              "20003:20003/tcp"
-              # phildeb
-              "20004:20004/tcp"
             ];
           };
         };

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;
-    };
-  };
-}

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
-        ];
-      };
-    };
-  };
-}

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
-

applications/gitlab.nix

@@ -1,22 +1,28 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
+  with lib;
-  pkgs,
+  let
-  lib,
+    cfg = config.services.skynet_gitlab;
-  ...
-}:
-with lib; let
-  name = "gitlab";
-  cfg = config.services.skynet."${name}";
-
-  domain_base = "${cfg.domain.base}.${cfg.domain.tld}";
-  domain_full = "${cfg.domain.sub}.${domain_base}";
   in {
   imports = [
+    ./acme.nix
+    ./dns.nix
+    ./firewall.nix
+    ./nginx.nix
   ];
 
-  options.services.skynet."${name}" = {
+  options.services.skynet_gitlab = {
     enable = mkEnableOption "Skynet Gitlab";
 
+    host = {
+      ip = mkOption {
+        type = types.str;
+      };
+
+      name = mkOption {
+        type = types.str;
+      };
+    };
+
     domain = {
       tld = mkOption {
         type = types.str;
@@ -30,7 +36,7 @@ in {
 
       sub = mkOption {
         type = types.str;
-        default = name;
+        default = "gitlab";
       };
     };
 
@@ -46,7 +52,9 @@ in {
         default = "dc=skynet,dc=ie";
         description = lib.mdDoc "The base address in the ldap server";
       };
+
     };
+
   };
 
   config = mkIf cfg.enable {
@@ -56,77 +64,47 @@ 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;
     };
 
-    services.skynet.acme.domains = [
+    skynet_acme.domains = [
       "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}"
       # Lets Encrypt seems to have a 4 levels limit for certs
                 "*.pages.${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 = [
+    skynet_dns.records = [
-      {
+      {record=cfg.domain.sub; r_type="CNAME"; value=cfg.host.name;}
-        record = cfg.domain.sub;
-        r_type = "A";
-        value = config.services.skynet.host.ip;
-      }
       # for gitlab pages
-      {
+      {record="*.pages.${cfg.domain.base}.${cfg.domain.tld}."; r_type="A"; value=cfg.host.ip;}
-        record = "*.pages.${cfg.domain.base}.${cfg.domain.tld}.";
-        r_type = "A";
-        value = config.services.skynet.host.ip;
-      }
-
-      # for email
-      {
-        record = "${cfg.domain.sub}";
-        r_type = "MX";
-        value = ''10 ${domain_full}.'';
-      }
-      {
-        record = config.services.skynet.host.ip;
-        r_type = "PTR";
-        value = "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}.";
-      }
-      {
-        record = "${domain_full}.";
-        r_type = "TXT";
-        value = ''"v=spf1 a:gitlab.skynet.ie -all"'';
-      }
-      {
-        record = "_dmarc.${domain_full}.";
-        r_type = "TXT";
-        value = ''"v=DMARC1; p=none"'';
-      }
     ];
 
     networking.firewall.allowedTCPPorts = [
@@ -141,12 +119,7 @@ in {
       "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}" = {
         forceSSL = true;
         useACMEHost = "skynet";
-        locations."/" = {
+        locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket";
-          proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket";
-          extraConfig = ''
-            client_max_body_size 1000M;
-          '';
-        };
       };
 
       # pages
@@ -157,13 +130,6 @@ in {
       };
     };
 
-    # set a valid HELO address
-    services.postfix = {
-      hostname = lib.mkForce domain_full;
-      origin = lib.mkForce domain_full;
-      domain = lib.mkForce domain_base;
-    };
-
     services.gitlab = {
       enable = true;
 
@@ -197,11 +163,13 @@ in {
           auth-server = "https://gitlab.example.com";
           */
         };
+
       };
-
+      #smtp = {
-      # use the local email client
+      #  enable = true;
-      smtp.enable = true;
+      #  address = "localhost";
-
+      #  port = 25;
+      #};
       secrets = {
         dbFile = config.age.secrets.gitlab_secrets_db.path;
         secretFile = config.age.secrets.gitlab_secrets_secret.path;
@@ -244,7 +212,7 @@ in {
           # default for pages is set to 8090 but that leaves an "ugly" port in the url,
           # override it here to make it look good
           port = 80;
-          #external_http = ["${config.services.skynet.host.ip}:80"];
+          #external_http = ["${cfg.host.ip}:80"];
         };
       };
     };

applications/gitlab_runner.nix

@@ -0,0 +1,117 @@
+{ config, pkgs, lib, ... }:
+  with lib;
+  let
+    cfg = config.services.skynet_gitlab_runner;
+  in {
+  imports = [
+
+  ];
+
+  options.services.skynet_gitlab_runner = {
+    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:latest";
+          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
+
+    # 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;
+        };
+      };
+    };
+  };
+}

applications/grafana.nix

@@ -1,79 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}:
-with lib; let
-  name = "grafana";
-  cfg = config.services.skynet."${name}";
-  port = 4444;
-in {
-  imports = [
-  ];
-
-  options.services.skynet."${name}" = {
-    enable = mkEnableOption "Grafana Server";
-
-    datasource = {
-      name = mkOption {
-        type = types.str;
-      };
-
-      url = mkOption {
-        type = types.str;
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    services.skynet.dns.records = [
-      {
-        record = "${name}";
-        r_type = "CNAME";
-        value = config.services.skynet.host.name;
-      }
-    ];
-
-    services.skynet.acme.domains = [
-      "${name}.skynet.ie"
-    ];
-
-    age.secrets.grafana_pw = {
-      file = ../secrets/grafana/pw.age;
-      owner = "grafana";
-      group = "grafana";
-    };
-
-    services.grafana = {
-      enable = true;
-      domain = "${name}.skynet.ie";
-      port = port;
-
-      settings.security.admin_password = "$__file{${config.age.secrets.grafana_pw.path}}";
-
-      provision = {
-        enable = true;
-        datasources.settings.datasources = [
-          {
-            name = "Prometheus";
-            type = "prometheus";
-            url = "http://localhost:${toString config.services.skynet.prometheus.server.port}";
-            isDefault = true;
-            editable = true;
-          }
-        ];
-      };
-    };
-
-    services.nginx.virtualHosts = {
-      "${name}.skynet.ie" = {
-        forceSSL = true;
-        useACMEHost = "skynet";
-        locations."/" = {
-          proxyPass = "http://localhost:${toString port}";
-          proxyWebsockets = true;
-        };
-      };
-    };
-  };
-}

applications/ldap/backend.nix

@@ -1,23 +1,30 @@
-{
+{ config, pkgs, lib, inputs,  ... }:
-  config,
+  with lib;
-  pkgs,
+  let
-  lib,
+    cfg = config.services.ldap_backend;
-  inputs,
-  ...
-}:
-with lib; let
-  name = "ldap_backend";
-  cfg = config.services.skynet."${name}";
     port_backend = "8087";
   in {
+
   imports = [
+    ../acme.nix
+    ../dns.nix
+    ../nginx.nix
     inputs.skynet_ldap_backend.nixosModule."x86_64-linux"
-    ../../config/users.nix
   ];
 
-  options.services.skynet."${name}" = {
+  options.services.ldap_backend = {
     enable = mkEnableOption "Skynet LDAP backend server";
 
+    host = {
+      ip = mkOption {
+        type = types.str;
+      };
+
+      name = mkOption {
+        type = types.str;
+      };
+    };
+
     domain = {
       tld = mkOption {
         type = types.str;
@@ -37,43 +44,65 @@ in {
   };
 
   config = mkIf cfg.enable {
+
     #backups = [ "/etc/silver_ul_ical/database.db" ];
 
-    age.secrets.ldap_details.file = ../../secrets/ldap/details.age;
+    age.secrets.ldap_self_service.file = ../../secrets/ldap/self_service.age;
-    age.secrets.ldap_mail.file = ../../secrets/email/details.age;
+    age.secrets.ldap_discord.file = ../../secrets/discord/ldap.age;
-    age.secrets.ldap_wolves.file = ../../secrets/wolves/details.age;
 
-    services.skynet.acme.domains = [
+    skynet_acme.domains = [
       "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}"
     ];
 
-    services.skynet.dns.records = [
+    skynet_dns.records = [
-      {
+      {record=cfg.domain.sub; r_type="CNAME"; value=cfg.host.name;}
-        record = cfg.domain.sub;
-        r_type = "CNAME";
-        value = config.services.skynet.host.name;
-      }
     ];
 
     services.nginx.virtualHosts."${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}" = {
       forceSSL = true;
       useACMEHost = "skynet";
       locations."/".proxyPass = "http://localhost:${port_backend}";
+
+#      extraConfig = ''
+#        add_header Access-Control-Allow-Origin "https://account.${cfg.domain.base}.${cfg.domain.tld}";
+#      '';
+      extraConfig = ''
+        add_header Access-Control-Allow-Origin "*";
+      '';
     };
 
-    # this got imported
     services.skynet_ldap_backend = {
       enable = true;
 
       # contains teh password in env form
       env = {
-        ldap = config.age.secrets.ldap_details.path;
+        ldap = config.age.secrets.ldap_self_service.path;
-        mail = config.age.secrets.ldap_mail.path;
+        discord = config.age.secrets.ldap_discord.path;
-        wolves = config.age.secrets.ldap_wolves.path;
+      };
+
+      ldap  = {
+        host = "ldaps://account.skynet.ie";
+        admin = "uid=ldap_api,ou=users,dc=skynet,dc=ie";
+      };
+
+      users = {
+        admin = [
+          "silver"
+          "evanc"
+          "eoghanconlon73"
+        ];
+        committee = [
+          "grym"
+          "dawidk5"
+          "leo"
+          "silver"
+          "eoghanconlon73"
+        ];
+        lifetime = [];
+        banned = [];
       };
 
       host_port = "127.0.0.1:${port_backend}";
-      users = config.skynet.users;
     };
   };
 }

applications/ldap/client.nix

@@ -1,36 +1,28 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
+  with lib;
-  pkgs,
+  let
-  lib,
+    cfg = config.services.skynet_ldap_client;
-  ...
-}:
-with lib; let
-  name = "ldap_client";
-  cfg = config.services.skynet."${name}";
 
     # always ensure the admin group has access
-  create_filter_check_admin = x:
+    create_filter_check_admin = (x: if !(builtins.elem "skynet-admins" x) then x ++ ["skynet-admins"] else x);
-    if !(builtins.elem "skynet-admins" x)
-    then x ++ ["skynet-admins"]
-    else x;
 
     # create teh new strings
     create_filter_array = map (x: "(skMemberOf=cn=${x},ou=groups,${cfg.base})");
 
-  create_filter_join = x: concatStringsSep "" x;
+    create_filter_join = (x: concatStringsSep "" x);
 
     # thought you could escape racket?
-  create_filter = x: create_filter_join (create_filter_array (create_filter_check_admin x));
+    create_filter = (x: create_filter_join (create_filter_array (create_filter_check_admin x) ) );
 
-  sudo_create_filter = x: (concatStringsSep ", " (map (x: "cn=${x},ou=groups,${cfg.base}") x));
   in {
+
   # these are needed for teh program in question
   imports = [];
 
   # give users access to this server
-  #services.skynet.ldap_client.groups = ["skynet-users-linux"];
+  #services.skynet_ldap_client.groups = ["skynet-users-linux"];
 
-  options.services.skynet."${name}" = {
+  options.services.skynet_ldap_client = {
     # options that need to be passed in to make this work
 
     enable = mkEnableOption "Skynet LDAP client";
@@ -54,13 +46,7 @@ in {
       ];
       description = lib.mdDoc "Groups we want to allow access to the server";
     };
-    sudo_groups = mkOption {
+
-      type = types.listOf types.str;
-      default = [
-        "skynet-admins-linux"
-      ];
-      description = lib.mdDoc "Groups we want to allow access to the server";
-    };
   };
 
   config = mkIf cfg.enable {
@@ -68,17 +54,10 @@ in {
 
     security.sudo.extraRules = [
       # admin group has sudo access
-      {
+      { groups = [ "skynet-admins-linux" ]; commands = [ { command = "ALL"; options = [ "NOPASSWD" ]; } ]; }
-        groups = cfg.sudo_groups;
-        commands = [
-          {
-            command = "ALL";
-            options = ["NOPASSWD"];
-          }
-        ];
-      }
     ];
 
+
     # give users a home dir
     security.pam.services.sshd.makeHomeDir = true;
 
@@ -109,8 +88,7 @@ in {
 # thank ye https://medium.com/techish-cloud/linux-user-ssh-authentication-with-sssd-ldap-without-joining-domain-9151396d967d
 ldap_user_search_base = ou=users,${cfg.base}?sub?(|${create_filter cfg.groups})
 ldap_group_search_base = ou=groups,${cfg.base}
-        # using commas from https://support.hpe.com/hpesc/public/docDisplay?docId=c02793175&docLocale=en_US
+ldap_sudo_search_base = cn=skynet-admins-linux,ou=groups,${cfg.base}
-        ldap_sudo_search_base, ${sudo_create_filter cfg.sudo_groups}
 
 ldap_group_nesting_level = 5
 
@@ -134,5 +112,6 @@ in {
 [autofs]
       '';
     };
+
   };
 }

applications/ldap/server.nix

@@ -1,27 +1,37 @@
 /*
 Gonna use a priper nixos module for this
 */
-{
+
-  config,
+{ config, pkgs, lib, inputs, ... }:
-  pkgs,
+  with lib;
-  lib,
+  let
-  inputs,
+    cfg = config.services.skynet_ldap;
-  ...
-}:
-with lib; let
-  name = "ldap";
-  cfg = config.services.skynet."${name}";
-  domain = "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}";
   in {
+
   # these are needed for teh program in question
   imports = [
+    ../acme.nix
+    ../dns.nix
+    ../nginx.nix
+    ./backend.nix
   ];
 
-  options.services.skynet."${name}" = {
+
+  options.services.skynet_ldap = {
     # options that need to be passed in to make this work
 
     enable = mkEnableOption "Skynet LDAP service";
 
+    host = {
+      ip = mkOption {
+        type = types.str;
+      };
+
+      name = mkOption {
+        type = types.str;
+      };
+    };
+
     domain = {
       tld = mkOption {
         type = types.str;
@@ -51,6 +61,14 @@ in {
   };
 
   config = mkIf cfg.enable {
+
+    # passthrough to the backend
+    services.ldap_backend = {
+      enable = true;
+      host.ip = cfg.host.ip;
+      host.name = cfg.host.name;
+    };
+
     # after changing teh password openldap.service has to be restarted
     age.secrets.ldap_pw = {
       file = ../../secrets/ldap/pw.age;
@@ -59,16 +77,12 @@ in {
       group = "openldap";
     };
 
-    services.skynet.acme.domains = [
+    skynet_acme.domains = [
-      domain
+      "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}"
     ];
 
-    services.skynet.dns.records = [
+    skynet_dns.records = [
-      {
+      {record=cfg.domain.sub; r_type="CNAME"; value=cfg.host.name;}
-        record = cfg.domain.sub;
-        r_type = "CNAME";
-        value = config.services.skynet.host.name;
-      }
     ];
 
     # firewall on teh computer itself
@@ -78,7 +92,7 @@ in {
     ];
 
     services.nginx.virtualHosts = {
-      ${domain} = {
+      "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}" = {
         forceSSL = true;
         useACMEHost = "skynet";
         locations."/" = {
@@ -108,18 +122,14 @@ in {
 
       enable = true;
 
-      /*
+      /* enable plain and secure connections */
-      enable plain and secure connections
-      */
       urlList = [ "ldap:///" "ldaps:///" ];
 
       settings = {
         attrs = {
           olcLogLevel = "conns config";
 
-          /*
+          /* settings for acme ssl */
-          settings for acme ssl
-          */
           olcTLSCACertificateFile = "/var/lib/acme/${cfg.domain.base}/full.pem";
           olcTLSCertificateFile = "/var/lib/acme/${cfg.domain.base}/cert.pem";
           olcTLSCertificateKeyFile = "/var/lib/acme/${cfg.domain.base}/key.pem";
@@ -144,6 +154,7 @@ in {
             ./skMemberOf.ldif
           ];
 
+
           "cn=modules".attrs = {
             objectClass = [ "olcModuleList" ];
             cn =  "modules";
@@ -165,40 +176,32 @@ in {
 
               olcSuffix = cfg.base;
 
-              /*
+              /* your admin account, do not use writeText on a production system */
-              your admin account, do not use writeText on a production system
-              */
               olcRootDN = "cn=admin,${cfg.base}";
               olcRootPW.path = config.age.secrets.ldap_pw.path;
 
+              #olcOverlay =  "memberof";
+
               olcAccess = [
-                /*
+                /* custom access rules for userPassword attributes */
-                custom access rules for userPassword attributes
+                ''{0}to attrs=userPassword
-                */
-                ''
-                  {0}to attrs=userPassword
                     by dn.exact="uid=ldap_api,ou=users,dc=skynet,dc=ie" manage
                     by self write
                     by anonymous auth
-                    by * none
+                    by * none''
-                ''
 
-                ''
+                ''{1}to attrs=mail,sshPublicKey,cn,sn,skDiscord
-                  {1}to attrs=mail,sshPublicKey,cn,sn
                     by dn.exact="uid=ldap_api,ou=users,dc=skynet,dc=ie" manage
                     by self write
-                    by * read
+                    by * read''
-                ''
 
-                /*
+                /* allow read on anything else */
-                allow read on anything else
+                ''{2}to *
-                */
-                ''
-                  {2}to *
                     by dn.exact="uid=ldap_api,ou=users,dc=skynet,dc=ie" manage
-                    by * read
+                    by * read''
-                ''
               ];
+
+
             };
 
             # https://blog.oddbit.com/post/2013-07-22-generating-a-membero/
@@ -220,7 +223,10 @@ in {
                 olcMemberOfMemberOfAD = "memberOf";
               };
             };
+
+
           };
+
         };
       };
     };

applications/ldap/skMemberOf.ldif

@@ -24,12 +24,24 @@ olcAttributeTypes: ( 1.3.6.1.4.1.24441.1.4.1
     EQUALITY caseIgnoreMatch
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   )
+olcAttributeTypes: ( 1.3.6.1.4.1.24441.1.5.1
+    NAME 'skDiscord'
+    DESC 'Discord username'
+    EQUALITY caseIgnoreMatch
+    SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
 olcAttributeTypes: ( 1.3.6.1.4.1.24441.1.6.1
     NAME 'skCreated'
     DESC 'When the account was created'
     EQUALITY caseIgnoreMatch
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   )
+#olcAttributeTypes: ( 1.3.6.1.4.1.24441.1.7.1
+#    NAME 'skEnabled'
+#    DESC 'TRUE/FALSE'
+#    EQUALITY booleanMatch
+#    SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+#  )
 # https://github.com/variablenix/ldap-mail-schema/blob/master/quota.schema
 olcAttributeTypes: ( 1.3.6.1.4.1.24441.1.8.1
     NAME 'quotaEmail'
@@ -43,10 +55,16 @@ olcAttributeTypes: ( 1.3.6.1.4.1.24441.1.9.1
     EQUALITY caseIgnoreIA5Match
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{255}
   )
+olcAttributeTypes: ( 1.3.6.1.4.1.24441.1.10.1
+    NAME 'skSecure'
+    DESC '1 if secure'
+    EQUALITY caseIgnoreMatch
+    SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
 olcObjectClasses: ( 1.3.6.1.4.1.24441.1.1.1
     NAME 'skPerson'
     DESC 'skynet person'
     SUP top AUXILIARY
     MUST ( skMail $ skCreated )
-    MAY ( skMemberOf $ skID $ quotaEmail $ quotaDisk )
+    MAY ( skMemberOf $ skID $ skDiscord $ quotaEmail $ quotaDisk $ skSecure )
   )

applications/nextcloud.nix

@@ -1,135 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  name = "nextcloud";
-  cfg = config.services.skynet."${name}";
-  domain = "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}";
-in {
-  imports = [
-  ];
-
-  options.services.skynet."${name}" = {
-    enable = mkEnableOption "Skynet Nextcloud";
-
-    domain = {
-      tld = mkOption {
-        type = types.str;
-        default = "ie";
-      };
-
-      base = mkOption {
-        type = types.str;
-        default = "skynet";
-      };
-
-      sub = mkOption {
-        type = types.str;
-        default = name;
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    # shove the entire config file into secrets
-
-    age.secrets.nextcloud_admin_pass = {
-      file = ../secrets/nextcloud/pw.age;
-      owner = "nextcloud";
-      group = "nextcloud";
-    };
-
-    services.skynet.acme.domains = [
-      domain
-      "onlyoffice.${domain}"
-      "whiteboard.${domain}"
-    ];
-
-    services.skynet.dns.records = [
-      {
-        record = cfg.domain.sub;
-        r_type = "CNAME";
-        value = config.services.skynet.host.name;
-      }
-      {
-        record = "onlyoffice.${cfg.domain.sub}";
-        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;
-      hostName = domain;
-      https = true;
-
-      configureRedis = true;
-
-      database.createLocally = true;
-      config = {
-        dbtype = "pgsql";
-        adminpassFile = config.age.secrets.nextcloud_admin_pass.path;
-      };
-
-      appstoreEnable = true;
-
-      extraApps = {
-        inherit (config.services.nextcloud.package.packages.apps) richdocuments;
-      };
-
-      settings = {
-        trusted_proxies = ["193.1.99.65"];
-        default_phone_region = "IE";
-        mail_smtpmode = "sendmail";
-        mail_sendmailmode = "pipe";
-      };
-    };
-
-    #    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.nginx.virtualHosts = {
-      ${domain} = {
-        forceSSL = true;
-        useACMEHost = "skynet";
-      };
-      "onlyoffice.${domain}" = {
-        forceSSL = true;
-        useACMEHost = "skynet";
-        locations."/".proxyPass = "http://127.0.0.1:8000";
-      };
-      #      "whiteboard.${domain}" = {
-      #        forceSSL = true;
-      #        useACMEHost = "skynet";
-      #        locations."/" = {
-      #          proxyPass = "http://localhost:3002";
-      #          proxyWebsockets = true;
-      #        };
-      #      };
-    };
-  };
-}

applications/nginx.nix

@@ -1,4 +1,5 @@
 # using K900's one https://gitlab.com/K900/nix/-/blob/a69502b8bf39fd99a85342b2f7989fe5896a6ae0/applications/base/nginx.nix
+
 {pkgs, ...}: {
   services.nginx = {
     enable = true;
@@ -9,6 +10,8 @@
     recommendedGzipSettings = true;
     recommendedProxySettings = true;
 
+    statusPage = true;
+
     # give Nginx access to our certs
     group = "acme";
   };

applications/nix_cache/nix_cache.nix

@@ -1,98 +0,0 @@
-/*
-A nix cache for our use
-
-
-atticd-atticadm make-token --sub "admin_username" --validity "10y" --pull "*" --push "*" --create-cache "*" --delete "*" --configure-cache "*" --configure-cache-retention "*" --destroy-cache "*"
-
-# for the gitlab runner, done eyarly
-atticd-atticadm make-token --sub "wheatly-runner" --validity "1y" --pull "skynet-cache" --push "skynet-cache"
-
-
-Documentation:
-https://docs.attic.rs/introduction.html
-*/
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-with lib; let
-  name = "nix-cache";
-  cfg = config.services.skynet."${name}";
-in {
-  imports = [
-  ];
-
-  options.services.skynet."${name}" = {
-    enable = mkEnableOption "Skynet Nix Cache";
-  };
-
-  config = mkIf cfg.enable {
-    services.skynet.acme.domains = [
-      "${name}.skynet.ie"
-    ];
-
-    services.skynet.dns.records = [
-      {
-        record = "${name}";
-        r_type = "CNAME";
-        value = config.services.skynet.host.name;
-      }
-    ];
-
-    users.groups."nix-serve" = {};
-    users.users."nix-serve" = {
-      isSystemUser = true;
-      group = "nix-serve";
-    };
-
-    services.atticd = {
-      enable = true;
-
-      # Replace with absolute path to your credentials file
-      environmentFile = "/etc/atticd.env";
-
-      settings = {
-        listen = "127.0.0.1:8080";
-
-        # Data chunking
-        #
-        # Warning: If you change any of the values here, it will be
-        # difficult to reuse existing chunks for newly-uploaded NARs
-        # since the cutpoints will be different. As a result, the
-        # deduplication ratio will suffer for a while after the change.
-        chunking = {
-          # The minimum NAR size to trigger chunking
-          #
-          # If 0, chunking is disabled entirely for newly-uploaded NARs.
-          # If 1, all NARs are chunked.
-          nar-size-threshold = 64 * 1024; # 64 KiB
-
-          # The preferred minimum size of a chunk, in bytes
-          min-size = 16 * 1024; # 16 KiB
-
-          # The preferred average size of a chunk, in bytes
-          avg-size = 64 * 1024; # 64 KiB
-
-          # The preferred maximum size of a chunk, in bytes
-          max-size = 256 * 1024; # 256 KiB
-        };
-      };
-    };
-
-    networking.firewall.allowedTCPPorts = [80 443];
-    services.nginx = {
-      clientMaxBodySize = "500m";
-      virtualHosts = {
-        "${name}.skynet.ie" = {
-          forceSSL = true;
-          useACMEHost = "skynet";
-          locations."/" = {
-            proxyPass = "http://127.0.0.1:8080";
-          };
-        };
-      };
-    };
-  };
-}

applications/open_governance/README.md

@@ -1,17 +0,0 @@
-# Open Governance
-
-Started by DCU this is an initiative to make the running of (computer) societies more open and resilient.  
-The goal is to back these up in multiple locations.
-
-
-| Uni | Tag      | Repo                                                     | Notes |
-|-----|----------|----------------------------------------------------------|-------|
-| DCU | redbrick | https://github.com/redbrick/open-governance              |       |
-| UL  | skynet   | https://gitlab.skynet.ie/compsoc1/compsoc/open-goverance |       |
-|     |          |                                                          |       |
-
-
-## Keys
-We host our own keyserver: https://keyserver.skynet.ie  
-Use it in commands like so: 
-``gpg --keyserver hkp://keyserver.skynet.ie:80 --send-key KEY_ID``

applications/open_governance/keyserver.nix

@@ -1,62 +0,0 @@
-/*
-This file is for hosting teh open governance for other societies
-*/
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-with lib; let
-  name = "keyserver";
-  cfg = config.services.skynet."${name}";
-  port = 11371;
-in {
-  imports = [
-  ];
-
-  options.services.skynet."${name}" = {
-    enable = mkEnableOption "Skynet Public Keyserver";
-  };
-
-  config = mkIf cfg.enable {
-    services.skynet.acme.domains = [
-      "${name}.skynet.ie"
-    ];
-
-    services.skynet.dns.records = [
-      {
-        record = "${name}";
-        r_type = "CNAME";
-        value = config.services.skynet.host.name;
-      }
-    ];
-
-    services.hockeypuck = {
-      enable = true;
-      port = port;
-    };
-
-    # hockeypuck needs a database backend
-    services.postgresql = {
-      enable = true;
-      ensureDatabases = ["hockeypuck"];
-      ensureUsers = [
-        {
-          name = "hockeypuck";
-          ensureDBOwnership = true;
-        }
-      ];
-    };
-
-    services.nginx.virtualHosts = {
-      "${name}.skynet.ie" = {
-        forceSSL = true;
-        useACMEHost = "skynet";
-        locations."/" = {
-          proxyPass = "http://localhost:${toString port}";
-        };
-      };
-    };
-  };
-}

applications/open_governance/open_governance.nix

@@ -1,61 +0,0 @@
-/*
-This file is for hosting teh open governance for other societies
-*/
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-with lib; let
-  # - instead of _ for dns reasons
-  name = "open-governance";
-
-  cfg = config.services.skynet."${name}";
-  folder = "/var/skynet/${name}";
-in {
-  imports = [
-  ];
-
-  options.services.skynet."${name}" = {
-    enable = mkEnableOption "Skynet Open Governance";
-  };
-
-  config = {
-    services.skynet.acme.domains = [
-      "${name}.skynet.ie"
-    ];
-
-    services.skynet.dns.records = [
-      {
-        record = "${name}";
-        r_type = "CNAME";
-        value = config.services.skynet.host.name;
-      }
-    ];
-
-    # create a folder to store the archives
-    systemd.tmpfiles.rules = [
-      "d  ${folder}            0755 ${config.services.nginx.user} ${config.services.nginx.group}"
-      "L+ ${folder}/README.md  -    -    -     -   ${./README.md}"
-    ];
-
-    services.nginx.virtualHosts = {
-      "${name}.skynet.ie" = {
-        forceSSL = true;
-        useACMEHost = "skynet";
-        root = folder;
-        locations = {
-          "/".extraConfig = "autoindex on;";
-
-          # show md files as plain text
-          "~ \.md".extraConfig = ''
-            types {
-               text/plain md;
-            }
-          '';
-        };
-      };
-    };
-  };
-}

applications/prometheus.nix

@@ -1,95 +0,0 @@
-{
-  nodes,
-  lib,
-  config,
-  ...
-}:
-with lib; let
-  name = "prometheus";
-  cfg = config.services.skynet."${name}";
-
-  # dont have to worry about any external addresses for this
-  # create a list of either "ip@port" or ""
-  # the ""s then get filtered out by filter_empty
-  exporters = {
-    dns = (
-      lib.attrsets.mapAttrsToList (
-        key: value:
-          if value.config.services.skynet.dns.server.enable
-          then "${value.config.deployment.targetHost}:${toString value.config.services.prometheus.exporters.bind.port}"
-          else ""
-      )
-      nodes
-    );
-    node = lib.attrsets.mapAttrsToList (key: value: "${value.config.deployment.targetHost}:${toString value.config.services.prometheus.exporters.node.port}") nodes;
-  };
-
-  # clears any invalid entries
-  filter_empty = inputs: (builtins.filter (value: value != "") inputs);
-in {
-  imports = [];
-
-  options.services.skynet."${name}" = {
-    server = {
-      enable = mkEnableOption "Prometheus Server";
-
-      port = mkOption {
-        type = types.port;
-        default = 9001;
-      };
-    };
-
-    external = {
-      node = mkOption {
-        type = types.listOf types.str;
-        default = [];
-        description = ''
-          To add other nodes outside of nix, specify ip and port that server should listen to here
-        '';
-      };
-    };
-
-    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"];
-      };
-    }
-    (mkIf cfg.server.enable {
-      services.prometheus = {
-        enable = true;
-        port = cfg.server.port;
-        scrapeConfigs = [
-          {
-            job_name = "node_exporter";
-            static_configs = [
-              {
-                targets = filter_empty (exporters.node ++ cfg.external.node);
-              }
-            ];
-          }
-          {
-            job_name = "bind";
-            static_configs = [
-              {
-                targets = filter_empty exporters.dns;
-              }
-            ];
-          }
-        ];
-      };
-    })
-  ];
-}

applications/proxmox-lxc.nix

@@ -1,96 +0,0 @@
-/*
-Once https://github.com/NixOS/nixpkgs/pull/267764 is merged this can be removed
-*/
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-with lib; {
-  options.proxmoxLXC = {
-    enable = mkOption {
-      default = true;
-      type = types.bool;
-      description = lib.mdDoc "Whether to enable the Proxmox VE LXC module.";
-    };
-    privileged = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        Whether to enable privileged mounts
-      '';
-    };
-    manageNetwork = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        Whether to manage network interfaces through nix options
-        When false, systemd-networkd is enabled to accept network
-        configuration from proxmox.
-      '';
-    };
-    manageHostName = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        Whether to manage hostname through nix options
-        When false, the hostname is picked up from /etc/hostname
-        populated by proxmox.
-      '';
-    };
-  };
-
-  config = let
-    cfg = config.proxmoxLXC;
-  in
-    mkIf cfg.enable {
-      system.build.tarball = pkgs.callPackage ../../lib/make-system-tarball.nix {
-        storeContents = [
-          {
-            object = config.system.build.toplevel;
-            symlink = "none";
-          }
-        ];
-
-        contents = [
-          {
-            source = config.system.build.toplevel + "/init";
-            target = "/sbin/init";
-          }
-        ];
-
-        extraCommands = "mkdir -p root etc/systemd/network";
-      };
-
-      boot = {
-        isContainer = true;
-        loader.initScript.enable = true;
-      };
-
-      console.enable = true;
-
-      networking = mkIf (!cfg.manageNetwork) {
-        useDHCP = false;
-        useHostResolvConf = false;
-        useNetworkd = true;
-        # pick up hostname from /etc/hostname generated by proxmox
-        hostName = mkIf (!cfg.manageHostName) (mkForce "");
-      };
-
-      services.openssh = {
-        enable = mkDefault true;
-        startWhenNeeded = mkDefault true;
-      };
-
-      systemd = {
-        mounts = mkIf (!cfg.privileged) [
-          {
-            enable = false;
-            where = "/sys/kernel/debug";
-          }
-        ];
-        services."getty@".unitConfig.ConditionPathExists = ["" "/dev/%I"];
-      };
-    };
-}

applications/restic.nix

@@ -1,16 +1,9 @@
-# nodes is all the nodes
-{
-  lib,
-  config,
-  nodes,
-  pkgs,
-  ...
-}:
-with lib; let
-  name = "backup";
-  cfg = config.services.skynet."${name}";
 
-  enable_client = cfg.normal.backups != null && cfg.normal.backups != [];
+# nodes is all the nodes
+{ lib, config, nodes, pkgs, ...}: with lib;
+  let
+    cfg = config.services.skynet_backup;
+
 
     # since they should all have the same config we can do this
     base = {
@@ -36,26 +29,21 @@ with lib; let
     # then if the server is enabled,
     # then pull relevant dtails
     ownServers = builtins.listToAttrs (builtins.concatLists (
-    lib.attrsets.mapAttrsToList (
+      lib.attrsets.mapAttrsToList (key: value:
-      key: value: let
+        let
-        backup = value.config.services.skynet.backup;
+          backup = value.config.services.skynet_backup;
-        backup_host = value.config.services.skynet.host;
         in
-        if
+        if (
-          (
+          (builtins.hasAttr "skynet_backup" value.config.services)
-            (builtins.hasAttr "backup" value.config.services.skynet)
           && backup.server.enable
-            # chgeck that its not itself
+          && backup.host.name != cfg.host.name
-            && backup_host.name != config.services.skynet.host.name
           && !backup.server.appendOnly
         )
         then [
           {
-            name = backup_host.name;
+            name = backup.host.name;
-            value =
+            value = base // {
-              base
+              repositoryFile = "/etc/skynet/restic/${backup.host.name}";
-              // {
-                repositoryFile = "/etc/skynet/restic/${backup_host.name}";
 
               backupPrepareCommand = ''
                 #!${pkgs.stdenv.shell}
@@ -66,30 +54,36 @@ with lib; let
                 mkdir -p $baseDir
                 cd $baseDir
 
-                  echo -n "rest:http://root:password@${backup_host.ip}:${toString backup.server.port}/root/${config.services.skynet.host.name}" > ${backup_host.name}
+                echo -n "rest:http://root:password@${backup.host.ip}:${toString backup.server.port}/root/${cfg.host.name}" > ${backup.host.name}
 
                 # read in teh password
                 #PW = `cat ${config.age.secrets.restic.path}`
                 line=$(head -n 1 ${config.age.secrets.restic.path})
 
-                  sed -i "s/password/$line/g" ${backup_host.name}
+                sed -i "s/password/$line/g" ${backup.host.name}
               '';
+
             };
           }
         ]
         else [ ]
-    )
+      ) nodes
-    nodes
     ));
+
+
+
   in {
+
     imports = [
+
     ];
 
     # using https://github.com/greaka/ops/blob/818be4c4dea9129abe0f086d738df4cb0bb38288/apps/restic/options.nix as a base
     # https://git.hrnz.li/Ulli/nixos/src/commit/5edca2dfdab3ce52208e4dfd2b92951e500f8418/profiles/server/restic.nix
     # will eb enabled on every server
-  options.services.skynet."${name}" = {
+    options.services.skynet_backup = {
-    enable = mkEnableOption "Skynet backup";
+      # backup is enabled by default
+      # enable = mkEnableOption "Skynet backup";
 
       # what folders to backup
       normal = {
@@ -129,6 +123,16 @@ in {
         };
       };
 
+      host = {
+        ip = mkOption {
+          type = types.str;
+        };
+
+        name = mkOption {
+          type = types.str;
+        };
+      };
+
       server = {
         enable = mkEnableOption "Skynet backup Server";
 
@@ -142,22 +146,39 @@ in {
           default = false;
         };
       };
+
     };
 
-  config = mkMerge [
-    {
-      # these values are anabled for every client
-      environment.systemPackages = with pkgs; [
-        restic
-      ];
-    }
 
-    (mkIf cfg.server.enable {
+  config = {
+    # these values are anabled for every client
+
+    environment.systemPackages = [
+      # for flakes
+      pkgs.restic
+    ];
+
+    # A list of all login accounts. To create the password hashes, use
+    # nix-shell -p apacheHttpd
+    # htpasswd -nbB "" "password" | cut -d: -f2
+
+    age.secrets.restic.file    = ../secrets/backup/restic.age;
+
     networking.firewall.allowedTCPPorts = [
       cfg.server.port
     ];
 
-      age.secrets.restic_pw = {
+    services.restic.backups = ownServers // {
+      # merge teh two configs together
+#      backblaze = base // {
+#        # backupos for each server are stored in a folder under their name
+#        repository = "b2:NixOS-Main2:/${cfg.host.name}";
+#        #environmentFile = config.age.secrets.backblaze.path;
+#      };
+
+    };
+
+    age.secrets.restic_pw = mkIf cfg.server.enable {
       file = ../secrets/backup/restic_pw.age;
       path = "${config.services.restic.server.dataDir}/.htpasswd";
       symlink = false;
@@ -166,34 +187,13 @@ in {
       group = "restic";
     };
 
-      services.restic.server = {
+    services.restic.server = mkIf cfg.server.enable{
       enable = true;
-        listenAddress = "${config.services.skynet.host.ip}:${toString cfg.server.port}";
+      listenAddress = "${cfg.host.ip}:${toString cfg.server.port}";
       appendOnly = cfg.server.appendOnly;
       privateRepos = true;
     };
-    })
 
-    (mkIf enable_client {
-      # client stuff here
 
-      # A list of all login accounts. To create the password hashes, use
+  };
-      # nix-shell -p apacheHttpd
-      # htpasswd -nbB "" "password" | cut -d: -f2
-
-      age.secrets.restic.file = ../secrets/backup/restic.age;
-
-      services.restic.backups = mkMerge [
-        ownServers
-        {
-          # merge teh two configs together
-          #      backblaze = base // {
-          #        # backupos for each server are stored in a folder under their name
-          #        repository = "b2:NixOS-Main2:/${config.services.skynet.host.name}";
-          #        #environmentFile = config.age.secrets.backblaze.path;
-          #      };
-        }
-      ];
-    })
-  ];
 }

applications/skynet.ie.nix

@@ -0,0 +1,78 @@
+{ config, pkgs, lib, inputs, ... }:
+  with lib;
+  let
+    cfg = config.services.skynet;
+  in {
+
+  imports = [
+    ./acme.nix
+    ./dns.nix
+  ];
+
+  options.services.skynet = {
+    host = {
+      ip = mkOption {
+        type = types.str;
+      };
+      name = mkOption {
+        type = types.str;
+      };
+    };
+  };
+
+  config = {
+    skynet_acme.domains = [
+      # the root one is already covered by teh certificate
+      "2016.skynet.ie"
+      "discord.skynet.ie"
+      "ext.skynet.ie"
+    ];
+
+    skynet_dns.records = [
+      # means root domain, so skynet.ie
+      {record="@";        r_type="A";     value=cfg.host.ip;}
+      {record="2016";     r_type="CNAME"; value="skynet";}
+      {record="discord";  r_type="CNAME"; value="skynet";}
+    ];
+
+    networking.firewall.allowedTCPPorts = [80 443];
+    services.httpd = {
+      enable = true;
+      group = "acme";
+
+      virtualHosts = {
+        # main site
+        "skynet.ie" = {
+          forceSSL = true;
+          useACMEHost = "skynet";
+          documentRoot = "${inputs.skynet_website.defaultPackage."x86_64-linux"}";
+          # only on skynet.ie
+          # skynet.ie/~username
+          enableUserDir = true;
+        };
+        "ext.skynet.ie" = {
+          forceSSL = true;
+          useACMEHost = "skynet";
+          documentRoot = "${inputs.skynet_website.defaultPackage."x86_64-linux"}";
+          # only on skynet.ie
+          # skynet.ie/~username
+          enableUserDir = true;
+        };
+
+        # archive of teh site as it was ~2012 to 2016
+        "2016.skynet.ie" = {
+          forceSSL = true;
+          useACMEHost = "skynet";
+          documentRoot = "${inputs.skynet_website_2016.defaultPackage."x86_64-linux"}";
+        };
+
+        # archive of teh site as it was ~2012 to 2016
+        "discord.skynet.ie" = {
+          forceSSL = true;
+          useACMEHost = "skynet";
+          globalRedirect = "https://discord.gg/mkuKJkCuyM";
+        };
+      };
+    };
+  };
+}

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"}";
-        };
-      };
-    };
-  };
-}

applications/skynet.ie/skynet.ie.nix

@@ -1,82 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  inputs,
-  ...
-}:
-with lib; let
-  name = "website";
-  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";})
-  ];
-
-  options.services.skynet."${name}" = {
-    enable = mkEnableOption "Skynet Main Website";
-  };
-
-  config = mkIf cfg.enable {
-    services.skynet.acme.domains = [
-      "discord.skynet.ie"
-      "public.skynet.ie"
-    ];
-
-    services.skynet.dns.records = [
-      # means root domain, so skynet.ie
-      {
-        record = "@";
-        r_type = "A";
-        value = config.services.skynet.host.ip;
-      }
-      {
-        record = "discord";
-        r_type = "CNAME";
-        value = config.services.skynet.host.name;
-      }
-      {
-        record = "public";
-        r_type = "CNAME";
-        value = config.services.skynet.host.name;
-      }
-    ];
-
-    services.nginx = {
-      virtualHosts = {
-        # main site
-        "skynet.ie" = {
-          forceSSL = true;
-          useACMEHost = "skynet";
-          locations = {
-            "/".root = "${inputs.skynet_website.defaultPackage."x86_64-linux"}";
-
-            # this redirects old links to new format
-            "~* ~(?<username>[a-z_0-9]*)(?<files>\\S*)$" = {
-              priority = 1;
-              return = "307 https://$username.users.skynet.ie$files";
-            };
-          };
-        };
-
-        # a custom discord url, because we are too cheap otehrwise
-        "discord.skynet.ie" = {
-          forceSSL = true;
-          useACMEHost = "skynet";
-          locations."/".return = "307 https://discord.gg/mkuKJkCuyM";
-        };
-
-        "public.skynet.ie" = {
-          forceSSL = true;
-          useACMEHost = "skynet";
-          root = "${inputs.compsoc_public.packages.x86_64-linux.default}";
-          locations."/".extraConfig = "autoindex on;";
-        };
-      };
-    };
-  };
-}

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";
-        };
-      };
-    };
-  };
-}

applications/skynet_users.nix

@@ -1,138 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  inputs,
-  ...
-}:
-with lib; let
-  name = "website_users";
-  cfg = config.services.skynet."${name}";
-  php_pool = name;
-in {
-  imports = [
-  ];
-
-  options.services.skynet."${name}" = {
-    enable = mkEnableOption "Skynet User Linux Server";
-  };
-
-  config = {
-    # we havea  more limited ports range on the skynet server
-    services.skynet.prometheus.ports = {
-      node = 9000;
-    };
-
-    # allow more than admins access
-    services.skynet.ldap_client = {
-      groups = [
-        "skynet-admins-linux"
-        "skynet-users-linux"
-      ];
-    };
-
-    # Website config
-    services.skynet.acme.domains = [
-      "users.skynet.ie"
-      "*.users.skynet.ie"
-    ];
-
-    services.skynet.dns.records = [
-      {
-        record = "users";
-        r_type = "CNAME";
-        value = config.services.skynet.host.name;
-      }
-      {
-        record = "*.users";
-        r_type = "CNAME";
-        value = config.services.skynet.host.name;
-      }
-    ];
-
-    environment.systemPackages = with pkgs; [
-      vim
-      php
-    ];
-
-    networking = {
-      defaultGateway = {
-        address = lib.mkDefault "193.1.96.161";
-        interface = lib.mkDefault "eth1";
-      };
-    };
-
-    # normally services cannot read home dirs
-    systemd.services.nginx.serviceConfig.ProtectHome = "read-only";
-    systemd.services."phpfpm-${php_pool}".serviceConfig.ProtectHome = lib.mkForce "read-only";
-
-    services.phpfpm.pools.${php_pool} = {
-      user = config.services.nginx.user;
-      group = config.services.nginx.group;
-      settings = {
-        "listen.owner" = config.services.nginx.user;
-        "pm" = "dynamic";
-        "pm.max_children" = 32;
-        "pm.max_requests" = 500;
-        "pm.start_servers" = 2;
-        "pm.min_spare_servers" = 2;
-        "pm.max_spare_servers" = 5;
-        "php_admin_value[error_log]" = "stderr";
-        "php_admin_flag[log_errors]" = true;
-        "catch_workers_output" = true;
-      };
-      phpEnv."PATH" = lib.makeBinPath [pkgs.php];
-    };
-
-    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;
-        useACMEHost = "skynet";
-        serverName = "~^(?<user>.+)\.users\.skynet\.ie";
-
-        # username.users.skynet.ie/
-        # user goes:
-        #   chmod 711 ~
-        #   chmod -R 755 ~/public_html
-
-        locations = {
-          "/" = {
-            alias = "/home/$user/public_html/";
-            index = "index.html";
-            extraConfig = ''
-              autoindex on;
-            '';
-            tryFiles = "$uri$args $uri$args/ /index.html";
-          };
-
-          "~ ^(.+\\.php)(.*)$" = {
-            root = "/home/$user/public_html/";
-            index = "index.php";
-            extraConfig = ''
-              autoindex on;
-              fastcgi_split_path_info ^(.+\.php)(/.+)$;
-              fastcgi_pass unix:${config.services.phpfpm.pools.${php_pool}.socket};
-              include ${pkgs.nginx}/conf/fastcgi.conf;
-            '';
-            tryFiles = "$uri$args $uri$args/ /index.php";
-          };
-        };
-      };
-    };
-  };
-}

applications/ulfm.nix

@@ -1,19 +1,29 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
+  with lib;
-  lib,
+  let
-  pkgs,
+    cfg = config.services.skynet_ulfm;
-  ...
-}:
-with lib; let
-  name = "ulfm";
-  cfg = config.services.skynet."${name}";
   in {
+
   imports = [
+    ./acme.nix
+    ./dns.nix
+    ./firewall.nix
+    ./nginx.nix
   ];
 
-  options.services.skynet."${name}" = {
+  options.services.skynet_ulfm = {
      enable = mkEnableOption "ULFM service";
 
+     host = {
+       ip = mkOption {
+         type = types.str;
+       };
+
+       name = mkOption {
+         type = types.str;
+       };
+     };
+
      domain = {
        tld = mkOption {
          type = types.str;
@@ -33,29 +43,25 @@ in {
   };
 
   config = mkIf cfg.enable {
-    # TODO: extract this out into its own config
+    # shove the entire config file into secrets
     age.secrets.ulfm.file = ../secrets/stream_ulfm.age;
 
     networking.firewall.allowedTCPPorts = [
       8000
     ];
 
-    services.skynet.acme.domains = [
+    skynet_acme.domains = [
       "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}"
     ];
 
-    services.skynet.dns.records = [
+    skynet_dns.records = [
-      {
+      {record=cfg.domain.sub; r_type="CNAME"; value=cfg.host.name;}
-        record = cfg.domain.sub;
-        r_type = "CNAME";
-        value = config.services.skynet.host.name;
-      }
     ];
 
     skynet_firewall.forward = [
-      "ip daddr ${config.services.skynet.host.ip} tcp dport 80 counter packets 0 bytes 0 accept"
+      "ip daddr ${cfg.host.ip} tcp dport 80 counter packets 0 bytes 0 accept"
-      "ip daddr ${config.services.skynet.host.ip} tcp dport 443 counter packets 0 bytes 0 accept"
+      "ip daddr ${cfg.host.ip} tcp dport 443 counter packets 0 bytes 0 accept"
-      "ip daddr ${config.services.skynet.host.ip} tcp dport 8000 counter packets 0 bytes 0 accept"
+      "ip daddr ${cfg.host.ip} tcp dport 8000 counter packets 0 bytes 0 accept"
     ];
 
     users.groups."icecast" = {};
@@ -80,14 +86,12 @@ in {
       };
     };
 
-    services.nginx = {
+    services.nginx.virtualHosts."${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}" = {
-      virtualHosts = {
-        "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}" = {
       forceSSL = true;
       useACMEHost = "skynet";
       locations."/".proxyPass = "http://localhost:8000";
     };
+
   };
-    };
+
-  };
 }

config/dns.nix

@@ -1,113 +0,0 @@
-{lib, ...}: {
-  imports = [
-  ];
-
-  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;
-    }));
-  };
-
-  config = {
-    skynet.records =
-      [
-        # wifi in server room
-        {
-          record = "ash";
-          r_type = "A";
-          value = "193.1.99.114";
-          server = true;
-        }
-        {
-          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 bumblebee.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 25518 bumblebee.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 bumblebee.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 bumblebee.skynet.ie.";
-        }
-        {
-          record = "minecraft-aged.compsoc.games";
-          r_type = "CNAME";
-          value = "bumblebee";
-        }
-        {
-          record = "_minecraft._tcp.minecraft-aged.compsoc.games.skynet.ie.";
-          r_type = "SRV";
-          value = "0 10 25519 bumblebee.skynet.ie.";
-        }
-      ]
-      # 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.";
-        }
-      ];
-  };
-}

config/users.nix

@@ -1,408 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}:
-with lib; let
-  port_backend = "8087";
-  cfg = config.skynet.users;
-in {
-  options.skynet = {
-    users = {
-      committee = mkOption rec {
-        type = types.listOf types.str;
-        default = [];
-        description = "array of committee members";
-      };
-      admin = mkOption rec {
-        type = types.listOf types.str;
-        default = [];
-        description = "array of admins";
-      };
-      trainee = mkOption rec {
-        type = types.listOf types.str;
-        default = [];
-        description = "array of trainee admins";
-      };
-      lifetime = mkOption rec {
-        type = types.listOf types.str;
-        default = [];
-        description = "array of lifetime users";
-      };
-      banned = mkOption rec {
-        type = types.listOf types.str;
-        default = [];
-        description = "array of banned users";
-      };
-      restricted = mkOption rec {
-        type = types.listOf types.str;
-        default = [];
-        description = "array of restricted user accounts";
-      };
-      clubs_societies = mkOption rec {
-        type = types.listOf types.str;
-        default = [];
-        description = "array of accounts for Clubs and Societies";
-      };
-    };
-  };
-
-  config.skynet = {
-    users = {
-      committee = lib.lists.unique (
-        # Committee - Core
-        [
-          "silver"
-          "eoghanconlon73"
-          "nanda"
-          "emily1999"
-          "dgr"
-        ]
-        # Committee - OCM
-        ++ [
-          "sidhiel"
-          "skyapples"
-          "eliza"
-          "amymucko"
-          "archiedms"
-        ]
-        # Committee - SISTEM
-        ++ [
-          "peace"
-        ]
-        # Admins are part of Committee as well
-        ++ cfg.admin
-      );
-      admin = [
-        "silver"
-        "evanc"
-        "eliza"
-        "esy"
-      ];
-      trainee = [];
-      lifetime = [];
-      banned = [];
-
-      clubs_societies = [
-        "outinul"
-        "gamesdev"
-      ];
-
-      restricted =
-        [
-          # usernames folks arent allowed to use
-          "contact"
-          "dnsadm"
-          "president"
-          "treasurer"
-          "secretary"
-          "pro"
-          "sysadmin"
-          "root"
-        ]
-        ++ [
-          # basis comes from https://discord.com/channels/689189992417067052/1126084496710713414/1149072061466169444
-          # start off with compsoc stuff first
-          "competition_www"
-          "demo1"
-          "demouser"
-          "ftp"
-          "lost+found"
-          "postfix"
-          "skynews.old"
-          "system_backup"
-          "test"
-          "test12"
-          "test20202"
-          "test20203"
-          "tmp"
-          "webadm"
-        ]
-        ++ [
-          # clubs and socs (as far as I can tell
-          "aerosoc"
-          "aikido"
-          "anfocal"
-          "bics"
-          "boarding"
-          "cns"
-          "dev"
-          "filmsoc"
-          "gaa"
-          "german"
-          "golfsoc"
-          "handball"
-          "hispanic"
-          "history"
-          "hockey"
-          "home"
-          "legosoc"
-          "lifesave"
-          "mens_gfc"
-          "musicsoc"
-          "pagansoc"
-          "peacesoc"
-          "physics"
-          "poker"
-          "prolife"
-          "radio"
-          "ragweek"
-          "sinnfein"
-          "soccer"
-          "ulbs"
-          "ulcamogie"
-          "ulcc"
-          "ulgaa"
-          "ulils"
-          "ulladiesfootball"
-          "ullaughinsoc"
-          "ulrfc"
-          "ulriders"
-          "ulssc"
-          "ultennis"
-          "viking"
-        ]
-        ++ [
-          # remaining, most likely usernames
-          "_9thwonder"
-          "abc"
-          "activate"
-          "aiesec"
-          "air"
-          "aladdin"
-          "alaric"
-          "aldozzie"
-          "allenli"
-          "amg"
-          "amgl"
-          "annette"
-          "annlad"
-          "ards_backup"
-          "arisquez"
-          "arthur"
-          "austin"
-          "beta"
-          "bh"
-          "bigdave"
-          "bios"
-          "bizarroal"
-          "bmacaree"
-          "boardy"
-          "boddah"
-          "bogus.anime.fakh"
-          "bogus.bhudt.dacf"
-          "bogus.citoge.baym"
-          "bogus.electro.ba0a"
-          "bogus.fencing.baw5"
-          "bogus.harry.ba8f"
-          "bogus.hui.hong.baci"
-          "bogus.ironman.baqib"
-          "bogus.joe.bach"
-          "bogus.kenny.bas6"
-          "bogus.kerswin.baybb"
-          "bogus.kravmaga.ba0w"
-          "bogus.methi.baq5"
-          "bogus.nelsonmw.bauc"
-          "bogus.poshea.ba0m"
-          "bogus.redwolf.bawn"
-          "bogus.romanov.baat"
-          "bogus.ryan.bae-"
-          "bogus.rynnea.bask"
-          "bogus.sea.af"
-          "bogus.shane.c.ba8z"
-          "bogus.t1000.baggb"
-          "bogus.ullrugby.ba8p"
-          "brendan"
-          "bubba"
-          "c_material_removed"
-          "ca_worm"
-          "cactus"
-          "carticus"
-          "cathalc"
-          "cathald-broken"
-          "cdschedule"
-          "celtic"
-          "christine"
-          "cian"
-          "ciara"
-          "ciaran"
-          "colin"
-          "cosmo"
-          "counsel"
-          "creosote"
-          "crew"
-          "cues"
-          "cur"
-          "cwhelan"
-          "dac"
-          "daktulu"
-          "datacore"
-          "davec"
-          "daverus"
-          "deano"
-          "deccy"
-          "declanmu"
-          "deiji"
-          "dermotmc"
-          "derrick"
-          "deshocks"
-          "diarmuid"
-          "dippy"
-          "djraptor"
-          "dmackey"
-          "dmir"
-          "dom"
-          "dom_mckay"
-          "donie"
-          "donnacha"
-          "dos30"
-          "drazhar"
-          "duffman"
-          "eas"
-          "electal"
-          "emc"
-          "emilia"
-          "emma"
-          "emmag"
-          "ents"
-          "envcom"
-          "eoinh95"
-          "epgriffin"
-          "equest"
-          "fiacc"
-          "fint"
-          "flanno"
-          "fmannix"
-          "foodcoop"
-          "gamenet"
-          "ganainm"
-          "gar"
-          "ger88"
-          "ghama"
-          "ging"
-          "goborobo"
-          "gooner"
-          "greekweek"
-          "hawking"
-          "hb"
-          "homer"
-          "hoshi"
-          "ian"
-          "ianrice"
-          "ilug"
-          "infinity"
-          "ingenuus"
-          "internat"
-          "jamessy"
-          "jamiebarry"
-          "jbravo"
-          "jdonegan"
-          "joedredd"
-          "johann"
-          "jokill"
-          "jsoccer"
-          "jules"
-          "kate"
-          "katie"
-          "kellyj"
-          "kiely"
-          "koo"
-          "l_d_ablo"
-          "lakes"
-          "laura"
-          "lebowski"
-          "liabraid"
-          "lynn"
-          "mal"
-          "manuel"
-          "maraz"
-          "marieke"
-          "marky"
-          "mature"
-          "mbyrne"
-          "meanturtle"
-          "mickaful"
-          "mickasul"
-          "mikado"
-          "mikeh"
-          "mikkel"
-          "mixiezme"
-          "mmc"
-          "molly"
-          "moochie"
-          "moonser"
-          "mopic"
-          "mp"
-          "nastros"
-          "neutrino"
-          "new"
-          "nezzy"
-          "nkdc"
-          "nmcenroy"
-          "noelle"
-          "nugget"
-          "ob"
-          "omega"
-          "oneillbeano"
-          "pamela"
-          "peterj"
-          "photyl"
-          "plake"
-          "pmcg1986"
-          "pyro"
-          "qubeat"
-          "rachel"
-          "rachelg"
-          "ralmeida"
-          "raymond"
-          "razzlero"
-          "red"
-          "rmacm"
-          "rmorrissey"
-          "robson"
-          "selena"
-          "shark"
-          "shayscannell"
-          "shazlove"
-          "shelley"
-          "shelly"
-          "silver.old"
-          "sirhc"
-          "sithlord"
-          "sk"
-          "sligoer"
-          "slowey"
-          "smallp"
-          "smurfy"
-          "sordfish"
-          "soul98"
-          "soular"
-          "st"
-          "stefanovich"
-          "svp"
-          "szczerba"
-          "tangsoodo"
-          "tc"
-          "tenfor"
-          "teslacut"
-          "theematt"
-          "thomasl"
-          "tockman"
-          "ugm"
-          "vanzan"
-          "volleyb"
-          "warren"
-          "weather"
-          "wiles"
-          "yvonne"
-          "zrahman"
-        ]
-        ++ [
-          # former aliases
-          "david.dolphin"
-          "cc"
-          "mark.brennan"
-        ];
-    };
-  };
-}

flake.nix

@@ -1,91 +1,46 @@
 {
+
   description = "Deployment for skynet";
 
   inputs = {
     # gonna start off with a fairly modern base
     nixpkgs.url = "nixpkgs/nixos-unstable";
-    # 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";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    colmena.url = "github:zhaofengli/colmena";
 
-    # we host our own
+    # email
-    simple-nixos-mailserver = {
+    # simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.05";
-      inputs.nixpkgs.follows = "nixpkgs";
+    simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
-      url = "git+https://forgejo.skynet.ie/Skynet/misc_nixos-mailserver";
+
+    # account.skynet.ie
+    skynet_ldap_backend.url  = "gitlab:compsoc1%2Fskynet%2Fldap/backend?host=gitlab.skynet.ie";
+    skynet_ldap_frontend.url = "gitlab:compsoc1%2Fskynet%2Fldap/frontend?host=gitlab.skynet.ie";
+
+    skynet_website.url = "gitlab:compsoc1%2Fskynet%2Fwebsite/2023?host=gitlab.skynet.ie";
+    skynet_website_2016.url = "gitlab:compsoc1%2Fskynet%2Fwebsite/2016?host=gitlab.skynet.ie";
+
+    skynet_discord_bot.url = "gitlab:compsoc1%2Fskynet/discord-bot?host=gitlab.skynet.ie";
   };
 
-    ######################
+  nixConfig.bash-prompt-suffix = "[Skynet Dev] ";
-    ### 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";
 
-    #####################
+  outputs = { self, nixpkgs, agenix,  ... } @inputs:
-    ### compsoc stuff ###
+    let
-    #####################
-    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 = "https://forgejo.skynet.ie/Skynet/website_2017/archive/main.tar.gz";
-
-    # these are past versions of teh website
-    skynet_website_2023.url = "https://forgejo.skynet.ie/Skynet/website_2017/archive/c4d61c753292bf73ed41b47b1607cfc92a82a191.tar.gz";
-    # this is not 100% right since this is from teh archive from 2022 or so
-    skynet_website_2017.url = "https://forgejo.skynet.ie/Skynet/website_2017/archive/edd922c5b13fa1f520e8e265a3d6e4e189852b99.tar.gz";
-
-    # this is more of 2012 than 2009 but started in 2009
-    skynet_website_2009.url = "https://forgejo.skynet.ie/Skynet/website_2009/archive/main.tar.gz";
-  };
-
-  nixConfig = {
-    bash-prompt-suffix = "[Skynet Dev] ";
-    extra-substituters = "https://nix-cache.skynet.ie/skynet-cache";
-    extra-trusted-public-keys = "skynet-cache:zMFLzcRZPhUpjXUy8SF8Cf7KGAZwo98SKrzeXvdWABo=";
-  };
-
-  outputs = {
-    self,
-    nixpkgs,
-    agenix,
-    alejandra,
-    colmena,
-    ...
-  } @ inputs: let
       pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs;
     in {
-    formatter.x86_64-linux = alejandra.defaultPackage."x86_64-linux";
 
     devShells.x86_64-linux.default = pkgs.mkShell {
       name = "Skynet build env";
       nativeBuildInputs = [
           pkgs.buildPackages.git
-        colmena.defaultPackage."x86_64-linux"
+          pkgs.buildPackages.colmena
-        pkgs.attic-client
           pkgs.buildPackages.nmap
       ];
       buildInputs = [ agenix.packages.x86_64-linux.default ];
-      shellHook = ''export EDITOR="${pkgs.nano}/bin/nano --nonewlines"; unset LD_LIBRARY_PATH;'';
+      shellHook = ''export EDITOR="${pkgs.nano}/bin/nano --nonewlines"'';
     };
 
     colmena = {
@@ -95,7 +50,7 @@
           overlays = [];
         };
         specialArgs = {
-          inherit inputs self;
+          inherit inputs;
         };
       };
 
@@ -114,6 +69,9 @@
       # icecast - ULFM
       galatea = import ./machines/galatea.nix;
 
+      # Game host
+      optimus = import ./machines/optimus.nix;
+
       # LDAP host
       kitt = import ./machines/kitt.nix;
 
@@ -129,23 +87,10 @@
       # backup 1
       neuromancer = import ./machines/neuromancer.nix;
 
-      # Skynet, user ssh access
+      # Skynet
       skynet = import ./machines/skynet.nix;
 
-      # Main skynet sites
-      earth = import ./machines/earth.nix;
-
-      # Nextcloud
-      cadie = import ./machines/cadie.nix;
-
-      # trainee server
-      marvin = import ./machines/marvin.nix;
-
-      # Public Services
-      calculon = import ./machines/calculon.nix;
-
-      # metrics
-      ariia = import ./machines/ariia.nix;
     };
   };
+
 }

machines/_base.nix

@@ -1,66 +1,27 @@
+{ pkgs, modulesPath, config, options, inputs, ... }:
+
 {
-  pkgs,
-  modulesPath,
-  config,
-  options,
-  inputs,
-  lib,
-  ...
-}:
-with lib; let
-  cfg = config.skynet;
-in {
   imports = [
-    # custom lxc mocule until the patch gets merged in
+    (modulesPath + "/virtualisation/proxmox-lxc.nix")
-    ../applications/proxmox-lxc.nix
-    # (modulesPath + "/virtualisation/proxmox-lxc.nix")
 
     # for the secrets
     inputs.agenix.nixosModules.default
 
-    # base application config for all servers
+    # every sever may need the firewall config stuff
-    ../applications/_base.nix
+    ../applications/firewall.nix
 
-    #
+    # every sever needs to have a dns record
-    inputs.lix-module.nixosModules.default
+    ../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
   ];
 
-  options.skynet = {
-    lxc = mkOption {
-      type = types.bool;
-      # most of our servers are lxc so its true by default
-      default = true;
-      description = mdDoc "Is this a Linux Container?";
-    };
-  };
-
-  config = {
-    # if its a lxc enable
-    proxmoxLXC.enable = cfg.lxc;
-
-    nix = {
-      settings = {
   # flakes are essensial
-        experimental-features = ["nix-command" "flakes"];
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-        trusted-users = [
-          "root"
-          "@skynet-admins-linux"
-        ];
-      };
-
-      # https://nixos.wiki/wiki/Storage_optimization
-      #      gc = {
-      #        automatic = true;
-      #        dates = "weekly";
-      #        options = "--delete-older-than 30d";
-      #      };
-
-      # to free up to 10GiB whenever there is less than 1GiB left
-      extraOptions = ''
-        min-free = ${toString (1024 * 1024 * 1024)}
-        max-free = ${toString (1024 * 1024 * 1024 * 10)}
-      '';
-    };
 
   system.stateVersion = "22.11";
 
@@ -89,17 +50,14 @@ in {
   };
 
   # skynet-admin-linux will always be added, individual servers can override the groups option
-    services.skynet.ldap_client.enable = true;
+  services.skynet_ldap_client.enable = true;
 
   networking = {
     # every sever needs to be accessable over ssh for admin use at least
     firewall.allowedTCPPorts = [22];
 
     # explisitly stating this is good
-      defaultGateway = {
+    defaultGateway = "193.1.99.65";
-        address = "193.1.99.65";
-        interface = "eth0";
-      };
 
     # cannot use our own it seems?
     nameservers = [
@@ -117,23 +75,18 @@ in {
   # use teh above nameservers as the fallback dns
   services.resolved.fallbackDns = config.networking.nameservers;
 
-    # https://discourse.nixos.org/t/systemd-networkd-wait-online-934764-timeout-occurred-while-waiting-for-network-connectivity/33656/9
+  environment.systemPackages = [
-    systemd.network.wait-online.enable = false;
-
-    environment.systemPackages = with pkgs; [
     # for flakes
-      git
+    pkgs.git
-      git-lfs
     # useful tools
-      ncdu_2
+    pkgs.ncdu_2
-      htop
+    pkgs.htop
-      nano
+    pkgs.nano
-      nmap
+    pkgs.nmap
-      bind
+    pkgs.bind
-      zip
+    pkgs.zip
-      traceroute
+    pkgs.traceroute
-      openldap
+    pkgs.openldap
-      screen
+    pkgs.screen
   ];
-  };
 }

machines/agentjones.nix

@@ -6,56 +6,70 @@ Hardware: PowerEdge r210
   From:     2011 (?)
   Role:     Firewall
   Notes:    Used to have Agent Smith as a partner but it died (Ironically)
+
 */
-{
+
-  pkgs,
+{ pkgs, lib, nodes, ... }:
-  lib,
+let
-  nodes,
-  ...
-}: let
   # name of the server, sets teh hostname and record for it
   name      = "agentjones";
   ip_pub    = "193.1.99.72";
+  ip_priv   = "193.1.99.125";
   hostname  = "${name}.skynet.ie";
-  host = {
+
-    ip = ip_pub;
-    name = name;
-    hostname = hostname;
-  };
 in {
   imports = [
+    ./hardware/_base.nix
     ./hardware/RM001.nix
   ];
 
   deployment = {
     targetHost = hostname;
     targetPort = 22;
-    targetUser = null;
+    targetUser = "root";
 
     # somehow ssh from runner to this fails
     tags = [ "active-firewall" ];
   };
 
-  services.skynet = {
+  skynet_dns.records = [
-    host = host;
+    {record=name;   r_type="A";   value=ip_pub; server=true;}
-    backup.enable = true;
+    {record=ip_pub; r_type="PTR"; value=hostname;}
+  ];
+
+  services.skynet_backup = {
+    host = {
+      ip = ip_pub;
+      name = name;
+    };
   };
 
   # keep the wired usb connection alive (front panel)
-  # networking.interfaces.enp0s29u1u5u2.useDHCP = true;
+  networking.interfaces.enp0s29u1u5u2.useDHCP = true;
 
   networking.hostName = name;
   # this has to be defined for any physical servers
   # vms are defined by teh vm host
-  networking = {
+  networking.interfaces = {
-    defaultGateway.interface = lib.mkForce "eno1";
+    eno2 = {
-    interfaces.eno1.ipv4.addresses = [
+      ipv4.addresses = [
         {
           address = ip_pub;
           prefixLength = 26;
         }
       ];
     };
+    eno1 = {
+      #useDHCP = false;
+      ipv4.addresses = [
+        {
+          # internal address
+          address = ip_priv;
+          prefixLength = 26;
+        }
+      ];
+    };
+  };
 
   # this server is teh firewall
   skynet_firewall = {
@@ -73,25 +87,23 @@ in {
       };
     };
 
-    enable = false;
+    enable = true;
 
     # gonna have to get all the
     forward = builtins.concatLists (
       # using this function "(key: value: value.config.skynet_firewall.forward)" turn the values ointo a list
-      lib.attrsets.mapAttrsToList (
+      lib.attrsets.mapAttrsToList (key: value:
-        key: value:
         # make sure that anything running this firewall dosent count (recursion otherewise)
         # firewall may want to open ports in itself but can deal with that later
         if builtins.hasAttr "skynet_firewall" value.config
-          then
+        then (
-            (
           if value.config.skynet_firewall.enable
           then []
           else value.config.skynet_firewall.forward
         )
         else []
-      )
+      ) nodes
-      nodes
     );
   };
+
 }

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;
-  };
-}

machines/cadie.nix

@@ -1,47 +0,0 @@
-/*
-
-Name:     https://en.wikipedia.org/wiki/List_of_Google_April_Fools%27_Day_jokes#CADIE
-Why:      CADIE is what google could have been, but they chickened out.
-Type:     VM
-Hardware: -
-From:     2023
-Role:     Google but better
-Notes:
-*/
-{
-  pkgs,
-  lib,
-  nodes,
-  ...
-}: let
-  # name of the server, sets teh hostname and record for it
-  name = "cadie";
-  ip_pub = "193.1.99.77";
-  hostname = "${name}.skynet.ie";
-  host = {
-    ip = ip_pub;
-    name = name;
-    hostname = hostname;
-  };
-in {
-  imports = [
-    ../applications/nextcloud.nix
-  ];
-
-  deployment = {
-    targetHost = hostname;
-    targetPort = 22;
-    targetUser = null;
-
-    tags = ["active"];
-  };
-
-  services.skynet = {
-    host = host;
-    backup.enable = true;
-    nextcloud.enable = true;
-  };
-
-  # this was causing a conflict for some reason
-  systemd.network.enable = lib.mkForce false;
-}

machines/calculon.nix

@@ -1,49 +0,0 @@
-/*
-
-Name:     https://futurama.fandom.com/wiki/Calculon
-Why:      Public Service server
-Type:     VM
-Hardware: -
-From:     2024
-Role:     Public services such as Nix Cache, Open governance stuff.
-Notes:
-*/
-{
-  pkgs,
-  lib,
-  nodes,
-  inputs,
-  ...
-}: let
-  name = "calculon";
-  ip_pub = "193.1.99.82";
-  hostname = "${name}.skynet.ie";
-
-  host = {
-    ip = ip_pub;
-    name = name;
-    hostname = hostname;
-  };
-in {
-  imports = [
-    ../applications/nix_cache/nix_cache.nix
-    ../applications/open_governance/open_governance.nix
-    ../applications/open_governance/keyserver.nix
-  ];
-
-  deployment = {
-    targetHost = hostname;
-    targetPort = 22;
-    targetUser = null;
-
-    tags = ["active"];
-  };
-
-  services.skynet = {
-    host = host;
-    backup.enable = true;
-    nix-cache.enable = true;
-    open-governance.enable = true;
-    keyserver.enable = true;
-  };
-}

machines/earth.nix

@@ -1,46 +0,0 @@
-/*
-
-Name:     https://hitchhikers.fandom.com/wiki/Earth
-Why:      Our home(page)
-Type:     VM
-Hardware: -
-From:     2023
-Role:     Webserver
-Notes:
-*/
-{
-  pkgs,
-  lib,
-  nodes,
-  inputs,
-  ...
-}: let
-  name = "earth";
-  ip_pub = "193.1.99.79";
-  hostname = "${name}.skynet.ie";
-  host = {
-    ip = ip_pub;
-    name = name;
-    hostname = hostname;
-  };
-in {
-  imports = [
-    ../applications/skynet.ie/skynet.ie.nix
-    ../applications/skynet.ie/wiki.nix
-  ];
-
-  deployment = {
-    targetHost = hostname;
-    targetPort = 22;
-    targetUser = null;
-
-    tags = ["active-core"];
-  };
-
-  services.skynet = {
-    host = host;
-    backup.enable = true;
-    website.enable = true;
-    wiki.enable = true;
-  };
-}

machines/galatea.nix

@@ -7,23 +7,15 @@ Hardware: -
   From:     2023
   Role:     Icecast server for ULFM
   Notes:
+
 */
-{
+
-  pkgs,
+{ pkgs, lib, nodes, config, ... }:
-  lib,
+let
-  nodes,
-  config,
-  ...
-}: let
   # name of the server, sets teh hostname and record for it
   name      = "galatea";
   ip_pub    = "193.1.99.111";
   hostname  = "${name}.skynet.ie";
-  host = {
-    ip = ip_pub;
-    name = name;
-    hostname = hostname;
-  };
 in {
   imports = [
     ../applications/ulfm.nix
@@ -32,14 +24,28 @@ in {
   deployment = {
     targetHost = hostname;
     targetPort = 22;
-    targetUser = null;
+    targetUser = "root";
 
     tags = [ "active" ];
   };
 
-  services.skynet = {
+  skynet_dns.records = [
-    host = host;
+    {record=name;   r_type="A";   value=ip_pub; server=true;}
-    backup.enable = true;
+    {record=ip_pub; r_type="PTR"; value=hostname;}
-    ulfm.enable = true;
+  ];
+
+  services.skynet_backup = {
+    host = {
+      ip = ip_pub;
+      name = name;
+    };
+  };
+
+  services.skynet_ulfm = {
+    enable = true;
+    host = {
+      ip = ip_pub;
+      name = name;
+    };
   };
 }

machines/gir.nix

@@ -7,22 +7,17 @@ Hardware: -
   From:     2023
   Role:     Email Server
   Notes:
+
 */
-{
+
-  pkgs,
+{ pkgs, lib, nodes, ... }:
-  lib,
+let
-  nodes,
-  ...
-}: let
   # name of the server, sets teh hostname and record for it
   name      = "gir";
   ip_pub    = "193.1.99.76";
   hostname  = "${name}.skynet.ie";
-  host = {
+  #hostname  = ip_pub;
-    ip = ip_pub;
+
-    name = name;
-    hostname = hostname;
-  };
 in {
   imports = [
     ../applications/email.nix
@@ -31,14 +26,31 @@ in {
   deployment = {
     targetHost = hostname;
     targetPort = 22;
-    targetUser = null;
+    targetUser = "root";
 
     tags = [ "active-core" ];
   };
 
-  services.skynet = {
+  # add this server to dns
-    host = host;
+  skynet_dns.records = [
-    backup.enable = true;
+    {record=name;   r_type="A";   value=ip_pub; server=true;}
-    email.enable = true;
+    {record=ip_pub; r_type="PTR"; value=hostname;}
+  ];
+
+  services.skynet_backup = {
+    host = {
+      ip = ip_pub;
+      name = name;
+    };
+  };
+
+  # we use this to pass in teh relevent infomation to the
+  services.skynet_email = {
+    enable = true;
+    host = {
+      ip = ip_pub;
+      name = name;
+    };
+    domain = "skynet.ie";
   };
 }

machines/glados.nix

@@ -8,40 +8,48 @@ From:     2023
   Role:     Git server
   Notes:    Each user has roughly 20gb os storage
             20 * 100 = 2000gb
+
 */
-{
+
-  pkgs,
+{ pkgs, lib, nodes, ... }:
-  lib,
+let
-  nodes,
-  ...
-}: let
   # name of the server, sets teh hostname and record for it
   name      = "glados";
   ip_pub    = "193.1.99.75";
   hostname  = "${name}.skynet.ie";
-  host = {
+
-    ip = ip_pub;
-    name = name;
-    hostname = hostname;
-  };
 in {
   imports = [
-    ../applications/git/gitlab.nix
+    ../applications/gitlab.nix
-    ../applications/git/forgejo.nix
   ];
 
   deployment = {
     targetHost = hostname;
     targetPort = 22;
-    targetUser = null;
+    targetUser = "root";
 
     tags = [ "active-gitlab" ];
   };
 
-  services.skynet = {
+
-    host = host;
+  skynet_dns.records = [
-    backup.enable = true;
+    {record=name;   r_type="A";   value=ip_pub; server=true;}
-    gitlab.enable = true;
+    {record=ip_pub; r_type="PTR"; value=hostname;}
-    forgejo.enable = true;
+  ];
+
+  services.skynet_backup = {
+    host = {
+      ip = ip_pub;
+      name = name;
     };
+  };
+
+  services.skynet_gitlab = {
+    enable = true;
+    host = {
+      ip = ip_pub;
+      name = name;
+    };
+  };
+
 }

machines/hardware/RM001.nix

@@ -1,39 +1,30 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{
+{ config, lib, pkgs, modulesPath, ... }:
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}: {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-    ./_base.nix
-  ];
 
-  # Use the systemd-boot EFI boot loader.
+{
-  boot.loader.systemd-boot.enable = true;
+  imports =
-  boot.loader.efi.canTouchEfiVariables = true;
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
   boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-uuid/f7b9d648-735f-44b7-b439-6af601b234a7";
+    { device = "/dev/disk/by-uuid/9b177e4a-726e-4e68-a0e1-53837a8cae2e";
       fsType = "ext4";
     };
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/679E-C352";
+    { device = "/dev/disk/by-uuid/41AD-70AF";
       fsType = "vfat";
     };
 
-  swapDevices = [
+  swapDevices =
-    {device = "/dev/disk/by-uuid/b1da9f57-1ed0-4f10-a6c0-6536a0017b2a";}
+    [ { device = "/dev/disk/by-uuid/c5990c64-077f-45b1-96b5-44ec93e6651f"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@@ -43,6 +34,7 @@
   networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
   # networking.interfaces.eno2.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp0s29u1u1.useDHCP = lib.mkDefault true;
   # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";

machines/hardware/RM002.nix

@@ -1,39 +1,30 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{
+{ config, lib, pkgs, modulesPath, ... }:
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}: {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-    ./_base.nix
-  ];
 
-  # Use the systemd-boot EFI boot loader.
+{
-  boot.loader.systemd-boot.enable = true;
+  imports =
-  boot.loader.efi.canTouchEfiVariables = true;
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
   boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-uuid/5c1a39c9-c458-4518-b75b-5a831bebc204";
+    { device = "/dev/disk/by-uuid/34918a4f-ca27-4070-a309-94bc59bdd743";
       fsType = "ext4";
     };
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/8CBD-7032";
+    { device = "/dev/disk/by-uuid/8B03-4D11";
       fsType = "vfat";
     };
 
-  swapDevices = [
+  swapDevices =
-    {device = "/dev/disk/by-uuid/515df5d9-abad-4068-bacc-559fb76e1fb1";}
+    [ { device = "/dev/disk/by-uuid/c83e65ad-d252-4024-93a9-0253c5d8beac"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@@ -43,6 +34,7 @@
   networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
   # networking.interfaces.eno2.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp0s29u1u2.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

machines/hardware/RM007.nix

@@ -1,32 +1,30 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
 {
-  config,
+  imports =
-  lib,
+    [ (modulesPath + "/installer/scan/not-detected.nix")
-  pkgs,
-  modulesPath,
-  ...
-}: {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-    ./_base.nix
     ];
 
-  boot.initrd.availableKernelModules = ["ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod"];
+  boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sr_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
-  boot.loader.grub.device = "/dev/sda";
+  fileSystems."/" =
-
+    { device = "/dev/disk/by-uuid/c48817e1-036f-49a7-adae-f63fc6c03cd5";
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/a6c96ea1-1e66-4ad3-aef6-dd7131c83530";
       fsType = "ext4";
     };
 
-  swapDevices = [
+  fileSystems."/boot" =
-    {device = "/dev/disk/by-uuid/5408b486-62ce-45d9-bca5-b458e68ef7f4";}
+    { device = "/dev/disk/by-uuid/76CE-C65E";
+      fsType = "vfat";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/eced30bd-b785-43e0-a202-cdaee7e0f4f7"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

machines/hardware/_base.nix

@@ -1,27 +1,17 @@
-{
+{ config, options, lib, ... }: with lib;
-  config,
+let
-  options,
-  lib,
-  ...
-}:
-with lib; let
   # get a list of interfaces
   interfaces = attrNames config.networking.interfaces;
   # check if an IP has been assigned
   has_ip = interface: (length config.networking.interfaces."${interface}".ipv4.addresses) != 0;
 in {
   config = {
-    skynet.lxc = false;
-
     assertions = [
       {
         assertion = lists.any has_ip interfaces;
         message = "Must have a ip address set";
       }
-      {
-        assertion = config.networking.hostName != "nixos";
-        message = "Must have networking.hostName set";
-      }
     ];
   };
+
 }

machines/kitt.nix

@@ -7,52 +7,53 @@ Hardware: -
   From:     2023
   Role:     LDAP Server
   Notes:
+
 */
-{
+
-  config,
+{ pkgs, lib, nodes, ... }:
-  pkgs,
+let
-  lib,
-  nodes,
-  ...
-}: let
   # name of the server, sets teh hostname and record for it
   name      = "kitt";
   ip_pub    = "193.1.99.74";
   hostname  = "${name}.skynet.ie";
-  host = {
+  #hostname  = ip_pub;
-    ip = ip_pub;
+
-    name = name;
-    hostname = hostname;
-  };
 in {
   imports = [
     ../applications/ldap/server.nix
-    ../applications/ldap/backend.nix
     ../applications/discord.nix
-    ../applications/bitwarden/vaultwarden.nix
-    ../applications/bitwarden/bitwarden_sync.nix
   ];
 
   deployment = {
     targetHost = hostname;
     targetPort = 22;
-    targetUser = null;
+    targetUser = "root";
 
     tags = [ "active-core" ];
   };
 
-  services.skynet = {
+  # add this server to dns
-    host = host;
+  skynet_dns.records = [
-    backup.enable = true;
+    {record=name;   r_type="A";   value=ip_pub; server=true;}
+    {record=ip_pub; r_type="PTR"; value=hostname;}
+  ];
 
-    # ldap setup
+  services.skynet_backup = {
-    ldap.enable = true;
+    host = {
-    ldap_backend.enable = true;
+      ip = ip_pub;
+      name = name;
+    };
+  };
 
-    # private member services
+  services.skynet_ldap = {
-    discord_bot.enable = true;
+    enable = true;
+    host = {
+      ip = ip_pub;
+      name = name;
+    };
+  };
 
-    # committee/admin services
+  services.discord_bot = {
-    vaultwarden.enable = true;
+    enable = true;
   };
 }

machines/marvin.nix

@@ -1,61 +0,0 @@
-/*
-
-Name:     https://en.wikipedia.org/wiki/Marvin_the_Paranoid_Android
-Why:      Has terrible pain in all the diodes down its left side
-Type:     VM
-Hardware: -
-From:     2023
-Role:     For trainees.
-Notes:
-*/
-{
-  pkgs,
-  lib,
-  nodes,
-  ...
-}: let
-  name = "marvin";
-  ip_pub = "193.1.99.81";
-  hostname = "${name}.skynet.ie";
-  host = {
-    ip = ip_pub;
-    name = name;
-    hostname = hostname;
-  };
-
-  groups = [
-    "skynet-admins-linux"
-    "skynet-trainees-linux"
-  ];
-  groups_trusted = map (x: "@${x}") groups;
-in {
-  imports = [
-  ];
-
-  deployment = {
-    targetHost = hostname;
-    targetPort = 22;
-    targetUser = null;
-
-    # not deployed automatically as its a test server
-    tags = [];
-  };
-
-  # allow trainees to deploy
-  nix.settings.trusted-users =
-    [
-      "root"
-    ]
-    ++ groups_trusted;
-
-  # allow trainees access
-  services.skynet.ldap_client = {
-    groups = groups;
-    sudo_groups = groups;
-  };
-
-  services.skynet = {
-    host = host;
-    backup.enable = true;
-  };
-}

machines/neuromancer.nix

@@ -7,50 +7,52 @@ Hardware: -
   From:     2023
   Role:     Backup Server
   Notes:
+
 */
-{
+
-  pkgs,
+{ pkgs, lib, nodes, ... }:
-  lib,
+let
-  nodes,
-  ...
-}: let
   # name of the server, sets teh hostname and record for it
   name      = "neuromancer";
   ip_pub    = "193.1.99.80";
   hostname  = "${name}.skynet.ie";
-  host = {
+
-    ip = ip_pub;
-    name = name;
-    hostname = hostname;
-  };
 in {
   imports = [
+    ./hardware/_base.nix
     ./hardware/RM007.nix
   ];
 
+
   networking.hostName = name;
   # this has to be defined for any physical servers
   # vms are defined by teh vm host
-  networking = {
+  networking.interfaces.eno1.ipv4.addresses = [
-    defaultGateway.interface = lib.mkForce "eno1";
-    interfaces.eno1.ipv4.addresses = [
     {
       address = ip_pub;
       prefixLength = 26;
     }
   ];
-  };
 
   deployment = {
     targetHost = hostname;
     targetPort = 22;
-    targetUser = null;
+    targetUser = "root";
 
     tags = [ "active-core" ];
   };
 
-  services.skynet = {
+  skynet_dns.records = [
-    host = host;
+    {record=name;   r_type="A";   value=ip_pub; server=true;}
-    backup.server.enable = true;
+    {record=ip_pub; r_type="PTR"; value=hostname;}
+  ];
+
+  services.skynet_backup = {
+    server.enable = true;
+    host = {
+      ip = ip_pub;
+      name = name;
     };
+  };
+
 }

machines/optimus.nix

@@ -0,0 +1,52 @@
+/*
+
+  Name:     https://en.wikipedia.org/wiki/Optimus_Prime
+  Why:      Created to sell toys so this vm is for games
+  Type:     VM
+  Hardware: -
+  From:     2023
+  Role:     Game host
+  Notes:
+
+*/
+
+{ pkgs, lib, nodes, arion, ... }:
+let
+  # name of the server, sets teh hostname and record for it
+  name      = "optimus";
+  ip_pub    = "193.1.99.112";
+  hostname  = "${name}.skynet.ie";
+
+in {
+  imports = [
+    ../applications/games.nix
+  ];
+
+  deployment = {
+    targetHost = hostname;
+    targetPort = 22;
+    targetUser = "root";
+
+    tags = [ "active" ];
+  };
+
+  skynet_dns.records = [
+    {record=name;   r_type="A";   value=ip_pub; server=true;}
+    {record=ip_pub; r_type="PTR"; value=hostname;}
+  ];
+
+  services.skynet_backup = {
+    host = {
+      ip = ip_pub;
+      name = name;
+    };
+  };
+
+  services.skynet_games = {
+    enable = true;
+    host = {
+      ip = ip_pub;
+      name = name;
+    };
+  };
+}

machines/retired/ash.nix

@@ -7,27 +7,29 @@ Hardware: -
   From:     2023
   Role:     Wireguard (VPN) Server
   Notes:    Thius vpn is for admin use only, to give access to all the servers via ssh
+
 */
-{
+
-  pkgs,
+{ pkgs, lib, nodes, ... }:
-  lib,
+let
-  nodes,
-  ...
-}: let
   # name of the server, sets teh hostname and record for it
   name      = "ash";
   ip_pub    = "193.1.99.75";
   ip_priv   = "172.20.20.5";
   # hostname  = "${name}.skynet.ie";
   hostname  = ip_pub;
+
 in {
   imports = [
+    # applications for this particular server
+    ../applications/firewall.nix
+    ../applications/dns.nix
   ];
 
   deployment = {
     targetHost = hostname;
     targetPort = 22;
-    targetUser = null;
+    targetUser = "root";
   };
 
   # these two are to be able to add the rules for firewall and dns
@@ -36,7 +38,7 @@ in {
     "ip daddr ${ip_pub} udp dport 51820 counter packets 0 bytes 0 accept"
   ];
 
-  services.skynet.dns.records = {
+  skynet_dns.records = {
     external = [
       "${name}       A       ${ip_pub}"
     ];
@@ -46,6 +48,7 @@ in {
     ];
   };
 
+
   age.secrets.wireguard.file = ../secrets/wireguard.age;
 
   networking = {
@@ -71,12 +74,12 @@ in {
       privateKeyFile = "/run/agenix/wireguard";
 
       peers = [
-        {
+        { # silver - Brendan
-          # silver - Brendan
           publicKey = "46jMR/DzJ4rQCR8MBqLMwcyr2tsSII/xeCjihb6EQgQ=";
           allowedIPs = [ "172.20.21.2/32" ];
         }
       ];
+
     };
   };
 
@@ -84,4 +87,5 @@ in {
     # needed to generate keys
     pkgs.wireguard-tools
   ];
+
 }

machines/retired/optimus.nix

@@ -1,45 +0,0 @@
-/*
-
-Name:     https://en.wikipedia.org/wiki/Optimus_Prime
-Why:      Created to sell toys so this vm is for games
-Type:     VM
-Hardware: -
-From:     2023
-Role:     Game host
-Notes:
-*/
-{
-  pkgs,
-  lib,
-  nodes,
-  arion,
-  ...
-}: let
-  # name of the server, sets teh hostname and record for it
-  name = "optimus";
-  ip_pub = "193.1.99.112";
-  hostname = "${name}.skynet.ie";
-  host = {
-    ip = ip_pub;
-    name = name;
-    hostname = hostname;
-  };
-in {
-  imports = [
-    ../applications/games.nix
-  ];
-
-  deployment = {
-    targetHost = hostname;
-    targetPort = 22;
-    targetUser = null;
-
-    tags = ["active"];
-  };
-
-  services.skynet = {
-    host = host;
-    backup.enable = true;
-    games.enable = true;
-  };
-}

machines/skynet.nix

@@ -6,41 +6,105 @@ Type:     VM
   Hardware: -
   From:     2023
   Role:     Webserver and member linux box
-Notes:    Does not host offical sites
+  Notes:
+
 */
-{
+
-  pkgs,
+{ pkgs, lib, nodes, inputs,  ... }:
-  lib,
+let
-  nodes,
+  # name of the server, sets teh hostname and record for it
-  inputs,
-  ...
-}: let
   name      = "skynet";
   # DMZ that ITD provided
   ip_pub    = "193.1.96.165";
+  ip_priv   = "193.1.99.79";
   hostname  = "${name}.skynet.ie";
-  host = {
+  hostname_int  = "${name}.int.skynet.ie";
-    ip = ip_pub;
+
-    name = name;
-    hostname = hostname;
-  };
 in {
   imports = [
-    ../applications/skynet_users.nix
+    ../applications/skynet.ie.nix
   ];
 
   deployment = {
-    targetHost = hostname;
+    targetHost = ip_priv;
     targetPort = 22;
-    targetUser = null;
+    targetUser = "root";
 
-    # this one is manually deployed
+    tags = [ "active-core" ];
-    tags = ["active-ext"];
+  };
+
+  # it has two network devices so two
+  skynet_dns.records = [
+    #{record=name;          r_type="A"; value=ip_pub;  server=true;}
+    {record=name;  r_type="A"; value=ip_priv; server=true; }
+    {record="ext"; r_type="A"; value=ip_pub;  server=false;}
+
+    {record="${name}.int"; r_type="A"; value=ip_priv; server=true;}
+    {record=ip_priv; r_type="PTR"; value=hostname_int;}
+  ];
+
+  services.skynet_backup = {
+    host = {
+      ip = ip_priv;
+      name = name;
+    };
+  };
+
+  # allow more than admins access
+  services.skynet_ldap_client = {
+    groups = [
+      "skynet-admins-linux"
+      "skynet-users-linux"
+    ];
+  };
+
+  proxmoxLXC.manageNetwork = true;
+  networking.hostName = name;
+  networking.interfaces = {
+    eth0.ipv4.addresses = [
+      {
+        address = ip_priv;
+        prefixLength = 26;
+      }
+    ];
+    eth1.ipv4.addresses = [
+      {
+        address = ip_pub;
+        prefixLength = 28;
+      }
+    ];
   };
 
   services.skynet = {
-    host = host;
+    host = {
-    backup.enable = true;
+      ip = ip_priv;
-    website_users.enable = true;
+      name = name;
     };
+  };
+
+  # from https://discourse.nixos.org/t/second-default-gateway/22220/5 and https://www.thomas-krenn.com/en/wiki/Two_Default_Gateways_on_One_System
+  networking = {
+    iproute2 = {
+      enable = true;
+      rttablesExtraConfig =
+      ''1 rt2'';
+    };
+  };
+
+  systemd.services.secondGateway = {
+    description = "External route.";
+    path = [pkgs.bash pkgs.iproute];
+    script = '' 
+       ip route add 193.1.96.160/28 dev eth1 src 193.1.96.165 table rt2                                                                                                    
+       ip route add default via 193.1.96.161 dev eth1 table rt2                                                                                                
+       ip rule add from 193.1.96.165/28 table rt2
+      ip rule add to 193.1.96.165/28 table rt2
+       '';
+    serviceConfig = {
+    Type= "oneshot";
+    User = "root";
+    Restart = "no";
+    };
+  };
+
 }

machines/vendetta.nix

@@ -7,59 +7,64 @@ Hardware: PowerEdge r210
   From:     2011 (?)
   Role:     DNS Server
   Notes:    Using the server that used to be called Earth
+
 */
-{
+
-  pkgs,
+{ pkgs, lib, nodes, ... }:
-  lib,
+let
-  nodes,
-  ...
-}: let
   # name of the server, sets teh hostname and record for it
   name      = "vendetta";
   ip_pub    = "193.1.99.120";
   hostname  = "${name}.skynet.ie";
-  host = {
-    ip = ip_pub;
-    name = name;
-    hostname = hostname;
-  };
 in {
   imports = [
+    ./hardware/_base.nix
     ./hardware/RM002.nix
   ];
 
-  networking.hostName = name;
-
   deployment = {
     targetHost = ip_pub;
     targetPort = 22;
-    targetUser = null;
+    targetUser = "root";
 
     tags = [ "active-dns" "dns" ];
   };
 
   networking = {
     # needs to have an address statically assigned
-
+    interfaces = {
-    defaultGateway.interface = lib.mkForce "eno1";
+      eno1 = {
-    interfaces.eno1.ipv4.addresses = [
+        ipv4.addresses = [
           {
             address = "193.1.99.120";
             prefixLength = 26;
           }
         ];
       };
+    };
+  };
 
-  services.skynet = {
+  services.skynet_backup = {
-    host = host;
+    host = {
-    backup.enable = true;
+      ip = ip_pub;
-    dns = {
+      name = name;
+    };
+  };
+
+  skynet_dns = {
     server = {
       enable = true;
       # primary dns server (ns1)
       primary = true;
       ip = ip_pub;
     };
+
+    records = [
+      # vendetta IN A    193.1.99.120
+      {record=name;   r_type="A";   value=ip_pub; server=true;}
+      # 120      IN PTR  vendetta.skynet.ie.
+      {record=ip_pub; r_type="PTR"; value=hostname;}
+    ];
   };
-  };
+
 }

machines/vigil.nix

@@ -7,43 +7,49 @@ Hardware: -
   From:     2023
   Role:     DNS Server
   Notes:
+
 */
-{
+
-  pkgs,
+{ pkgs, lib, nodes, ... }:
-  lib,
+let
-  nodes,
-  ...
-}: let
   name      = "vigil";
   ip_pub    = "193.1.99.109";
   hostname  = "${name}.skynet.ie";
-  host = {
-    ip = ip_pub;
-    name = name;
-    hostname = hostname;
-  };
 in {
   imports = [
+
   ];
 
   deployment = {
     targetHost = ip_pub;
     targetPort = 22;
-    targetUser = null;
+    targetUser = "root";
 
     tags = [ "active-dns" "dns" ];
   };
 
-  services.skynet = {
+  services.skynet_backup = {
-    host = host;
+    host = {
-    backup.enable = true;
+      ip = ip_pub;
-    dns = {
+      name = name;
+    };
+  };
+
+  skynet_dns = {
     server = {
       enable = true;
       # secondary dns server (ns2)
       primary = false;
       ip = ip_pub;
     };
+
+    # this server will have to have dns records
+    records = [
+      # vigil IN A    193.1.99.109
+      {record=name;   r_type="A";   value=ip_pub; server=true;}
+      # 109   IN PTR  vigil.skynet.ie.
+      {record=ip_pub; r_type="PTR"; value=hostname;}
+    ];
   };
-  };
+
 }

machines/wheatly.nix

@@ -7,38 +7,45 @@ Hardware: -
   From:     2023
   Role:     Gitlab Runner
   Notes:
+
 */
-{
+
-  pkgs,
+{ pkgs, lib, nodes, ... }:
-  lib,
+let
-  nodes,
-  ...
-}: let
   # name of the server, sets teh hostname and record for it
   name      = "wheatly";
   ip_pub    = "193.1.99.78";
   hostname  = "${name}.skynet.ie";
-  host = {
+
-    ip = ip_pub;
-    name = name;
-    hostname = hostname;
-  };
 in {
   imports = [
-    ../applications/git/forgejo_runner.nix
+    ../applications/gitlab_runner.nix
   ];
 
   deployment = {
     targetHost = hostname;
     targetPort = 22;
-    targetUser = null;
+    targetUser = "root";
 
     tags = [ "active-gitlab" ];
   };
 
-  services.skynet = {
+
-    host = host;
+  skynet_dns.records = [
-    backup.enable = true;
+    {record=name;   r_type="A";   value=ip_pub; server=true;}
-    forgejo_runner.enable = true;
+    {record=ip_pub; r_type="PTR"; value=hostname;}
+  ];
+
+  services.skynet_backup = {
+    host = {
+      ip = ip_pub;
+      name = name;
     };
+  };
+
+  services.skynet_gitlab_runner = {
+    enable = true;
+    runner.name = "runner01";
+  };
+
 }

secrets/backup/restic_pw.age

@@ -1,19 +1,13 @@
 age-encryption.org/v1
--> ssh-ed25519 V1pwNA d/AgQuQidsB5+UMBxg3/YIA/4EVMF9+BeZrEMzgU52Y
+-> ssh-ed25519 V1pwNA 5icNZy9IB42T2Xnph6z0VGznaxiB0MHtC4yBUEOM534
-gPmTDd4oeIwwJ5ZdnWp/s6cEupsYPY08TBvmL5fe3NE
+avacsmljAR4DA0pdHq42o2YunyLweTjaX91QiuO7/0U
--> ssh-ed25519 4PzZog iR02KGER5WMrs4djPPpMRc3v5qN5FpcpjTkB+O4GyV0
+-> ssh-ed25519 rIwlvw r7IUmFs46NLNgITxj2hNMv2neldFI/OXlzpQOOZ/XD0
-ibvzSePq1ruF03QBsHRr40VCZ6ZcnWjvcJzybB5vt4g
+MkBLRr4uXWXW/xTo0EtkX2y5nbSwEfc6ChkaiIu8VoM
--> ssh-ed25519 dA0vRg pVsTTA9yknN8gl6K/CkY/HnUc8eW1F/pSqXq/Upq3SE
+-> ssh-ed25519 q8eJgg jetnUDWCkX8P4fcvb3hA12TJolDKO2ZqcdmxUmx5myA
-3ymQH0jBAk9ktwBUvth8G9ZdDzr9Ozqi9YNVB8fyvGE
+Ru2q2Y8+iIe7imaXeb9MTZyOoCv4P45SNgxGGxQlVRI
--> ssh-ed25519 5Nd93w fSPTiW3c4va0F5IYoFF+QoN4u1tFGRBrMO9lypICiXo
+-> ssh-ed25519 mKj+iw wwsRXk+Wn3u+y+b/b3Fg6hSmJiV38tmYgRJqsStMnU0
-8MgZPPUXJGGOdmGknXhaV0xgJl76dg9B1e5r0Ud/iW8
+avS7XgN/GYVi+2pjNTG+CZOLcKo+cPpCEPCVZV3DHF4
--> ssh-ed25519 q8eJgg UFiK3B6YB3YR8fVOWOPLlpGuo5pWpK6b7zteIngC2Cc
+-> '$-grease y'
-K+e9B1V7AdimOMdy7YCJ7tJnHsHoQChAmWmOJDIdwMU
+VGZ3E4+qHDVztqvY45Bo65M
--> ssh-ed25519 KVr8rw FeMibaL1ITDNByDL26VRXVz6d2FP13SpKoN87RgTYDo
+--- u6b8TLW9fI2nKMvP1HCIRk8vIHWLrY3U1K8wse/s72s
-e0LPmpAe9wRRvgKTYq96Qk+WiUhfixiatuWPPi72Nlk
+üvÌTK&|lÿ4.àó~Ìo	
C§&ñ£0̤Úì9ŹÀúIƈúûïöwÚ<77>^–„ sªÚ÷„H=<3D>­3Ã|E-C˜óøÌo×Ó×þCÂõ8Mç¸pø 6Ùk LžoM
--> ssh-ed25519 fia1eQ i5+7lIZDOm48wywy6CRMOLVhHWnmV71WM0QLSbyhqV4
-S5nAEPHEmAn3AGxN04FpVKwVHrWtZS2s/dPeVv4ryCE
--> ssh-ed25519 3pl/Kw Mhc4y4szabQQaeBWtZ7mVdDnZYRwtninrBhcyHoUm24
-lQpLgpgU0ak9WDQIJxd5Yz/DUe14szLvsUGxAil+5dk
---- eUzkrzEEXETs3FXa2YqSW4yqQiRLFC8Umr1D+Bq334c
-ڙءm“	}ïÁý9Ž.›û‚”I^éY%Kcö¨SšÒÈ®#ö¤hVó„Á{þ7Z'i¸<¡Z#–s<E28093>íÆ<C3AD>šs.	Þ<>„zÒIW=†WÀuþ7ϱÚàX

secrets/bitwarden/id.age

@@ -1,19 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 V1pwNA xqavLiNuEoc7Gn7MchvoSEC2RrsFDrf9MEGFYVf5vEs
-ZwOkERtRi8yxlZ6sUl+mzJ+YFw/h82vV0WzhRjQOTo0
--> ssh-ed25519 4PzZog eiC4yLeOytE1jTUaQDOxtVHsM2jJAvGLrI75XJXRCSA
-HJg+GqSKlXld1uB2WPTM28XEygsm3+4iObC7SCMWl8c
--> ssh-ed25519 dA0vRg rStUstoZRf0i7Ot/0Gn6zd1cQMQjDlLQ8ScEIM3XMXE
-PR2UGWuO5VOBVee3bndRxipU/m2ZRXMo0HQkX8pvTyk
--> ssh-ed25519 5Nd93w hn5Oo+ZoIG+UwAb/DUUJmkDcey35fG5WDBgbe494T2s
-TxUgeQb8UdxlowGV1/j2Tr7DTNqc6d56NGaFGZfeidQ
--> ssh-ed25519 q8eJgg vcWProg0hXGuIRVWXpFSzyS4Ei4YHSdq17A08avwCmI
-4iKGWyyGfCKEliEa/9r8y+D5LsyLglFvcUeXyzO+FCg
--> ssh-ed25519 KVr8rw 2kNscJDgyfKH6WrfSKWnX5dgRM0Kk7FztGhoJ89VUWw
-/biNgciz7/fDOyY6GfwEI57ESdUyRwmKaI4OG5pJs20
--> ssh-ed25519 fia1eQ lv06SnwwoBlmG4AVAeNpeIFgISkt6FktNuRq+P0eJgs
-VX8O0FYWrEyBVR13t8AkvIq1VpwFdkMX+wBUQHBzXPI
--> ssh-ed25519 IzAMqA b0DnkDgWeERguN/u9wgiBB1sbxHaMXmMZdPOJ14/UDg
-tmKw26Fs6iKbVq7BBK60UoQSjykp4BzLW59/ZbbD0hw
---- rR+hloCeC8YmoV34TBL7hLk/4CSfmYKwtAbmtUjHvKE
-<EFBFBD>7ü¶RHSIΔC#‡Ä/ù:öH•ôImId÷ëójkõlàa˜Ñlõb\ƒL¶²¬6Ø¥†/ôPÜ¢+c
º÷’U‰MÅYt©

secrets/bitwarden/secret.age

@@ -1,19 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 V1pwNA LbYb1XP9bLe1lcsAfGwPkK2/r2+TnkkEgfS9fi1YKRo
-Z20C/zQluu+Qanf4d9GSj4pLirCyqJpa60H9hodMt5k
--> ssh-ed25519 4PzZog IFlhg/gbQpiMugcQZUHwfAnSvhxCwW67XmfSNmYOSQE
-nOp4xPFMvIhUH9OUVz8B3L8GI+Um2egjHV0FgmdNwwM
--> ssh-ed25519 dA0vRg OAmV1KiprjoIgOPHCYcme2uLiU1xEdohTWA5CiN0yG8
-4/LHk5LCGrpMISvpjfo7QuhnRrE3ycFGwGTQ1i6VaZE
--> ssh-ed25519 5Nd93w jv27aiNze8Nxp2ohY7NIRtZv5lBxAdKYGWdqWD12zU0
-E5Rk0r8To4B39UsaZavEkAZlIPiaXswsShMgsyNPMoY
--> ssh-ed25519 q8eJgg /o798N6b1KlQfMM9gQf48TF9V7nXORxW4SOpcpYCuhI
-RVYXWwZLFL6ZUjGbmXBzEj0+Pe2wpZFPIj5yH9kRIwY
--> ssh-ed25519 KVr8rw +N2w/8vvD7/uG3TMYb+9vml/vZhLkoS+03KEDlQWNhs
-Hne+3S6vVc5Sx7QJ+OCrPCt4s5usZ7B7WwusnFQLmSo
--> ssh-ed25519 fia1eQ PJYYKfL1GolRt90KC52dvUyZ/HjWRJm9vMTjBvrCOkQ
-Xc7SpT5TZLTOORLO3uE8tPXKx7thUwaJi3ixngLRljM
--> ssh-ed25519 IzAMqA AtoNahZ3dTQasdfP3wf7U1RJyx//Kt82e1TMSIkW6QA
-neLAeCvnsl4RDq2H1slZJ+5i3JErqy4aRGoscpRUi/0
---- W8B6kla08fEkl4Kpp+0eAHj7B1j3WYCDcuwJvAIEW58
-)8ýG(ž¶	ìò<C3AC><C3B2>žÛær_št¤Ö©zµ¥|>¢od…ð×ù6µø*0j»…r‚´ñTü«\*v^#‚

secrets/dns_certs.secret.age

@@ -1,49 +1,27 @@
 age-encryption.org/v1
--> ssh-ed25519 V1pwNA 5xvtgxFvEOX/bVAOdBBF2Fyb0euGt95YjhOcfpGgHk4
+-> ssh-ed25519 V1pwNA 8GOIUD9Kw0Rgk9f0y4X/DAU1CJkIElC+ncXKTZqiI0M
-6oN4Xba0W5g/d3EX2aC4N6UFVf/oHGgdTxBcMbjIdHo
+fUaEgN+etR6cCO9RZYlS39sIL+3HoN4vbrNx3frV2MQ
--> ssh-ed25519 4PzZog SjAcOftaZBEAAZ/P+Z9OTira4/QLSMRefC+JkQcf0G8
+-> ssh-ed25519 rIwlvw oRJq+SnMgO14Vn9mas+cA7PxRsCTCH7nN1R1UnteXGQ
-zG0R3/r+PBjWj7WBABmHPXpqx18uLyuFMJKB2az9i2E
+id5gxG2xpSMFRtv0fuW/4gqYzNVWMnUnZQrHywO0cSo
--> ssh-ed25519 dA0vRg k8fekPA7w/QFMVnDfCrpOlfv531/nw9tO7B0d+mWHiA
+-> ssh-ed25519 q8eJgg 3YWRSNOeGqbxfZ5j41DHCjnnH1o7KLZpOZmPgiDTmBE
-jp+DndebWEdk9+wt/nvS0LfRsFf8T7+dMffWmx3tPw8
+HFL0tvUPf7ZPgH2e4KOXjQIhDsfU5h1Y/SjCGvnSvU8
--> ssh-ed25519 5Nd93w dYe/tZ5qHoacI1IBa7yvDL/grZU7Lc40gU8boQY8Wj0
+-> ssh-ed25519 XSrA6w y8Gqm8ATfOiWaafVP4a0Ah+KwXZFa767gw79UpFvyFo
-eBs8fYre18RGW8+RH4J4AleG3kNpCZ0agAfcojSCy2Y
+fGmxf6g/VN/A+fzy+eSkk+H+0nBRPwot1Vev5AU+Otc
--> ssh-ed25519 q8eJgg 9UZdBq2oZ29U/kzeNOGn+q8RbkLbJwM0eSJHqSLV6Ek
+-> ssh-ed25519 DVzSig 9oSFqSbP8NIve7/Li5MO0qoXY/j0mz1LoIi22nzNTmU
-vqa610t5XxHiKBSf7veOc09ZFYW7EF1KpIbCpdCsegw
+btg877VtFr/q6rq7KXVRoCIrZig4qYR8CaUCBKEhfWQ
--> ssh-ed25519 KVr8rw 1CkykLAC3c615TDRlOeI4GHmqu0VT2kclWkr+DT9dSM
+-> ssh-ed25519 SqDBmA PdB0Fa4Lv4tQn2Cw9ClOHRrCNR3igGsSVdMnunDmGBs
-0MyPNEmkHICQZxpKt0jBZpce13c+jn4WC7IJL4uWZHo
+7dW8yReE/Ti/9x6OE9xfP5jkm2QLV66lm/kG91AqE0k
--> ssh-ed25519 fia1eQ OtFYStmc1y+yqYNaNgHxEheIIVykYAa/uR0dKS4xX3Y
+-> ssh-ed25519 IzAMqA yLOTmqlrQ5VB6gCIjfvkCbuejVDRWCGPsJklZExfdnM
-c2HYDyrD6Db3FNLP8tebLngtS2S8LHsmHovbofsUk3U
+5E4F45VkETQqQWT9cJx4Owl9QxqbfliU4JtV6gj9C3s
--> ssh-ed25519 /Gb5gQ rAc4CqbqdkIAFystL0rLqGNH56GrKxOBamqhiIFAY3c
+-> ssh-ed25519 uZzB3g F0KPMYgCSJMgbh4DBewNHsfT8HtpF/eaces8AV/quF0
-RR+NsZe0HQdQv6SgeIqy9IcIChXdvrsspNDBngW6Byw
+32i2UGD2jRrba5oz9jO2P8uSstTi+FrdTreJh0wyv8c
--> ssh-ed25519 NtlN/A 93citgkp9Aj1LDK5UdzJqYVVYaWgt/Cc6yMJka+ccyY
+-> ssh-ed25519 Hb0ipQ MhOrRdOrE3HF1wlvea6jgcF2H+EvFy0VpwP2UcfA32k
-KTcyd/SygOLp4mPI1zGDTKCNT7LfVUw12Bw/qnTnMpE
+JpOvrHJaqP75uzEGuhbuAYrhaQ3mtoZmz1wf5KpfI0Q
--> ssh-ed25519 v2Y09A +fWNE2zU+lz5KGu2Ed2MHb9UXzJPUAUuBWilF/AS1Qo
+-> ssh-ed25519 uZzB3g 2Hv1za/ZTu/pL4F6ER0Q7nOEjfbbtTEyUM5wm/L0lCk
-UVJWnAjRcD7X6iA/heoWdZTcsUS+1VMG5leIHxWZGNA
+Fl7UfjUzkPEngUIq700EENUHdsU1cZBwGQVuaBOzl6M
--> ssh-ed25519 XSrA6w fft3i85PNprS9QqQo2yKr3lx3qHuSVFeVYuT5Gtfyng
+-> qY.@U-grease J
-lNOo2jQXvaMElQawI9x8vnQN5bnnNefEyYXD3YqwOwM
+zK/SyCeVwFefcB2JLa2au8egE7eHU8oEKKY54WUYfx3oSQqYdZdMTxMjY+97+lYj
--> ssh-ed25519 DVzSig a5q+imjqWqTzyM3aU+UvvGv3wH3RLTPl+kva+qVSSFs
+yjGCjir8pM4IQWDC
-Pobzi/5ZVyfGhVK4cMqvMqaAol9X4+P3hEaUeHdiacY
+--- xxKgKXQD88mrgIvmzV50SZw3xDKwEvRkQdaW14FdWOM
--> ssh-ed25519 uZzB3g B1D2S87+yPr66EikAqLw7s5pazfQeQUxAj4FFnk0nAE
+(V”xí’<C3AD>§†þ¿pj<08>Ý͆Fj0¢‚\'¹,A›æíößaë(ùâON€_<16>†e5Ì¿Tq<>§\JªÙGTÀò¦³ãâN‚á>»dDÝ¢-Ì®t0Öü$—Xò³×ê¢ywØÕnü¶S„•¬¹Y§ù¬:Ôƒ‚>‰î<`·¨‘zÎ(¶äW#†ùo÷a»YúM(oÅ<¥
Ή¿\®M¬|Vœp¥‹·Â'›zÒçXê÷
-3lEw0t99aSGqkZdi+ILl3+s+JWRKpY4BHLXdrHfFxng
+ý54f³þ©·Òò=‚Í¢–D]M.L$í“<cD@
--> ssh-ed25519 CqOTGQ urZpNzMYvDnGR1UgjgrRYp06gKWcTEWUDjyb4fdDTD0
-7jeFeoMBitwGFQLSynYVyIYsEhHe7A8mdl65goiX5c8
--> ssh-ed25519 IzAMqA QmtcH5afcef4NMRX4AMrUHW1tCPGOlJ+gIhhDFkUCSY
-I4Yg8vgoYGcsV43qq04+nrhzMJ20eaQjOD4EJM0z2xw
--> ssh-ed25519 Hb0ipQ CO7nQSSKrmkQ/C6DuJxesIMJmm99eQytLzJ+3/Q38AI
-/kBnqeivoQLMaAA7nX0t4/UAvcOIchEu9bJWxIuUOV0
--> ssh-ed25519 3pl/Kw qUD++i8FGbEAuqa+/v6f664tlVTwHGYF3AmTo0cuZyA
-vjImiKQm0SHiuO7jZTKRg/3MKzDExfE+p9ZT2nHZr4M
--> ssh-ed25519 SqDBmA BGwTqAeEptBFRbwwVkHZWX+OKQpALqrPvA2+Cl356D4
-Gg69WAtr+AAfYT1G+WcTSIlCbNqS5DyxsZw81DaBSkk
--> ssh-ed25519 UE6fcQ 4JZzLWThfgJQSNDDtDp8ayM7N9o5tQ6PVwKMj28inC8
-RyEWRmMbuXezYZntsTdVIbjy/YEbrflqMpirdg08UVQ
--> ssh-ed25519 YFaxCg LTsikBkuBwOuc2qrnTAMVtRawZyBosZScefH8qWIqzQ
-aLiVK7XFI8iDRTCGH2yJnUpydjTp7NF1Ygok6D2Fo44
--> ssh-ed25519 elCEeg TKQKeAvY3kn5IuvHoS0SWtX647nEn1txDftt7pPQEG8
-OPAFqPGdSS3Ud+gFtMXG0shrXSmVrIBzvwc19Ac1NJQ
--> ssh-ed25519 8vZ9CQ NGLF9epPqcfbQWcbtMeYIcH0jAZMvO4P7UbKtl8lGRY
-ZJ5afGOI32OYBpWs6pe15z2IB+5xgO04/OsKp6ixT5o
--> ssh-ed25519 rmrvjw tfgMxvtTE2vv2qQJtQk1J+YV2UC/2iZSs0nvbVzV1Hc
-HW86DML/9MXoTs0WWn/zNi4Rh9SBhaHl2WC2bkiLbmw
---- Q4amxZgWmdHcf7aqav2TpKA8KX8B8ZHuBhzIcKwbFTs
-E¾ã™r<0F><\Å?ë @î}ËkRÕ(ƒù­;È^3P–ÐJäO“ãSÜ‹Ø â`¶¦	sb?9ø¢¯Âÿx$ñû/<2F>ø~4ÊFŸv_¨þp4{5 GZ²f"’<<3C>x×"q‹ºbj¯:cTuWå>BͶ'<27>ã)/¥×]«ôÁÈëöà•wžÉK%þo	B*&Þ׫{\ZŒ•pë£KöŒƒ³Î¯k}ÏåíßÔ}P=Œ¸û·?
<õ¬ºyB…‡sbŠ„<C5A0>ÿѪ%â$¢#"

secrets/forgejo/runners/token.age

@@ -1,19 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 V1pwNA 8acWnck16a9QK194orAzlQgQKINum/cyUzJqO6i0rkg
-In2UpSbBR6QoTMTZR/GpZJN3x+5CK3hZcEvr5fORoOI
--> ssh-ed25519 4PzZog /YeuXUmWrWFohgOSEmUygaTax668bLZpYO2T7KXl8n8
-mgnBBIsPycR6RMhLk4HQei5xQLzVHiBHaooOzZdb4YA
--> ssh-ed25519 dA0vRg DidrxIBYvAfPkwNzQXy2+f6inafUafoX8cfUChA7l2Q
-/wfxyJAyrQ3Uycxwov+0b9pKKOxPP9mySRK5g4BzMnY
--> ssh-ed25519 5Nd93w i+oP7x/eHY/Roj4mdpOFHrBe5rxUL7/4617F4O3jPh8
-yTVD0dR3ljoUSv1qyuKcOvr1fMRm9C8YAZKKjURtCPk
--> ssh-ed25519 q8eJgg Y0yxgrLm9/E8nYBg6Yvd0GPbY7PwCJCumQ9CtgWFxxo
-9BfGPSP7pTTM8Dm9qXagKaw95hbqvvp7qsFkhQgQco4
--> ssh-ed25519 KVr8rw pXha2ebkoIFX9dMX3uRz+0rcbwcQ1mwPnLWp/wCzx10
-BQQ77pXJl75c6myecmKlEpqHtWB/rSdG6Pwpbxzcfbk
--> ssh-ed25519 fia1eQ gCgas1CqGNZ7n09J7iXOvh2xeGgoszn36ABZwiskBBw
-3a7WMN9aB6ZvwFyP98At9V9K99hD1vkvSJgnY16/JKY
--> ssh-ed25519 CqOTGQ DU1oon3RPo4MCdzigrM2+b3KnTzzTSG/WDSvtBaF1VE
-zwKaQnXT004dMojYFXPz9UERL4ULe7mPZ+vwlZMxFvY
---- FWICxx8MWe7awI8P5t0XsbA4Ye0zbxCdMbapTs325HI
-wûùÿŒ­-”¥d!Ñ×=gŸ&ÜžH¬©ó?÷IçÛ’ÚᕪªêÏ<C3AA>Ò¢Ù„öLÒLË-<08>Ù¸ÏñU¿?	)ûVýJæb®éÄÎC

secrets/gitlab/db_pw.age

@@ -1,19 +1,15 @@
 age-encryption.org/v1
--> ssh-ed25519 V1pwNA To9tGfYsutlmjqXZbFJ+TttdFAnbwY9odSMEOvItmgw
+-> ssh-ed25519 V1pwNA TjC5DbimRqNNh0UQsk2YMgxoVZOQkWsNB10TmlPZLUM
-Q8cWN1VF4bVisWVMOEA6IXqhe2JzPl/9M9UUXWWV0Bc
+H2H0Jpztcbn15L1Ff1teeWgZaoeKszVWG2GJKkBFuWA
--> ssh-ed25519 4PzZog e3OTx6aEjhNCwyiysZkbwSC8ecVvVaVNfZV/3iNpZCE
+-> ssh-ed25519 rIwlvw 9wk9lmhZBsiM5ifMGxlo+8YAKy325ru7u/MZA6gEzng
-o8jHkyg0lptJh2Iew9ZtVi3AUOSAtmDzBIz2nE4mj8k
+cAZ0/OqScj9x6vt4gvsrtqi36iIbT+n+iTySssKh3Fg
--> ssh-ed25519 dA0vRg 7smMdyMEq1stuvSBUsBZXJoeap4Aru6AsljjFPPpfiM
+-> ssh-ed25519 q8eJgg Jn7hc5D6m/P7qxdpfQ2hRKKQPchrwtKhV6crxW05RTs
-Ip5qA83bAGtYIeqv1w0yo5obRh+FWYJICgOU5+JoeYQ
+jM16eEteWG2ezgVnBB5t5JrhwnsAKr4cz8srqiWKzR8
--> ssh-ed25519 5Nd93w z16A2vTVGdxgKmgHoSySJ9K8cwrQglflrWDhBvZ7ME0
+-> ssh-ed25519 uZzB3g qC7Mr+9evdjoSka/x5criNYkuha4SuAp/yrCK6dcUWQ
-ILd92pWzyVGnTOXwovlZ3EX7LsFX06hqedW7Ov2CYII
+JPHRq5iV9aP2/tBPAuq8wI3eQN2JHH6jNZfK2Fckshk
--> ssh-ed25519 q8eJgg Rf7U0SdZsP4NEgiDl8Z99tCoOkIwrrl5s0aYpXOG6yQ
+-> ):,9TlwC-grease d?Jj?5><
-tg+Y2WHuokaCVI4CCxuv9UW3GIa8CMuX0JJEWTTkwjU
+I0u2aN62wlBng0jlPPGRwXz5zJbcxW7PLOwHkRkLuHcNNtimd5QpRcr984eBa2hD
--> ssh-ed25519 KVr8rw YUN5VlTaxW7Niwtm9+FTGOILOklbEGL5EVw1BucGvXA
+HF7n
-zXYcis5ANsDGPeFoV1aRzTJiOQY2P1ZLHsJDkE9RFT4
+--- 09T0lHOZiky+5dFYWvhtP6iEHrhHaub8bymCKwzOJmY
--> ssh-ed25519 fia1eQ TnSlOXGQ0BuVk25Yj9YpWWtYmonlM5h+uC9hUq3MM3E
+`–„¯Äú÷>Äb_x…+{®1ÌìÙd%‚g5li ]yû½ÜŠ­!$ºh6AGäïn ¨3¸SwNLRõ1Çòí¾L›ÐŠt
-8KrW7R5AgumY9wLVQyUmKlHD3zcUNIc+VU/X+vvY2LY
+q]A‹arÇÈŽD¦Ôד;MnæÔï§kþ41Wþ¤ÜØŸ•ÖŒc2YÇwoî>}Õ7PW(Ç)M„WʺMʯ€l³s<	)øÒE{$jÄ]
--> ssh-ed25519 uZzB3g 9ms4lu4KjQED/2AHQwr9oLd/6ws01IxuK7Z05CY6N3U
-H/4AnWwt5fnZMvWjmXdoe/Os5ttJFYsMmjaHHqBdAxo
---- zI2RSKtND2Ep69vshrRkM1KOiReF/m5vdY4jIH7NSvA
-ûì‹ënà›µ·ÞÒÜ
I¯ü$¨¬Í<C2AC>[ëP…Uó¯"ÕκZX„ñN<C3B1>nNg<19>† àú¶dP}¥GZ?<
/—!«÷c
„= üïhnZ`ß0‘²Âˆª1•nl‘±Üç»vÄÕfw<66>ÄjÓE@2<>1{ßù…Ð
úEØØg“|èñQ\2Ðóe¹~ÇšÁ=Ó¬¾]fdRnó¶á¸

secrets/gitlab/ldap_pw.age

@@ -1,19 +1,14 @@
 age-encryption.org/v1
--> ssh-ed25519 V1pwNA aYjPUkjZHoQm86XHx3VbGswLy6VdKNaaHe3f3CGa1ls
+-> ssh-ed25519 V1pwNA D1opPiqtt5raCD0PE2+On/Zgw+lavSHgYKbtJF+1xhc
-HMuWoZj4tY/nWj1nrgOxob1hJJD/mPD3kQnDgJJafeI
+jIN+eavLzY3UB8qCBWOOr/r6IZX1MZ0RTlKfJTtSbcE
--> ssh-ed25519 4PzZog GojGaXIg5RK7WjJSCZxJksXvsm9TZTlbHITuksMivBY
+-> ssh-ed25519 rIwlvw z1zGn7NX5x9n75SM8oXOkvRwoAwyCXvzqZhWMXOGImE
-4oAuKXtJ4ksvusFX3OM3VpdzfArrglxJTN8kCdhIjrU
+NWsqkm+nDv2dQDCnhfaWpKaBaF9nrQA5PKFl3FthtI8
--> ssh-ed25519 dA0vRg AzGx90D7iz93gHtSvV5oIbBkwgQEpVY7DTRQIZ16IiQ
+-> ssh-ed25519 q8eJgg icVubOVJOSB3Wd7vnvEShwy7CsAMJchY/vuIMt0+p2E
-GlMsor4NxuhHs1HJg62O3ZtPF6CHHFc46din6fm89G8
+OBz5wsfT3STCzzgmBgPdSQWr+xc91Dfo+ulleLK9l1k
--> ssh-ed25519 5Nd93w oAyaZjUSGC9moA7pLR4+dzoKAggFuKUNMnRbn/fm2FQ
+-> ssh-ed25519 uZzB3g gkyX8KZKJ6NL4OpsxKVKVK37ikAp9yAGxUjd0iLWzXQ
-eHa/2iLWrqv/pPXjgfxtk68MgBX6EYW1YWfs1kXkazU
+Nuk8JFO6wrjmDKiLnDaqBqW+AY7+DHYLSeV9gf5H5Aw
--> ssh-ed25519 q8eJgg xBdXNLjZqKi2o+cbCXGdOOSFnlfPgaxjQb+IK60MYHw
+-> V8-grease #% :0txQ >
-dxV3kTuaJ1ANFgRaYchwAa0kjGZHZ3POc/Wrw/per+w
+CP/AZC0nCj41Lly+GryRa2gmYFG8lsY30DtG7NgqY6AVj0bVHbwwOzx9oGA3xtu1
--> ssh-ed25519 KVr8rw TR3AjhWy5K1ntzMx3mZZZWGYi7EvcWiFpTHyU/+pV3Q
++KsWhWAcvxc
-Y/xu0hrhaFZdO9YY8vINp3796HZ+LAL+QvBmIWmoS7A
+--- LL4fxXc9VX5VeGj5epHEIkLmpab/t7x8YMyNgkYsFLQ
--> ssh-ed25519 fia1eQ zF6CArF4sVXzIRenfDq7WHz06WXFdo7vMgD15NI/sR4
+Õbëïþ^NX¶q½•ÿƒ´8 Ï*:Ñ¥Ë QYb£Ï~ %¨ñc?ÓbÏ›[‹‘1EŒÐHå؈›ÈC‹ÞÈÿö}+œ0~‘avžPîrj#”KP’`Å<>Å÷‘®;
PÉ13±‚°íˆƒ¯´_mÒ=L­ù#
dµr†*vúp"ßÕ8Ûë’<<3C>]—thî,D•›¿¸
‡Ø[`á-ˆ
-m3sGJNMtAeY/yIq+D2nNncGNxX+KKXt0wCO1WMZmSTI
--> ssh-ed25519 uZzB3g pTocgT3gT7VHD7BWt+rGRIqUZYuh2G+1VeTJxyb7Xxs
-q5UYfrUVbgaqJCxWKegc0q0PvPR6AZ7AlI5ff4ePfjM
---- 9KS9xFBleYVsxyktikZ+TX9++1wqXmDBZxU3g7vwwLU
-<{r<>U/˜½Œ°ßR¦*°Jd)¥<>“»,#
ø9ns!LsÈW#_ÙwÒ<77>¤äÃéÐMÃM‰Ãýð8sÏØ]ß•üƒ—8ð3ˆ¤7@·YNØçXlÿ¸æÜ庚¾Il^0p"aºMf«¬çG SÂdBŸ/»sêéÌ×,¡4!ãÌ<C3A3>rPÖ¢Ñ-Cáòky‚<H˜ƒÆ	ÞZì'