Compare commits
1 commit
main
...
#70-loggin
Author | SHA1 | Date | |
---|---|---|---|
152bc676fc |
105 changed files with 1838 additions and 3556 deletions
|
@ -1,59 +0,0 @@
|
|||
name: Build_Deploy
|
||||
|
||||
on:
|
||||
workflow_run:
|
||||
workflows: [ "Update_Flake" ]
|
||||
types:
|
||||
- completed
|
||||
push:
|
||||
branches:
|
||||
- 'main'
|
||||
paths:
|
||||
- applications/**/*
|
||||
- machines/**/*
|
||||
- secrets/**/*
|
||||
- flake.*
|
||||
- config/**/*
|
||||
- .forgejo/**/*
|
||||
|
||||
jobs:
|
||||
linter:
|
||||
runs-on: nix
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- run: nix fmt -- --check .
|
||||
- run: nix --version
|
||||
|
||||
#if: github.repository == 'Skynet/nixos'
|
||||
build:
|
||||
runs-on: nix
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- run: nix develop -v
|
||||
# - name: Archive Test Results
|
||||
# if: always()
|
||||
# run: sleep 100m
|
||||
# - run: colmena build -v --on @active-dns
|
||||
# - run: colmena build -v --on @active-core
|
||||
# - run: colmena build -v --on @active
|
||||
# - run: colmena build -v --on @active-ext
|
||||
# - run: colmena build -v --on @active-git
|
||||
|
||||
deploy_dns:
|
||||
runs-on: nix
|
||||
needs: [ linter, build ]
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- run: colmena apply -v --on @active-dns --show-trace
|
||||
shell: bash
|
||||
|
||||
deploy_active:
|
||||
strategy:
|
||||
matrix:
|
||||
batch: [ active-core, active, active-ext ]
|
||||
runs-on: nix
|
||||
needs: [ deploy_dns ]
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- run: colmena apply -v --on @${{ matrix.batch }} --show-trace
|
||||
shell: bash
|
|
@ -1,12 +0,0 @@
|
|||
name: Update_Forgejo
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
deploy:
|
||||
runs-on: nix
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- run: colmena apply -v --on @active-git --show-trace
|
||||
shell: bash
|
|
@ -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 }}"
|
|
@ -1,41 +0,0 @@
|
|||
# The websites can sometimes cause issues when being built and deployed
|
||||
# This pipeline is to update the inputs from the server
|
||||
|
||||
name: Update_Flake_Websites
|
||||
|
||||
run-name: "[Update Flake Websites]"
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
|
||||
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 skynet_website_2003
|
||||
shell: bash
|
||||
- run: nix flake update skynet_website_2006
|
||||
shell: bash
|
||||
- run: nix flake update skynet_website_2016
|
||||
shell: bash
|
||||
- run: nix flake update skynet_website_2021
|
||||
shell: bash
|
||||
- run: nix flake update skynet_website_2023
|
||||
shell: bash
|
||||
- run: nix flake update skynet_website_2024
|
||||
shell: bash
|
||||
- run: nix flake update skynet_website
|
||||
shell: bash
|
||||
- uses: https://github.com/stefanzweifel/git-auto-commit-action@v5
|
||||
with:
|
||||
commit_message: "Updated flake for Websites"
|
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -6,9 +6,6 @@
|
|||
*.tmp
|
||||
tmp
|
||||
|
||||
# open office tmp lockfiles
|
||||
.~lock.*
|
||||
|
||||
# Test files
|
||||
test.*
|
||||
*.test.*
|
||||
|
|
|
@ -30,7 +30,7 @@ update:
|
|||
# the part that updates the flake
|
||||
- nix --experimental-features 'nix-command flakes' flake lock --update-input $PACKAGE_NAME
|
||||
- git add flake.lock
|
||||
- git commit -m "Updated flake for $PACKAGE_NAME" || echo "No changes, nothing to commit"
|
||||
- git commit -m "[skip ci] Updated flake for $PACKAGE_NAME" || echo "No changes, nothing to commit"
|
||||
# we have a custom domain
|
||||
- git remote rm origin && git remote add origin ssh://git@gitlab.skynet.ie:2222/compsoc1/skynet/nixos.git
|
||||
- git push origin HEAD:$CI_COMMIT_REF_NAME
|
||||
|
@ -48,14 +48,12 @@ sync_repos:
|
|||
- chmod +x ./sync.sh
|
||||
- ./sync.sh
|
||||
rules:
|
||||
- if: $UPDATE_FLAKE == "yes"
|
||||
when: never
|
||||
- if: '$CI_PROJECT_NAMESPACE == "compsoc1/skynet" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
|
||||
changes:
|
||||
- changes:
|
||||
- sync/repos.csv
|
||||
|
||||
.scripts_base: &scripts_base
|
||||
# load nix environment
|
||||
- git pull origin $CI_COMMIT_REF_NAME
|
||||
- . "$HOME/.nix-profile/etc/profile.d/nix.sh"
|
||||
- nix --extra-experimental-features 'nix-command flakes' profile install nixpkgs#colmena
|
||||
|
||||
|
@ -70,8 +68,6 @@ sync_repos:
|
|||
- nix --extra-experimental-features 'nix-command flakes' profile install nixpkgs#attic-client
|
||||
- attic login skynet https://nix-cache.skynet.ie/ $CACHE_KEY
|
||||
- attic use skynet-cache
|
||||
# add any new items to the cache
|
||||
- attic watch-store skynet-cache &
|
||||
|
||||
# every commit on main will build and deploy
|
||||
.build_template: &builder
|
||||
|
@ -81,8 +77,6 @@ sync_repos:
|
|||
- *scripts_base
|
||||
- *scripts_cache
|
||||
rules:
|
||||
- if: $UPDATE_FLAKE == "yes"
|
||||
when: never
|
||||
- changes:
|
||||
- applications/**/*
|
||||
- machines/**/*
|
||||
|
@ -98,8 +92,6 @@ sync_repos:
|
|||
- *scripts_base
|
||||
- *scripts_cache
|
||||
rules:
|
||||
- if: $UPDATE_FLAKE == "yes"
|
||||
when: never
|
||||
- if: '$CI_PROJECT_NAMESPACE == "compsoc1/skynet" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
|
||||
changes:
|
||||
- flake.nix
|
||||
|
@ -119,12 +111,12 @@ build:
|
|||
<<: *builder
|
||||
stage: test
|
||||
script:
|
||||
- nix --extra-experimental-features 'nix-command flakes' develop
|
||||
- attic watch-store skynet-cache &
|
||||
- colmena build -v --on @active-dns
|
||||
- colmena build -v --on @active-core
|
||||
- colmena build -v --on @active
|
||||
- colmena build -v --on @active-ext
|
||||
- colmena build -v --on @active-git
|
||||
- colmena build -v --on @active-gitlab
|
||||
|
||||
# dns always has to be deployed first
|
||||
deploy_dns:
|
||||
|
@ -161,11 +153,12 @@ deploy_ext:
|
|||
- deploy_dns
|
||||
script:
|
||||
- colmena apply -v --on @active-ext
|
||||
allow_failure: true
|
||||
|
||||
deploy_gitlab:
|
||||
<<: *builder
|
||||
<<: *deployment
|
||||
stage: deploy_gitlab
|
||||
script:
|
||||
- colmena apply -v --on @active-git
|
||||
- colmena apply -v --on @active-gitlab
|
||||
when: manual
|
||||
|
|
|
@ -1,49 +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'
|
||||
SKYNET_FIREWALL_00034,Add,i25-01-26_075,Complete,All,-,193.1.99.91,SKYNET00017,-,23318-23325,Ports for Minecraft Bedrock on the main games server.
|
||||
SKYNET_FIREWALL_00035,Add,i25-02-14_114,Complete,193.1.99.75,SKYNET00008,193.1.96.165,SKYNET00012,22,-,Allow our forgejo runner to access and deploy to teh external server
|
||||
SKYNET_FIREWALL_00036,Add,i25-03-11_125,Complete,All,-,193.1.99.86,SKYNET00027,25,-,Email Filter
|
||||
SKYNET_FIREWALL_00037,Add,i25-03-30_018,Complete,All,-,193.1.99.91,SKYNET00017,27015/27016/27020,27015/27020,CSGO/TF2 Ports
|
|
|
@ -1,28 +0,0 @@
|
|||
Index,Name,Status,IP_Address,OS,Description
|
||||
SKYNET00001,agentjones,Active,193.1.99.072,Nixos-24.05,Firewall (currently not active)
|
||||
SKYNET00002,vendetta,Active,193.1.99.120,Nixos-24.05,DNS Nameserver 1
|
||||
SKYNET00003,jarvis,Active,193.1.99.073,Proxmox,VM Host
|
||||
SKYNET00004,vigil,Active,193.1.99.109,Nixos-24.05,DNS Nameserver 2
|
||||
SKYNET00005,galatea,Active,193.1.99.111,Nixos-24.05,ULFM Radio
|
||||
SKYNET00006,optimus,Retired,193.1.99.112,Nixos-24.05,Retired Games server
|
||||
SKYNET00007,kitt,Active,193.1.99.074,Nixos-24.05,"LDAP and Self-Service Password/Account management, also hosts our Discord bot"
|
||||
SKYNET00008,glados,Active,193.1.99.075,Nixos-24.05,Gitlab server
|
||||
SKYNET00009,gir,Active,193.1.99.076,Nixos-24.05,Email and Webmail
|
||||
SKYNET00010,wheatly,Active,193.1.99.078,Nixos-24.05,Gitlab Runner
|
||||
SKYNET00011,earth,Active,193.1.99.079,Nixos-24.05,Offical website host
|
||||
SKYNET00012,skynet,Active,193.1.96.165,Nixos-24.05,Skynet server. (DMZ)
|
||||
SKYNET00013,neuromancer,Active,193.1.99.080,Nixos-24.05,Local Backup Server
|
||||
SKYNET00014,cadie,Active,193.1.99.077,Nixos-24.05,"Services VM, has nextcloud to start with"
|
||||
SKYNET00015,marvin,Active,193.1.99.081,Nixos-24.05,Trainee testing server
|
||||
SKYNET00016,optimus,Retired,193.1.99.090,Debian-12,Games server manager (replacing SKYNET00006 soon)
|
||||
SKYNET00017,bumblebee,Retired,193.1.99.091,Debian-12,Game server - Minecraft
|
||||
SKYNET00018,calculon,Active,193.1.99.082,Nixos-24.05,"Public Services such as binary cache, Open Governance and Keyserver"
|
||||
SKYNET00019,deepthought,Active,193.1.99.112,Nixos-24.05,Backup Test Server using restic
|
||||
SKYNET00020,ariia,Active,193.1.99.083,Nixos-24.05,"Metrics, Grafana and Prometheus"
|
||||
SKYNET00021,ash,Active,193.1.99.114,NA,Server Room Network access
|
||||
SKYNET00022,ultron,Active,193.1.99.084,Proxmox,VM Host
|
||||
SKYNET00023,optimus-test,Retired,193.1.99.085,Nixos,Testing flake for Pelecian
|
||||
SKYNET00024,optimus,Active,193.1.99.090,Nixos,Games server manager (replaced SKYNET00016)
|
||||
SKYNET00025,bumblebee,Active,193.1.99.091,Nixos,Game server - Minecraft (replaced SKYNET00017)
|
||||
SKYNET00026,vision,Active,193.1.99.085,Raspbian,Proxmox Qurom server
|
||||
SKYNET00027,mimi,Active,193.1.99.086,Proxmox-Mail-Gateway,Proxmox Mail Gateway
|
|
|
@ -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
|
|
|
@ -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
|
|
19
ITD_Firewall.csv
Normal file
19
ITD_Firewall.csv
Normal file
|
@ -0,0 +1,19 @@
|
|||
Index,Status,Name,IP_Address,DNS_Name,Ports TCP,Ports UDP,Tunnel,Ports_Requested,Related_Tickets,Description
|
||||
SKYNET00001,Active,agentjones,193.1.99.72,agentjones,,,,,,Firewall (currently not active)
|
||||
SKYNET00002,Active,vendetta,193.1.99.120,vendetta/ns1,,53,,,,DNS Nameserver 1
|
||||
SKYNET00003,Active,jarvis,193.1.99.73,jarvis,,,,,,VM Host
|
||||
SKYNET00004,Active,vigil,193.1.99.109,vigil/ns2,,53,,,,DNS Nameserver 2
|
||||
SKYNET00005,Active,galatea,193.1.99.111,galatea/stream,80/443 8000,,,,,ULFM Radio
|
||||
SKYNET00006,Retired,optimus,193.1.99.112,optimus/games/*.games,80/443 25565,,,,,Retired Games server
|
||||
SKYNET00007,Active,kitt,193.1.99.74,kitt/account/api.account,443,,,-> skynet:9000-9020,i23-07-28_010,"LDAP and Self-Service Password/Account management, also hosts our Discord bot"
|
||||
SKYNET00008,Active,glados,193.1.99.75,glados/gitlab/*.pages.gitlab,80/443,,,,i23-05-18_249,Gitlab server
|
||||
SKYNET00009,Active,gir,193.1.99.76,gir/mail/imap/pop3/smtp,80/443 25/143/993/587/465,,,4190,i23-06-19_525/i23-06-19_525,Email and Webmail
|
||||
SKYNET00010,Active,wheatly,193.1.99.78,wheatly,,,-> skynet:22,,,Gitlab Runner
|
||||
SKYNET00011,Active,earth,193.1.99.79,earth,80/443,,,,i23-06-19_525,Offical website host
|
||||
SKYNET00012,Active,skynet,193.1.96.165,skynet/*.users,22 80/443,,,,i23-06-30_024,Skynet server. (DMZ)
|
||||
SKYNET00013,Active,neuromancer,193.1.99.80,neuromancer,,,,,,Local Backup Server
|
||||
SKYNET00014,Active,cadie,193.1.99.77,cadie/nextcloud/onlyoffice.nextcloud,80/443,,,,i23-10-27_014,"Services VM, has nextcloud to start with"
|
||||
SKYNET00015,Active,marvin,193.1.99.81,marvin,,,,,,Trainee testing server
|
||||
SKYNET00016,Active,optimus,193.1.99.90,,80/443,,,8080,i24-02-16_065,Games server manager (replacing SKYNET00006 soon)
|
||||
SKYNET00017,Active,bumblebee,193.1.99.91,,25518-25525,19132 24418-24425,,,i24-02-16_065,Game server - Minecraft
|
||||
SKYNET00018,Active,calculon,193.1.99.82,,,,,80/443,,"Public Services such as binary cache, Open Governance and Keyserver"
|
|
9
LICENSE
9
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.
|
|
@ -1,6 +1,5 @@
|
|||
https://web.archive.org/web/20180815150202/https://wiki.skynet.ie/Admin/SkynetMachines
|
||||
https://en.m.wikipedia.org/wiki/Category:Fictional_artificial_intelligences
|
||||
https://en.wikipedia.org/wiki/List_of_artificial_intelligence_films
|
||||
|
||||
* agentsmith
|
||||
* skynet
|
||||
|
|
|
@ -43,7 +43,7 @@ colmena build --on @active-dns
|
|||
Deploying is putting (apply-ing) the config tat was built onto the server, there is no need to build first, it will automatically do so.
|
||||
|
||||
While the ***recommended way of deploying is using the CI/CD process*** there are times when you will have to manually deploy the config.
|
||||
One such case is the ``@active-git`` group if either Gitlab or Gitlab-runner got updated.
|
||||
One such case is the ``@active-gitlab`` group if either Gitlab or Gitlab-runner got updated.
|
||||
Another is if ye have fecked up DNS.
|
||||
|
||||
Your ``~/.ssh/config`` should be set up as follows and you should be a member of ``skynet-admins-linux``
|
||||
|
@ -60,10 +60,10 @@ Then you can run the following commands like so:
|
|||
```shell
|
||||
colmena apply
|
||||
colmena apply --on @active-dns
|
||||
colmena apply --on @active-git
|
||||
colmena apply --on @active-gitlab
|
||||
```
|
||||
|
||||
The CI/CD pipeline has a manual job that can be triggered to update ``@active-git`` if you know it wont cause issues.
|
||||
The CI/CD pipeline has a manual job that can be triggered to update ``@active-gitlab`` if you know it wont cause issues.
|
||||
|
||||
### Agenix
|
||||
|
||||
|
|
|
@ -9,24 +9,9 @@ with lib; let
|
|||
cfg = config.services.skynet;
|
||||
in {
|
||||
imports = [
|
||||
# every server needs to have a dns record
|
||||
./dns/dns.nix
|
||||
|
||||
# every server should have proper certs
|
||||
./acme.nix
|
||||
./dns.nix
|
||||
./nginx.nix
|
||||
|
||||
# every server may need the firewall config stuff
|
||||
./firewall.nix
|
||||
|
||||
# every server needs teh ldap client for admins
|
||||
./ldap/client.nix
|
||||
|
||||
# every server will need the config to backup to
|
||||
./restic.nix
|
||||
|
||||
# every server will be monitored for grafana
|
||||
./prometheus.nix
|
||||
];
|
||||
|
||||
options.services.skynet = {
|
||||
|
@ -42,16 +27,6 @@ in {
|
|||
type = types.str;
|
||||
default = "${cfg.host.name}.skynet.ie";
|
||||
};
|
||||
interface = mkOption {
|
||||
type = types.str;
|
||||
description = "Will most likely be ``eno1`` for physical servers.";
|
||||
default = "eth0";
|
||||
};
|
||||
cidr = mkOption {
|
||||
type = types.int;
|
||||
description = "Most of our servers are /26, ";
|
||||
default = 26;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -70,23 +45,6 @@ in {
|
|||
}
|
||||
];
|
||||
|
||||
# use lix instead of nix
|
||||
nix.package = pkgs.lixPackageSets.stable.lix;
|
||||
|
||||
# set
|
||||
networking = {
|
||||
hostName = cfg.host.name;
|
||||
defaultGateway.interface = lib.mkForce cfg.host.interface;
|
||||
|
||||
# needs to have an address statically assigned
|
||||
interfaces."${cfg.host.interface}".ipv4.addresses = [
|
||||
{
|
||||
address = cfg.host.ip;
|
||||
prefixLength = cfg.host.cidr;
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
services.nginx = {
|
||||
virtualHosts = {
|
||||
# for every server unless explisitly defined redirect the ip to skynet.ie
|
||||
|
|
|
@ -10,6 +10,7 @@ with lib; let
|
|||
cfg = config.services.skynet."${name}";
|
||||
in {
|
||||
imports = [
|
||||
./dns.nix
|
||||
./nginx.nix
|
||||
./games/minecraft.nix
|
||||
];
|
||||
|
|
|
@ -13,6 +13,10 @@ with lib; let
|
|||
short_domain = "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}";
|
||||
in {
|
||||
imports = [
|
||||
../acme.nix
|
||||
../dns.nix
|
||||
../firewall.nix
|
||||
../nginx.nix
|
||||
inputs.arion.nixosModules.arion
|
||||
];
|
||||
|
||||
|
|
|
@ -27,19 +27,20 @@ in {
|
|||
age.secrets.acme.file = ../secrets/dns_certs.secret.age;
|
||||
|
||||
security.acme = {
|
||||
preliminarySelfsigned = false;
|
||||
acceptTerms = true;
|
||||
|
||||
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;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
324
applications/bitwarden/bitwarden-directory-connector-cli.nix
Normal file
324
applications/bitwarden/bitwarden-directory-connector-cli.nix
Normal file
|
@ -0,0 +1,324 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.services.bitwarden-directory-connector-cli;
|
||||
in {
|
||||
disabledModules = ["services/security/bitwarden-directory-connector-cli.nix"];
|
||||
|
||||
options.services.bitwarden-directory-connector-cli = {
|
||||
enable = mkEnableOption "Bitwarden Directory Connector";
|
||||
|
||||
package = mkPackageOption pkgs "bitwarden-directory-connector-cli" {};
|
||||
|
||||
domain = mkOption {
|
||||
type = types.str;
|
||||
description = lib.mdDoc "The domain the Bitwarden/Vaultwarden is accessible on.";
|
||||
example = "https://vaultwarden.example.com";
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
description = lib.mdDoc "User to run the program.";
|
||||
default = "bwdc";
|
||||
};
|
||||
|
||||
interval = mkOption {
|
||||
type = types.str;
|
||||
default = "*:0,15,30,45";
|
||||
description = lib.mdDoc "The interval when to run the connector. This uses systemd's OnCalendar syntax.";
|
||||
};
|
||||
|
||||
ldap = mkOption {
|
||||
description = lib.mdDoc ''
|
||||
Options to configure the LDAP connection.
|
||||
If you used the desktop application to test the configuration you can find the settings by searching for `ldap` in `~/.config/Bitwarden\ Directory\ Connector/data.json`.
|
||||
'';
|
||||
default = {};
|
||||
type = types.submodule ({
|
||||
config,
|
||||
options,
|
||||
...
|
||||
}: {
|
||||
freeformType = types.attrsOf (pkgs.formats.json {}).type;
|
||||
|
||||
config.finalJSON = builtins.toJSON (removeAttrs config (filter (x: x == "finalJSON" || ! options.${x}.isDefined or false) (attrNames options)));
|
||||
|
||||
options = {
|
||||
finalJSON = mkOption {
|
||||
type = (pkgs.formats.json {}).type;
|
||||
internal = true;
|
||||
readOnly = true;
|
||||
visible = false;
|
||||
};
|
||||
|
||||
ssl = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc "Whether to use TLS.";
|
||||
};
|
||||
startTls = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc "Whether to use STARTTLS.";
|
||||
};
|
||||
|
||||
hostname = mkOption {
|
||||
type = types.str;
|
||||
description = lib.mdDoc "The host the LDAP is accessible on.";
|
||||
example = "ldap.example.com";
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
default = 389;
|
||||
description = lib.mdDoc "Port LDAP is accessible on.";
|
||||
};
|
||||
|
||||
ad = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc "Whether the LDAP Server is an Active Directory.";
|
||||
};
|
||||
|
||||
pagedSearch = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc "Whether the LDAP server paginates search results.";
|
||||
};
|
||||
|
||||
rootPath = mkOption {
|
||||
type = types.str;
|
||||
description = lib.mdDoc "Root path for LDAP.";
|
||||
example = "dc=example,dc=com";
|
||||
};
|
||||
|
||||
username = mkOption {
|
||||
type = types.str;
|
||||
description = lib.mdDoc "The user to authenticate as.";
|
||||
example = "cn=admin,dc=example,dc=com";
|
||||
};
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
sync = mkOption {
|
||||
description = lib.mdDoc ''
|
||||
Options to configure what gets synced.
|
||||
If you used the desktop application to test the configuration you can find the settings by searching for `sync` in `~/.config/Bitwarden\ Directory\ Connector/data.json`.
|
||||
'';
|
||||
default = {};
|
||||
type = types.submodule ({
|
||||
config,
|
||||
options,
|
||||
...
|
||||
}: {
|
||||
freeformType = types.attrsOf (pkgs.formats.json {}).type;
|
||||
|
||||
config.finalJSON = builtins.toJSON (removeAttrs config (filter (x: x == "finalJSON" || ! options.${x}.isDefined or false) (attrNames options)));
|
||||
|
||||
options = {
|
||||
finalJSON = mkOption {
|
||||
type = (pkgs.formats.json {}).type;
|
||||
internal = true;
|
||||
readOnly = true;
|
||||
visible = false;
|
||||
};
|
||||
|
||||
removeDisabled = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = lib.mdDoc "Remove users from bitwarden groups if no longer in the ldap group.";
|
||||
};
|
||||
|
||||
overwriteExisting = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description =
|
||||
lib.mdDoc "Remove and re-add users/groups, See https://bitwarden.com/help/user-group-filters/#overwriting-syncs for more details.";
|
||||
};
|
||||
|
||||
largeImport = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc "Enable if you are syncing more than 2000 users/groups.";
|
||||
};
|
||||
|
||||
memberAttribute = mkOption {
|
||||
type = types.str;
|
||||
description = lib.mdDoc "Attribute that lists members in a LDAP group.";
|
||||
example = "uniqueMember";
|
||||
};
|
||||
|
||||
creationDateAttribute = mkOption {
|
||||
type = types.str;
|
||||
description = lib.mdDoc "Attribute that lists a user's creation date.";
|
||||
example = "whenCreated";
|
||||
};
|
||||
|
||||
useEmailPrefixSuffix = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc "If a user has no email address, combine a username prefix with a suffix value to form an email.";
|
||||
};
|
||||
emailPrefixAttribute = mkOption {
|
||||
type = types.str;
|
||||
description = lib.mdDoc "The attribute that contains the users username.";
|
||||
example = "accountName";
|
||||
};
|
||||
emailSuffix = mkOption {
|
||||
type = types.str;
|
||||
description = lib.mdDoc "Suffix for the email, normally @example.com.";
|
||||
example = "@example.com";
|
||||
};
|
||||
|
||||
users = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc "Sync users.";
|
||||
};
|
||||
userPath = mkOption {
|
||||
type = types.str;
|
||||
description = lib.mdDoc "User directory, relative to root.";
|
||||
default = "ou=users";
|
||||
};
|
||||
userObjectClass = mkOption {
|
||||
type = types.str;
|
||||
description = lib.mdDoc "Class that users must have.";
|
||||
default = "inetOrgPerson";
|
||||
};
|
||||
userEmailAttribute = mkOption {
|
||||
type = types.str;
|
||||
description = lib.mdDoc "Attribute for a users email.";
|
||||
default = "mail";
|
||||
};
|
||||
userFilter = mkOption {
|
||||
type = types.str;
|
||||
description = lib.mdDoc "LDAP filter for users.";
|
||||
example = "(memberOf=cn=sales,ou=groups,dc=example,dc=com)";
|
||||
default = "";
|
||||
};
|
||||
|
||||
groups = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc "Whether to sync ldap groups into BitWarden.";
|
||||
};
|
||||
groupPath = mkOption {
|
||||
type = types.str;
|
||||
description = lib.mdDoc "Group directory, relative to root.";
|
||||
default = "ou=groups";
|
||||
};
|
||||
groupObjectClass = mkOption {
|
||||
type = types.str;
|
||||
description = lib.mdDoc "A class that groups will have.";
|
||||
default = "groupOfNames";
|
||||
};
|
||||
groupNameAttribute = mkOption {
|
||||
type = types.str;
|
||||
description = lib.mdDoc "Attribute for a name of group.";
|
||||
default = "cn";
|
||||
};
|
||||
groupFilter = mkOption {
|
||||
type = types.str;
|
||||
description = lib.mdDoc "LDAP filter for groups.";
|
||||
example = "(cn=sales)";
|
||||
default = "";
|
||||
};
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
secrets = {
|
||||
ldap = mkOption {
|
||||
type = types.str;
|
||||
description = "Path to file that contains LDAP password for user in {option}`ldap.username";
|
||||
};
|
||||
|
||||
bitwarden = {
|
||||
client_path_id = mkOption {
|
||||
type = types.str;
|
||||
description = "Path to file that contains Client ID.";
|
||||
};
|
||||
client_path_secret = mkOption {
|
||||
type = types.str;
|
||||
description = "Path to file that contains Client Secret.";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
users.groups."${cfg.user}" = {};
|
||||
users.users."${cfg.user}" = {
|
||||
isSystemUser = true;
|
||||
group = cfg.user;
|
||||
};
|
||||
|
||||
systemd = {
|
||||
timers.bitwarden-directory-connector-cli = {
|
||||
description = "Sync timer for Bitwarden Directory Connector";
|
||||
wantedBy = ["timers.target"];
|
||||
after = ["network-online.target"];
|
||||
timerConfig = {
|
||||
OnCalendar = cfg.interval;
|
||||
Unit = "bitwarden-directory-connector-cli.service";
|
||||
Persistent = true;
|
||||
};
|
||||
};
|
||||
|
||||
services.bitwarden-directory-connector-cli = {
|
||||
description = "Main process for Bitwarden Directory Connector";
|
||||
|
||||
environment = {
|
||||
BITWARDENCLI_CONNECTOR_APPDATA_DIR = "/tmp";
|
||||
BITWARDENCLI_CONNECTOR_PLAINTEXT_SECRETS = "true";
|
||||
};
|
||||
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
User = "${cfg.user}";
|
||||
PrivateTmp = true;
|
||||
ExecStartPre = pkgs.writeShellScript "bitwarden_directory_connector-config" ''
|
||||
set -eo pipefail
|
||||
|
||||
# create the config file
|
||||
${lib.getExe cfg.package} data-file
|
||||
touch /tmp/data.json.tmp
|
||||
chmod 600 /tmp/data.json{,.tmp}
|
||||
|
||||
${lib.getExe cfg.package} config server ${cfg.domain}
|
||||
|
||||
# now login to set credentials
|
||||
export BW_CLIENTID="$(< ${escapeShellArg cfg.secrets.bitwarden.client_path_id})"
|
||||
export BW_CLIENTSECRET="$(< ${escapeShellArg cfg.secrets.bitwarden.client_path_secret})"
|
||||
${lib.getExe cfg.package} login
|
||||
|
||||
${lib.getExe pkgs.jq} '.authenticatedAccounts[0] as $account
|
||||
| .[$account].directoryConfigurations.ldap |= $ldap_data
|
||||
| .[$account].directorySettings.organizationId |= $orgID
|
||||
| .[$account].directorySettings.sync |= $sync_data' \
|
||||
--argjson ldap_data ${escapeShellArg cfg.ldap.finalJSON} \
|
||||
--arg orgID "''${BW_CLIENTID//organization.}" \
|
||||
--argjson sync_data ${escapeShellArg cfg.sync.finalJSON} \
|
||||
/tmp/data.json \
|
||||
> /tmp/data.json.tmp
|
||||
|
||||
mv -f /tmp/data.json.tmp /tmp/data.json
|
||||
|
||||
# final config
|
||||
${lib.getExe cfg.package} config directory 0
|
||||
${lib.getExe cfg.package} config ldap.password --secretfile ${cfg.secrets.ldap}
|
||||
'';
|
||||
|
||||
ExecStart = "${lib.getExe cfg.package} sync";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [Silver-Golden];
|
||||
}
|
|
@ -6,7 +6,9 @@
|
|||
}: let
|
||||
user = "bwdc";
|
||||
in {
|
||||
imports = [];
|
||||
imports = [
|
||||
./bitwarden-directory-connector-cli.nix
|
||||
];
|
||||
|
||||
options = {};
|
||||
|
||||
|
|
|
@ -13,6 +13,9 @@ with lib; let
|
|||
domain = "${domain_sub}.skynet.ie";
|
||||
in {
|
||||
imports = [
|
||||
../acme.nix
|
||||
../dns.nix
|
||||
../nginx.nix
|
||||
];
|
||||
|
||||
options.services.skynet."${name}" = {
|
||||
|
|
|
@ -21,6 +21,7 @@ in {
|
|||
#backups = [ "/etc/silver_ul_ical/database.db" ];
|
||||
|
||||
age.secrets.discord_token.file = ../secrets/discord/token.age;
|
||||
age.secrets.discord_ldap.file = ../secrets/discord/ldap.age;
|
||||
age.secrets.discord_mail.file = ../secrets/email/details.age;
|
||||
age.secrets.discord_wolves.file = ../secrets/wolves/details.age;
|
||||
|
||||
|
@ -30,9 +31,12 @@ in {
|
|||
|
||||
env = {
|
||||
discord = config.age.secrets.discord_token.path;
|
||||
ldap = config.age.secrets.discord_ldap.path;
|
||||
mail = config.age.secrets.discord_mail.path;
|
||||
wolves = config.age.secrets.discord_wolves.path;
|
||||
};
|
||||
|
||||
discord.server = "689189992417067052";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,32 +0,0 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
name = "discord_bot_t-800";
|
||||
cfg = config.services.skynet."${name}";
|
||||
in {
|
||||
imports = [
|
||||
inputs.skynet_discord_bot_t-800.nixosModule."x86_64-linux"
|
||||
];
|
||||
|
||||
options.services.skynet."${name}" = {
|
||||
enable = mkEnableOption "Logging Bot";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
#backups = [ "/etc/silver_ul_ical/database.db" ];
|
||||
|
||||
age.secrets.discord_t-800_details.file = ../secrets/discord/t-800.age;
|
||||
|
||||
# this is what was imported
|
||||
services.skynet_discord_bot_t-800 = {
|
||||
enable = true;
|
||||
|
||||
env = config.age.secrets.discord_t-800_details.path;
|
||||
};
|
||||
};
|
||||
}
|
|
@ -3,42 +3,19 @@
|
|||
pkgs,
|
||||
config,
|
||||
nodes,
|
||||
self,
|
||||
...
|
||||
}: let
|
||||
name = "dns";
|
||||
cfg = config.services.skynet."${name}";
|
||||
|
||||
# reads that date to a string (will need to be fixed in 2038)
|
||||
current_date = self.lastModified;
|
||||
|
||||
# this gets a list of all domains we have records for
|
||||
domains = lib.lists.naturalSort (lib.lists.unique (
|
||||
lib.lists.forEach records (x: x.domain)
|
||||
));
|
||||
|
||||
# get the ip's of our servers
|
||||
servers = lib.lists.naturalSort (lib.lists.unique (
|
||||
lib.lists.forEach (sort_records_a_server records) (x: x.value)
|
||||
));
|
||||
|
||||
domains_owned = [
|
||||
# for historic reasons we own this
|
||||
"csn.ul.ie"
|
||||
# the main one we use now
|
||||
"skynet.ie"
|
||||
# a backup
|
||||
"ulcompsoc.ie"
|
||||
];
|
||||
current_date = lib.readFile "${pkgs.runCommand "timestamp" {} "echo -n `date +%s` > $out"}";
|
||||
|
||||
# gets a list of records that match this type
|
||||
filter_records_type = records: r_type: builtins.filter (x: x.r_type == r_type) records;
|
||||
# Get all the A records that are for servers (base record for them)
|
||||
filter_records_a_server = records: builtins.filter (x: builtins.hasAttr "server" x && x.server) (filter_records_type records "A");
|
||||
# Every other A record
|
||||
filter_records_a = records: builtins.filter (x: builtins.hasAttr "server" x && !x.server) (filter_records_type records "A");
|
||||
filter_records_type = r_type: builtins.filter (x: x.r_type == r_type) records;
|
||||
filter_records_server = builtins.filter (x: builtins.hasAttr "server" x && x.server) (filter_records_type "A");
|
||||
filter_records_a = builtins.filter (x: builtins.hasAttr "server" x && !x.server) (filter_records_type "A");
|
||||
|
||||
# These functions are to get the final 3 digits of an IP address so we can use them for reverse pointer
|
||||
process_ptr = records: lib.lists.forEach records (x: process_ptr_sub x);
|
||||
process_ptr_sub = record: {
|
||||
record = builtins.substring 9 3 record.record;
|
||||
|
@ -47,100 +24,87 @@
|
|||
};
|
||||
ip_ptr_to_int = ip: lib.strings.toInt (builtins.substring 9 3 ip);
|
||||
|
||||
# filter and sort records so we cna group them in the right place later
|
||||
sort_records_a_server = records: builtins.sort (a: b: a.record < b.record) (filter_records_a_server records);
|
||||
sort_records_a = records: builtins.sort (a: b: (ip_ptr_to_int a.value) < (ip_ptr_to_int b.value)) (filter_records_a records);
|
||||
sort_records_cname = records: builtins.sort (a: b: a.value < b.value) (filter_records_type records "CNAME");
|
||||
sort_records_ptr = records: builtins.sort (a: b: (lib.strings.toInt a.record) < (lib.strings.toInt b.record)) (process_ptr (filter_records_type records "PTR"));
|
||||
sort_records_srv = records: builtins.sort (a: b: a.record < b.record) (filter_records_type records "SRV");
|
||||
sort_records_server = builtins.sort (a: b: a.record < b.record) filter_records_server;
|
||||
sort_records_a = builtins.sort (a: b: (ip_ptr_to_int a.value) < (ip_ptr_to_int b.value)) filter_records_a;
|
||||
sort_records_cname = builtins.sort (a: b: a.value < b.value) (filter_records_type "CNAME");
|
||||
sort_records_ptr = builtins.sort (a: b: (lib.strings.toInt a.record) < (lib.strings.toInt b.record)) (process_ptr (filter_records_type "PTR"));
|
||||
sort_records_srv = builtins.sort (a: b: a.record < b.record) (filter_records_type "SRV");
|
||||
|
||||
# a tad overkill but type guarding is useful
|
||||
max = x: y:
|
||||
assert builtins.isInt x;
|
||||
assert builtins.isInt y;
|
||||
if x < y
|
||||
then y
|
||||
else x;
|
||||
format_records = records: offset: lib.strings.concatMapStrings (x: "${padString x.record offset} IN ${padString x.r_type 5} ${x.value}\n") records;
|
||||
|
||||
# get teh max length of a list of strings
|
||||
max_len = records: lib.lists.foldr (a: b: (max a b)) 0 (lib.lists.forEach records (record: lib.strings.stringLength record.record));
|
||||
|
||||
# Now that we can get teh max lenth of a list of strings
|
||||
# we can pad it out to the max len +1
|
||||
# this is so that teh generated file is easier for a human to read
|
||||
format_records = records: let
|
||||
offset = (max_len records) + 1;
|
||||
in
|
||||
lib.strings.concatMapStrings (x: "${padString x.record offset} IN ${padString x.r_type 5} ${x.value}\n") records;
|
||||
|
||||
# small function to add spaces until it reaches teh required length
|
||||
# small function to trim it down a tad
|
||||
padString = text: length: fixedWidthString_post length " " text;
|
||||
|
||||
# like lib.strings.fixedWidthString but postfix
|
||||
# recursive function to extend a string up to a limit
|
||||
fixedWidthString_post = width: filler: str: let
|
||||
strw = lib.stringLength str;
|
||||
reqWidth = width - (lib.stringLength filler);
|
||||
in
|
||||
# this is here because we were manually setting teh length, now max_len does that for us
|
||||
assert lib.assertMsg (strw <= width) "fixedWidthString_post: requested string length (${toString width}) must not be shorter than actual length (${toString strw})";
|
||||
if strw == width
|
||||
then str
|
||||
else (fixedWidthString_post reqWidth filler str) + filler;
|
||||
|
||||
# base config for domains we own (skynet.ie, csn.ul.ie, ulcompsoc.ie)
|
||||
# ";" are comments in this file
|
||||
get_config_file = (
|
||||
domain: records: ''
|
||||
domain: ''
|
||||
$TTL 60 ; 1 minute
|
||||
; hostmaster@skynet.ie is an email address that recieves stuff related to dns
|
||||
@ IN SOA ${nameserver}.skynet.ie. hostmaster.skynet.ie. (
|
||||
; hostmaster@${domain} is an email address that recieves stuff related to dns
|
||||
@ IN SOA ${nameserver}.${domain}. hostmaster.${domain}. (
|
||||
; Serial (YYYYMMDDCC) this has to be updated for each time the record is updated
|
||||
${toString current_date}
|
||||
${current_date}
|
||||
600 ; Refresh (10 minutes)
|
||||
300 ; Retry (5 minutes)
|
||||
604800 ; Expire (1 week)
|
||||
3600 ; Minimum (1 hour)
|
||||
)
|
||||
|
||||
; @ stands for teh root domain so teh A record below is where ${domain} points to
|
||||
@ NS ns1.skynet.ie.
|
||||
@ NS ns2.skynet.ie.
|
||||
@ NS ns1.${domain}.
|
||||
@ NS ns2.${domain}.
|
||||
; @ stands for teh root domain so teh A record below is where ${domain} points to
|
||||
;@ A 193.1.99.76
|
||||
;@ MX 5 ${domain}.
|
||||
|
||||
; can have multiple mailserves
|
||||
@ MX 10 mail.${domain}.
|
||||
|
||||
|
||||
; ------------------------------------------
|
||||
; Server Names (A Records)
|
||||
; ------------------------------------------
|
||||
${format_records (sort_records_a_server records)}
|
||||
${format_records sort_records_server 31}
|
||||
|
||||
; ------------------------------------------
|
||||
; A (non server names
|
||||
; ------------------------------------------
|
||||
${format_records (sort_records_a records)}
|
||||
${format_records sort_records_a 31}
|
||||
|
||||
; ------------------------------------------
|
||||
; CNAMES
|
||||
; ------------------------------------------
|
||||
${format_records (sort_records_cname records)}
|
||||
${format_records sort_records_cname 31}
|
||||
|
||||
; ------------------------------------------
|
||||
; TXT
|
||||
; ------------------------------------------
|
||||
${format_records (filter_records_type records "TXT")}
|
||||
${format_records (filter_records_type "TXT") 31}
|
||||
|
||||
; ------------------------------------------
|
||||
; MX
|
||||
; ------------------------------------------
|
||||
${format_records (filter_records_type records "MX")}
|
||||
${format_records (filter_records_type "MX") 31}
|
||||
|
||||
; ------------------------------------------
|
||||
; SRV
|
||||
; ------------------------------------------
|
||||
${format_records (sort_records_srv records)}
|
||||
${format_records sort_records_srv 65}
|
||||
|
||||
|
||||
''
|
||||
);
|
||||
|
||||
# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/4/html/reference_guide/s2-bind-configuration-zone-reverse
|
||||
# config for our reverse dns pointers (not properly working)
|
||||
# config for our reverse dnspointers (not properly working)
|
||||
get_config_file_rev = (
|
||||
domain: ''
|
||||
$ORIGIN 64-64.99.1.193.in-addr.arpa.
|
||||
|
@ -148,7 +112,7 @@
|
|||
; hostmaster@skynet.ie is an email address that recieves stuff related to dns
|
||||
@ IN SOA ${nameserver}.skynet.ie. hostmaster.skynet.ie. (
|
||||
; Serial (YYYYMMDDCC) this has to be updated for each time the record is updated
|
||||
${toString current_date}
|
||||
${current_date}
|
||||
600 ; Refresh (10 minutes)
|
||||
300 ; Retry (5 minutes)
|
||||
604800 ; Expire (1 week)
|
||||
|
@ -161,37 +125,55 @@
|
|||
; ------------------------------------------
|
||||
; PTR
|
||||
; ------------------------------------------
|
||||
${format_records (sort_records_ptr records)}
|
||||
${format_records sort_records_ptr 3}
|
||||
''
|
||||
);
|
||||
|
||||
# arrays of teh two nameservers
|
||||
nameserver_1 = ["193.1.99.109"];
|
||||
nameserver_2 = ["193.1.99.120"];
|
||||
# domains we dont have proper ownship over, only here to ensure the logs dont get cluttered.
|
||||
get_config_file_old_domains = (
|
||||
domain: ''
|
||||
$TTL 60 ; 1 minute
|
||||
; hostmaster@skynet.ie is an email address that recieves stuff related to dns
|
||||
@ IN SOA ${nameserver}.skynet.ie. hostmaster.skynet.ie. (
|
||||
; Serial (YYYYMMDDCC) this has to be updated for each time the record is updated
|
||||
${current_date}
|
||||
600 ; Refresh (10 minutes)
|
||||
300 ; Retry (5 minutes)
|
||||
604800 ; Expire (1 week)
|
||||
3600 ; Minimum (1 hour)
|
||||
)
|
||||
|
||||
@ NS ns1.skynet.ie.
|
||||
@ NS ns2.skynet.ie.
|
||||
|
||||
''
|
||||
);
|
||||
|
||||
# arrys of teh two nameservers
|
||||
tmp1 = ["193.1.99.109"];
|
||||
tmp2 = ["193.1.99.120"];
|
||||
|
||||
primaries = (
|
||||
if cfg.server.primary
|
||||
then
|
||||
# primary servers have no primaries (ones they listen to)
|
||||
[]
|
||||
else if builtins.elem cfg.server.ip nameserver_1
|
||||
then nameserver_2
|
||||
else nameserver_1
|
||||
else if builtins.elem cfg.server.ip tmp1
|
||||
then tmp2
|
||||
else tmp1
|
||||
);
|
||||
|
||||
secondaries = (
|
||||
if cfg.server.primary
|
||||
then
|
||||
if builtins.elem cfg.server.ip nameserver_1
|
||||
then nameserver_2
|
||||
else nameserver_1
|
||||
if builtins.elem cfg.server.ip tmp1
|
||||
then tmp2
|
||||
else tmp1
|
||||
else []
|
||||
);
|
||||
|
||||
# small function to tidy up the spam of the cache networks, would use teh subnet except all external traffic has the ip of teh router
|
||||
# now limited explicitly to servers that we are administering
|
||||
# See i24-09-30_050 for more information
|
||||
create_cache_networks = map (x: "${toString x}/32") servers;
|
||||
create_cache_networks = map (x: "193.1.99.${toString x}/32") (lib.lists.range 71 126);
|
||||
|
||||
# standard function to create the etc file, pass in the text and domain and it makes it
|
||||
create_entry_etc_sub = domain: text: {
|
||||
|
@ -203,38 +185,27 @@
|
|||
# The UNIX file mode bits
|
||||
mode = "0664";
|
||||
|
||||
# content of the file
|
||||
text = text;
|
||||
};
|
||||
};
|
||||
# (text.owned "csn.ul.ie")
|
||||
|
||||
# standard function to create the etc file, pass in the text and domain and it makes it
|
||||
create_entry_etc = domain: type: let
|
||||
domain_records = lib.lists.filter (x: x.domain == domain) records;
|
||||
in
|
||||
# this is the main type of record that most folks are used to
|
||||
create_entry_etc = domain: type:
|
||||
if type == "owned"
|
||||
then create_entry_etc_sub domain (get_config_file domain domain_records)
|
||||
# reverse lookups allow for using an IP to find domains pointing to it
|
||||
then create_entry_etc_sub domain (text.owned domain)
|
||||
else if type == "reverse"
|
||||
then create_entry_etc_sub domain (get_config_file_rev domain)
|
||||
then create_entry_etc_sub domain (text.reverse domain)
|
||||
else if type == "old"
|
||||
then create_entry_etc_sub domain (text.old domain)
|
||||
else {};
|
||||
|
||||
create_entry_zone = domain: let
|
||||
if_primary_and_owned =
|
||||
if cfg.server.primary && (lib.lists.any (item: item == domain) domains_owned)
|
||||
then ''
|
||||
allow-update { key rfc2136key.skynet.ie.; };
|
||||
dnssec-policy default;
|
||||
inline-signing yes;
|
||||
''
|
||||
else "";
|
||||
in {
|
||||
create_entry_zone = domain: extraConfig: {
|
||||
"${domain}" = {
|
||||
extraConfig = ''
|
||||
${if_primary_and_owned}
|
||||
${extraConfig}
|
||||
// for bumping the config
|
||||
// ${toString current_date}
|
||||
// ${current_date}
|
||||
'';
|
||||
# really wish teh nixos config didnt use master/slave
|
||||
master = cfg.server.primary;
|
||||
|
@ -247,16 +218,69 @@
|
|||
};
|
||||
};
|
||||
|
||||
text = {
|
||||
owned = domain: get_config_file domain;
|
||||
reverse = domain: get_config_file_rev domain;
|
||||
old = domain: get_config_file_old_domains domain;
|
||||
};
|
||||
|
||||
extraConfig = {
|
||||
owned =
|
||||
if cfg.server.primary
|
||||
then ''
|
||||
allow-update { key rfc2136key.skynet.ie.; };
|
||||
|
||||
dnssec-policy default;
|
||||
inline-signing yes;
|
||||
''
|
||||
else "";
|
||||
|
||||
# no extra config for reverse
|
||||
reverse = "";
|
||||
|
||||
old = "";
|
||||
};
|
||||
|
||||
records =
|
||||
config.skynet.records
|
||||
/*
|
||||
Need to "manually" grab it from each server.
|
||||
Nix is laxy evalusted so if it does not need to open a file it wont.
|
||||
This is to iterate through each server (node) and evaluate the dns records for that server.
|
||||
*/
|
||||
++ builtins.concatLists (
|
||||
lib.attrsets.mapAttrsToList (
|
||||
key: value: value.config.services.skynet.dns.records
|
||||
key: value: let
|
||||
details_server = value.config.services.skynet."${name}".server;
|
||||
details_records = value.config.services.skynet."${name}".records;
|
||||
in
|
||||
if builtins.hasAttr "dns" value.config.services.skynet
|
||||
then
|
||||
(
|
||||
# got to handle habing a dns record for the dns serves themselves.
|
||||
if details_server.enable
|
||||
then
|
||||
(
|
||||
if details_server.primary
|
||||
then
|
||||
details_records
|
||||
++ [
|
||||
{
|
||||
record = "ns1";
|
||||
r_type = "A";
|
||||
value = details_server.ip;
|
||||
server = false;
|
||||
}
|
||||
]
|
||||
else
|
||||
details_records
|
||||
++ [
|
||||
{
|
||||
record = "ns2";
|
||||
r_type = "A";
|
||||
value = details_server.ip;
|
||||
server = false;
|
||||
}
|
||||
]
|
||||
)
|
||||
else details_records
|
||||
)
|
||||
else []
|
||||
)
|
||||
nodes
|
||||
);
|
||||
|
@ -267,7 +291,8 @@
|
|||
else "ns2";
|
||||
in {
|
||||
imports = [
|
||||
../../config/dns.nix
|
||||
./firewall.nix
|
||||
../config/dns.nix
|
||||
];
|
||||
|
||||
options.services.skynet."${name}" = {
|
||||
|
@ -291,11 +316,28 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
# mirrorred in ../config/dns.nix
|
||||
records = lib.mkOption {
|
||||
description = "Records, sorted based on therir type";
|
||||
type = lib.types.listOf (lib.types.submodule (import ./options-records.nix {
|
||||
inherit lib;
|
||||
}));
|
||||
type = with lib.types;
|
||||
listOf (submodule {
|
||||
options = {
|
||||
record = lib.mkOption {
|
||||
type = str;
|
||||
};
|
||||
r_type = lib.mkOption {
|
||||
type = enum ["A" "CNAME" "TXT" "PTR" "SRV" "MX"];
|
||||
};
|
||||
value = lib.mkOption {
|
||||
type = str;
|
||||
};
|
||||
server = lib.mkOption {
|
||||
description = "Core record for a server";
|
||||
type = bool;
|
||||
default = false;
|
||||
};
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -314,40 +356,29 @@ in {
|
|||
"ip daddr ${cfg.server.ip} udp dport 53 counter packets 0 bytes 0 accept"
|
||||
];
|
||||
|
||||
services.skynet.dns.records = [
|
||||
{
|
||||
record = nameserver;
|
||||
r_type = "A";
|
||||
value = config.services.skynet.host.ip;
|
||||
}
|
||||
];
|
||||
services.bind.zones =
|
||||
(create_entry_zone "csn.ul.ie" extraConfig.owned)
|
||||
// (create_entry_zone "skynet.ie" extraConfig.owned)
|
||||
// (create_entry_zone "ulcompsoc.ie" extraConfig.owned)
|
||||
// (create_entry_zone "64-64.99.1.193.in-addr.arpa" extraConfig.reverse)
|
||||
// (create_entry_zone "conradcollins.net" extraConfig.old)
|
||||
// (create_entry_zone "edelharty.net" extraConfig.old);
|
||||
|
||||
services.bind.zones = lib.attrsets.mergeAttrsList (
|
||||
# uses teh domains lsited in teh records
|
||||
(lib.lists.forEach domains (domain: (create_entry_zone domain)))
|
||||
# we have to do a reverse dns
|
||||
++ [
|
||||
(create_entry_zone "64-64.99.1.193.in-addr.arpa")
|
||||
]
|
||||
);
|
||||
|
||||
environment.etc = lib.attrsets.mergeAttrsList (
|
||||
# uses teh domains lsited in teh records
|
||||
(lib.lists.forEach domains (domain: (create_entry_etc domain "owned")))
|
||||
# we have to do a reverse dns
|
||||
++ [
|
||||
(create_entry_etc "64-64.99.1.193.in-addr.arpa" "reverse")
|
||||
]
|
||||
);
|
||||
environment.etc =
|
||||
(create_entry_etc "csn.ul.ie" "owned")
|
||||
// (create_entry_etc "skynet.ie" "owned")
|
||||
// (create_entry_etc "ulcompsoc.ie" "owned")
|
||||
// (create_entry_etc "64-64.99.1.193.in-addr.arpa" "reverse")
|
||||
// (create_entry_etc "conradcollins.net" "old")
|
||||
// (create_entry_etc "edelharty.net" "old");
|
||||
|
||||
# secrets required
|
||||
age.secrets.dns_dnskeys = {
|
||||
file = ../../secrets/dns_dnskeys.conf.age;
|
||||
file = ../secrets/dns_dnskeys.conf.age;
|
||||
owner = "named";
|
||||
group = "named";
|
||||
};
|
||||
|
||||
# basic but ensure teh dns ports are open
|
||||
networking.firewall = {
|
||||
allowedTCPPorts = [53];
|
||||
allowedUDPPorts = [53];
|
||||
|
@ -369,7 +400,7 @@ in {
|
|||
|
||||
# piles of no valid RRSIG resolving 'com/DS/IN' errors
|
||||
extraOptions = ''
|
||||
dnssec-validation auto;
|
||||
dnssec-validation yes;
|
||||
'';
|
||||
|
||||
# set the upstream dns servers
|
|
@ -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;
|
||||
};
|
||||
};
|
||||
}
|
|
@ -50,10 +50,6 @@ with lib; let
|
|||
account = "contact";
|
||||
members = ["committee"];
|
||||
}
|
||||
{
|
||||
account = "committee";
|
||||
members = ["committee"];
|
||||
}
|
||||
{
|
||||
account = "dbadmin";
|
||||
members = ["admin"];
|
||||
|
@ -96,7 +92,7 @@ with lib; let
|
|||
}
|
||||
];
|
||||
|
||||
sieveConfigFile =
|
||||
configFile =
|
||||
# https://doc.dovecot.org/configuration_manual/sieve/examples/#plus-addressed-mail-filtering
|
||||
pkgs.writeText "basic_sieve"
|
||||
''
|
||||
|
@ -106,60 +102,27 @@ with lib; let
|
|||
require ["fileinto", "reject"];
|
||||
require "variables";
|
||||
require "regex";
|
||||
require "subaddress";
|
||||
|
||||
# this should be close to teh last step
|
||||
if allof (
|
||||
address :user ["To", "Cc"] ["${toString create_config_to}"],
|
||||
address :domain ["To", "Cc"] "skynet.ie"
|
||||
){
|
||||
if address :matches ["To", "Cc"] "*@skynet.ie" {
|
||||
# handle spam reports specifically for teh service accounts in each users inbox
|
||||
if address :matches ["From"] "postmaster@mimi.skynet.ie" {
|
||||
fileinto :create "''${1}.Spam_Report";
|
||||
stop;
|
||||
address :localpart ["To"] ["${toString create_config_to}"],
|
||||
address :domain ["To"] "skynet.ie"
|
||||
){
|
||||
if address :matches ["To"] "*@skynet.ie" {
|
||||
if header :is "X-Spam" "Yes" {
|
||||
fileinto :create "''${1}.Junk";
|
||||
stop;
|
||||
} else {
|
||||
fileinto :create "''${1}";
|
||||
}
|
||||
}
|
||||
|
||||
# user+subdir
|
||||
if address :matches ["To", "Cc"] "*+*@skynet.ie" {
|
||||
fileinto :create "''${1}.''${2}";
|
||||
stop;
|
||||
}
|
||||
|
||||
# no detail, proceed normally
|
||||
if header :is "X-Spam" "Yes" {
|
||||
fileinto :create "''${1}.Junk";
|
||||
stop;
|
||||
} else {
|
||||
fileinto :create "''${1}";
|
||||
stop;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# handle spam Reports for general users
|
||||
if address :matches ["From"] "postmaster@mimi.skynet.ie" {
|
||||
fileinto :create "INBOX.Spam_Report";
|
||||
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 = [
|
||||
./dns.nix
|
||||
./acme.nix
|
||||
./nginx.nix
|
||||
inputs.simple-nixos-mailserver.nixosModule
|
||||
|
||||
# for teh config
|
||||
|
@ -227,7 +190,7 @@ in {
|
|||
|
||||
config = mkIf cfg.enable {
|
||||
services.skynet.backup.normal.backups = [
|
||||
#"/var/vmail"
|
||||
"/var/vmail"
|
||||
"/var/dkim"
|
||||
];
|
||||
|
||||
|
@ -307,128 +270,95 @@ in {
|
|||
};
|
||||
|
||||
# set up dns record for it
|
||||
services.skynet.dns.records =
|
||||
[
|
||||
{
|
||||
# This is the mail gateway, try to send all mail to it first
|
||||
# Lower number = higher priority
|
||||
record = "@";
|
||||
r_type = "MX";
|
||||
# the number is the priority in teh case of multiple mailservers
|
||||
value = "5 mimi.${cfg.domain}.";
|
||||
}
|
||||
{
|
||||
# this is the main email server
|
||||
record = "@";
|
||||
r_type = "MX";
|
||||
# the number is the priority in teh case of multiple mailservers
|
||||
value = "10 mail.${cfg.domain}.";
|
||||
}
|
||||
{
|
||||
record = "@";
|
||||
r_type = "MX";
|
||||
# the number is the priority in teh case of multiple mailservers
|
||||
value = "10 lists.${cfg.domain}.";
|
||||
}
|
||||
services.skynet.dns.records = [
|
||||
# basic one
|
||||
{
|
||||
record = "mail";
|
||||
r_type = "A";
|
||||
value = config.services.skynet.host.ip;
|
||||
}
|
||||
#DNS config for K-9 Mail
|
||||
{
|
||||
record = "imap";
|
||||
r_type = "CNAME";
|
||||
value = "mail";
|
||||
}
|
||||
{
|
||||
record = "pop3";
|
||||
r_type = "CNAME";
|
||||
value = "mail";
|
||||
}
|
||||
{
|
||||
record = "smtp";
|
||||
r_type = "CNAME";
|
||||
value = "mail";
|
||||
}
|
||||
|
||||
# basic one
|
||||
{
|
||||
record = "mail";
|
||||
r_type = "A";
|
||||
value = config.services.skynet.host.ip;
|
||||
}
|
||||
{
|
||||
record = "lists";
|
||||
r_type = "A";
|
||||
value = config.services.skynet.host.ip;
|
||||
}
|
||||
#DNS config for K-9 Mail
|
||||
{
|
||||
record = "imap";
|
||||
r_type = "CNAME";
|
||||
value = "mail";
|
||||
}
|
||||
{
|
||||
record = "pop3";
|
||||
r_type = "CNAME";
|
||||
value = "mail";
|
||||
}
|
||||
{
|
||||
record = "smtp";
|
||||
r_type = "CNAME";
|
||||
value = "mail";
|
||||
}
|
||||
|
||||
# TXT records, all tehse are inside escaped strings to allow using ""
|
||||
|
||||
# reverse pointer
|
||||
{
|
||||
record = config.services.skynet.host.ip;
|
||||
r_type = "PTR";
|
||||
value = "${cfg.sub}.${cfg.domain}.";
|
||||
}
|
||||
|
||||
# SRV records to help gmail on android etc find the correct mail.skynet.ie domain for config rather than just defaulting to skynet.ie
|
||||
# https://serverfault.com/questions/935192/how-to-setup-auto-configure-email-for-android-mail-app-on-your-server/1018406#1018406
|
||||
# response should be:
|
||||
# _imap._tcp SRV 0 1 143 imap.example.com.
|
||||
{
|
||||
record = "_imaps._tcp";
|
||||
r_type = "SRV";
|
||||
value = "0 1 993 ${cfg.sub}.${cfg.domain}.";
|
||||
}
|
||||
{
|
||||
record = "_imap._tcp";
|
||||
r_type = "SRV";
|
||||
value = "0 1 143 ${cfg.sub}.${cfg.domain}.";
|
||||
}
|
||||
{
|
||||
record = "_submissions._tcp";
|
||||
r_type = "SRV";
|
||||
value = "0 1 465 ${cfg.sub}.${cfg.domain}.";
|
||||
}
|
||||
{
|
||||
record = "_submission._tcp";
|
||||
r_type = "SRV";
|
||||
value = "0 1 587 ${cfg.sub}.${cfg.domain}.";
|
||||
}
|
||||
]
|
||||
# TXT records, all tehse are inside escaped strings to allow using ""
|
||||
# SPF record
|
||||
++ [
|
||||
{
|
||||
record = "${cfg.domain}.";
|
||||
r_type = "TXT";
|
||||
value = ''"v=spf1 a:${cfg.sub}.${cfg.domain} ip4:${config.services.skynet.host.ip} -all"'';
|
||||
}
|
||||
]
|
||||
{
|
||||
record = "${cfg.domain}.";
|
||||
r_type = "TXT";
|
||||
value = ''"v=spf1 a:${cfg.sub}.${cfg.domain} -all"'';
|
||||
}
|
||||
|
||||
# DKIM keys
|
||||
++ [
|
||||
{
|
||||
record = "mail._domainkey.skynet.ie.";
|
||||
r_type = "TXT";
|
||||
value = ''"v=DKIM1; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCxju1Ie60BdHwyFVPNQKovL/cX9IFPzBKgjnHZf+WBzDCFKSBpf7NvnfXajtFDQN0poaN/Qfifid+V55ZCNDBn8Y3qZa4Y69iNiLw2DdvYf0HdnxX6+pLpbmj7tikGGLJ62xnhkJhoELnz5gCOhpyoiv0tSQVaJpaGZmoll861/QIDAQAB"'';
|
||||
}
|
||||
{
|
||||
domain = "ulcompsoc.ie";
|
||||
record = "mail._domainkey.ulcompsoc.ie.";
|
||||
r_type = "TXT";
|
||||
value = ''"v=DKIM1; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDl8ptSASx37t5sfmU2d2Y6yi9AVrsNFBZDmJ2uaLa4NuvAjxGQCw4wx+1Jui/HOuKYLpntLsjN851wgPR+3i51g4OblqBDvcHn9NYgWRZfHj9AASANQjdsaAbkXuyKuO46hZqeWlpESAcD6a4Evam4fkm+kiZC0+rccb4cWgsuLwIDAQAB"'';
|
||||
}
|
||||
]
|
||||
{
|
||||
record = "mail._domainkey.skynet.ie.";
|
||||
r_type = "TXT";
|
||||
value = ''"v=DKIM1; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCxju1Ie60BdHwyFVPNQKovL/cX9IFPzBKgjnHZf+WBzDCFKSBpf7NvnfXajtFDQN0poaN/Qfifid+V55ZCNDBn8Y3qZa4Y69iNiLw2DdvYf0HdnxX6+pLpbmj7tikGGLJ62xnhkJhoELnz5gCOhpyoiv0tSQVaJpaGZmoll861/QIDAQAB"'';
|
||||
}
|
||||
{
|
||||
record = "mail._domainkey.ulcompsoc.ie.";
|
||||
r_type = "TXT";
|
||||
value = ''"v=DKIM1; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDl8ptSASx37t5sfmU2d2Y6yi9AVrsNFBZDmJ2uaLa4NuvAjxGQCw4wx+1Jui/HOuKYLpntLsjN851wgPR+3i51g4OblqBDvcHn9NYgWRZfHj9AASANQjdsaAbkXuyKuO46hZqeWlpESAcD6a4Evam4fkm+kiZC0+rccb4cWgsuLwIDAQAB"'';
|
||||
}
|
||||
|
||||
# DMARC
|
||||
++ [
|
||||
{
|
||||
record = "_dmarc.${cfg.domain}.";
|
||||
r_type = "TXT";
|
||||
# p : quarantine => sends to spam, reject => never sent
|
||||
# rua : mail that receives reports about DMARC activity
|
||||
# pct : percentage of unathenticated messages that DMARC stops
|
||||
# adkim : alignment policy for DKIM, s => Strict, subdomains arent allowed, r => relaxed, subdomains allowed
|
||||
# aspf : alignment policy for SPF, s => Strict, subdomains arent allowed, r => relaxed, subdomains allowed
|
||||
# sp : DMARC policy for subdomains, none => no action, reports to rua, quarantine => spam, reject => never sent
|
||||
value = ''"v=DMARC1; p=quarantine; rua=mailto:mailman@skynet.ie; pct=100; adkim=s; aspf=s; sp=quarantine"'';
|
||||
}
|
||||
];
|
||||
{
|
||||
record = "_dmarc.${cfg.domain}.";
|
||||
r_type = "TXT";
|
||||
# p : quarantine => sends to spam, reject => never sent
|
||||
# rua : mail that receives reports about DMARC activity
|
||||
# pct : percentage of unathenticated messages that DMARC stops
|
||||
# adkim : alignment policy for DKIM, s => Strict, subdomains arent allowed, r => relaxed, subdomains allowed
|
||||
# aspf : alignment policy for SPF, s => Strict, subdomains arent allowed, r => relaxed, subdomains allowed
|
||||
# sp : DMARC policy for subdomains, none => no action, reports to rua, quarantine => spam, reject => never sent
|
||||
value = ''"v=DMARC1; p=quarantine; rua=mailto:mailman@skynet.ie; pct=100; adkim=s; aspf=s; sp=none"'';
|
||||
}
|
||||
|
||||
# reverse pointer
|
||||
{
|
||||
record = config.services.skynet.host.ip;
|
||||
r_type = "PTR";
|
||||
value = "${cfg.sub}.${cfg.domain}.";
|
||||
}
|
||||
|
||||
# SRV records to help gmail on android etc find the correct mail.skynet.ie domain for config rather than just defaulting to skynet.ie
|
||||
# https://serverfault.com/questions/935192/how-to-setup-auto-configure-email-for-android-mail-app-on-your-server/1018406#1018406
|
||||
# response should be:
|
||||
# _imap._tcp SRV 0 1 143 imap.example.com.
|
||||
{
|
||||
record = "_imaps._tcp";
|
||||
r_type = "SRV";
|
||||
value = "0 1 993 ${cfg.sub}.${cfg.domain}.";
|
||||
}
|
||||
{
|
||||
record = "_imap._tcp";
|
||||
r_type = "SRV";
|
||||
value = "0 1 143 ${cfg.sub}.${cfg.domain}.";
|
||||
}
|
||||
{
|
||||
record = "_submissions._tcp";
|
||||
r_type = "SRV";
|
||||
value = "0 1 465 ${cfg.sub}.${cfg.domain}.";
|
||||
}
|
||||
{
|
||||
record = "_submission._tcp";
|
||||
r_type = "SRV";
|
||||
value = "0 1 587 ${cfg.sub}.${cfg.domain}.";
|
||||
}
|
||||
];
|
||||
|
||||
#https://nixos-mailserver.readthedocs.io/en/latest/add-roundcube.html
|
||||
users.groups.nginx = {};
|
||||
|
@ -470,12 +400,9 @@ in {
|
|||
|
||||
mailserver = {
|
||||
enable = true;
|
||||
stateVersion = 3;
|
||||
|
||||
fqdn = "${cfg.sub}.${cfg.domain}";
|
||||
domains = [
|
||||
cfg.domain
|
||||
"lists.skynet.ie"
|
||||
];
|
||||
|
||||
enableManageSieve = true;
|
||||
|
@ -490,10 +417,6 @@ in {
|
|||
# 20MB max size
|
||||
messageSizeLimit = 20000000;
|
||||
|
||||
# policydSPFExtraConfig = ''
|
||||
# skip_addresses = 193.1.99.86/32
|
||||
# '';
|
||||
|
||||
ldap = {
|
||||
enable = true;
|
||||
uris = cfg.ldap.hosts;
|
||||
|
@ -506,13 +429,13 @@ in {
|
|||
searchScope = "sub";
|
||||
|
||||
dovecot = {
|
||||
userFilter = "(skMail=%{user})";
|
||||
userFilter = "(skMail=%u)";
|
||||
|
||||
# can lock down how much space each user has access to from ldap
|
||||
userAttrs = "quotaEmail=quota_rule=*:bytes=%$,=quota_rule2=Trash:storage=+100M";
|
||||
|
||||
# accept emails in, but only allow access to paid up members
|
||||
passFilter = "(&(|${create_filter cfg.groups})(skMail=%{user}))";
|
||||
passFilter = "(&(|${create_filter cfg.groups})(skMail=%u))";
|
||||
};
|
||||
|
||||
postfix = {
|
||||
|
@ -528,60 +451,18 @@ in {
|
|||
};
|
||||
|
||||
services.dovecot2.sieve.scripts = {
|
||||
before = sieveConfigFile;
|
||||
};
|
||||
|
||||
# This is to add a bcc to outgoing mail
|
||||
# this then interacts with teh filters to put it in the right folder
|
||||
# we can directly add to the postfix service here
|
||||
services.postfix = let
|
||||
# mostly copied from the upstream mailserver config/functions
|
||||
mappedFile = name: "hash:/var/lib/postfix/conf/${name}";
|
||||
|
||||
sender_bcc_maps_file = let
|
||||
content = lookupTableToString create_skynet_service_bcc;
|
||||
in
|
||||
builtins.toFile "sender_bcc_maps" content;
|
||||
|
||||
lookupTableToString = attrs: let
|
||||
valueToString = value: lib.concatStringsSep ", " value;
|
||||
in
|
||||
lib.concatStringsSep "\n" (lib.mapAttrsToList (name: value: "${name} ${valueToString value}") attrs);
|
||||
|
||||
# convert the mailboxes config to something that can be used here
|
||||
create_skynet_email_bcc = mailbox: {
|
||||
name = "${mailbox}@skynet.ie";
|
||||
value = ["${mailbox}@skynet.ie"];
|
||||
};
|
||||
create_skynet_service_bcc = builtins.listToAttrs (map (mailbox: (create_skynet_email_bcc mailbox.account)) service_mailboxes);
|
||||
in {
|
||||
mapFiles."sender_bcc_maps" = sender_bcc_maps_file;
|
||||
|
||||
config = {
|
||||
sender_bcc_maps = [
|
||||
(mappedFile "sender_bcc_maps")
|
||||
];
|
||||
};
|
||||
before = configFile;
|
||||
};
|
||||
|
||||
# tune the spam filter
|
||||
services.rspamd.locals = {
|
||||
"multimap.conf" = {
|
||||
text = ''
|
||||
IP_WHITELIST {
|
||||
type = "ip";
|
||||
prefilter = true;
|
||||
map = "/etc/rspamd/local.d/ip_whitelist.map";
|
||||
action = "accept";
|
||||
}
|
||||
'';
|
||||
};
|
||||
|
||||
"ip_whitelist.map" = {
|
||||
text = ''
|
||||
193.1.99.86
|
||||
'';
|
||||
};
|
||||
};
|
||||
/*
|
||||
services.rspamd.extraConfig = ''
|
||||
actions {
|
||||
reject = null; # Disable rejects, default is 15
|
||||
add_header = 7; # Add header when reaching this score
|
||||
greylist = 4; # Apply greylisting when reaching this score
|
||||
}
|
||||
'';
|
||||
*/
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,60 +0,0 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
...
|
||||
}: let
|
||||
# function to create the cname record for eachs erver
|
||||
create_cname = configs:
|
||||
lib.lists.forEach configs (
|
||||
c: {
|
||||
record = "${c.address}.games";
|
||||
r_type = "CNAME";
|
||||
value = config.services.skynet.host.name;
|
||||
}
|
||||
);
|
||||
|
||||
# function to create the srv record
|
||||
# this allows us to change the port without impacting (java) users
|
||||
create_srv = configs:
|
||||
lib.lists.forEach configs (c: {
|
||||
record = "_minecraft._tcp.${c.address}.games.skynet.ie.";
|
||||
r_type = "SRV";
|
||||
value = "0 10 ${c.port} ${config.services.skynet.host.name}.skynet.ie.";
|
||||
});
|
||||
|
||||
servers = [
|
||||
{
|
||||
address = "minecraft.compsoc";
|
||||
port = "25518";
|
||||
}
|
||||
{
|
||||
address = "minecraft-classic.compsoc";
|
||||
port = "25518";
|
||||
}
|
||||
{
|
||||
address = "minecraft-aged.compsoc";
|
||||
port = "25519";
|
||||
}
|
||||
{
|
||||
address = "minecraft.gsoc";
|
||||
port = "25521";
|
||||
}
|
||||
{
|
||||
address = "minecraft.phildeb";
|
||||
port = "25522";
|
||||
}
|
||||
{
|
||||
address = "minecraft.anime";
|
||||
port = "25523";
|
||||
}
|
||||
];
|
||||
in {
|
||||
imports = [
|
||||
];
|
||||
|
||||
config = {
|
||||
services.skynet.dns.records = (create_cname servers) ++ (create_srv servers);
|
||||
};
|
||||
}
|
|
@ -1,139 +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 = ''
|
||||
add_header Content-Security-Policy "frame-ancestors 'self' https://silver.users.skynet.ie";
|
||||
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";
|
||||
};
|
||||
|
||||
indexer = {
|
||||
# Will consume more disk space, but we have plenty of that
|
||||
REPO_INDEXER_ENABLED = true;
|
||||
};
|
||||
|
||||
database = {
|
||||
SQLITE_JOURNAL_MODE = "WAL";
|
||||
};
|
||||
|
||||
# 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;
|
||||
};
|
||||
};
|
||||
}
|
|
@ -1,161 +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";
|
||||
|
||||
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;
|
||||
};
|
||||
|
||||
secret = mkOption {
|
||||
type = types.path;
|
||||
};
|
||||
};
|
||||
|
||||
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 = cfg.secret;
|
||||
owner = cfg.user;
|
||||
group = cfg.user;
|
||||
};
|
||||
|
||||
# make sure the ssh config stuff is in teh right palce
|
||||
systemd.tmpfiles.rules = [
|
||||
#"d /home/${cfg.user} 0755 ${cfg.user} ${cfg.user}"
|
||||
"L+ /home/${cfg.user}/.ssh/config 0755 ${cfg.user} ${cfg.user} - ${./ssh_config}"
|
||||
];
|
||||
age.secrets.forgejo_runner_ssh = {
|
||||
file = ../../secrets/forgejo/runners/ssh.age;
|
||||
mode = "600";
|
||||
owner = "${cfg.user}";
|
||||
group = "${cfg.user}";
|
||||
symlink = false;
|
||||
path = "/home/${cfg.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.user;
|
||||
};
|
||||
users = {
|
||||
groups."${cfg.user}" = {};
|
||||
users."${cfg.user}" = {
|
||||
#isSystemUser = true;
|
||||
isNormalUser = true;
|
||||
group = cfg.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.name;
|
||||
url = cfg.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
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -1,5 +0,0 @@
|
|||
Host *.skynet.ie 193.1.99.* 193.1.96.165
|
||||
User root
|
||||
IdentityFile ~/.ssh/skynet/root
|
||||
IdentitiesOnly yes
|
||||
|
|
@ -12,6 +12,10 @@ with lib; let
|
|||
domain_full = "${cfg.domain.sub}.${domain_base}";
|
||||
in {
|
||||
imports = [
|
||||
./acme.nix
|
||||
./dns.nix
|
||||
./firewall.nix
|
||||
./nginx.nix
|
||||
];
|
||||
|
||||
options.services.skynet."${name}" = {
|
||||
|
@ -56,32 +60,32 @@ in {
|
|||
# grep -r --exclude-dir={docker,containers,log,sys,nix,proc} gitlab /
|
||||
|
||||
age.secrets.gitlab_pw = {
|
||||
file = ../../secrets/gitlab/pw.age;
|
||||
file = ../secrets/gitlab/pw.age;
|
||||
owner = cfg.user;
|
||||
group = cfg.user;
|
||||
};
|
||||
age.secrets.gitlab_secrets_db = {
|
||||
file = ../../secrets/gitlab/secrets_db.age;
|
||||
file = ../secrets/gitlab/secrets_db.age;
|
||||
owner = cfg.user;
|
||||
group = cfg.user;
|
||||
};
|
||||
age.secrets.gitlab_secrets_secret = {
|
||||
file = ../../secrets/gitlab/secrets_secret.age;
|
||||
file = ../secrets/gitlab/secrets_secret.age;
|
||||
owner = cfg.user;
|
||||
group = cfg.user;
|
||||
};
|
||||
age.secrets.gitlab_secrets_otp = {
|
||||
file = ../../secrets/gitlab/secrets_otp.age;
|
||||
file = ../secrets/gitlab/secrets_otp.age;
|
||||
owner = cfg.user;
|
||||
group = cfg.user;
|
||||
};
|
||||
age.secrets.gitlab_secrets_jws = {
|
||||
file = ../../secrets/gitlab/secrets_jws.age;
|
||||
file = ../secrets/gitlab/secrets_jws.age;
|
||||
owner = cfg.user;
|
||||
group = cfg.user;
|
||||
};
|
||||
age.secrets.gitlab_db_pw = {
|
||||
file = ../../secrets/gitlab/db_pw.age;
|
||||
file = ../secrets/gitlab/db_pw.age;
|
||||
owner = cfg.user;
|
||||
group = cfg.user;
|
||||
};
|
122
applications/gitlab_runner.nix
Normal file
122
applications/gitlab_runner.nix
Normal file
|
@ -0,0 +1,122 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
name = "gitlab_runner";
|
||||
cfg = config.services.skynet."${name}";
|
||||
in {
|
||||
imports = [
|
||||
];
|
||||
|
||||
options.services.skynet."${name}" = {
|
||||
enable = mkEnableOption "Skynet Gitlab Runner";
|
||||
|
||||
runner = {
|
||||
name = mkOption {
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
gitlab = mkOption {
|
||||
default = "https://gitlab.skynet.ie";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
description = mkOption {
|
||||
default = cfg.runner.name;
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
docker = {
|
||||
image = mkOption {
|
||||
default = "alpine:3.18.4";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
cleanup_dates = mkOption {
|
||||
# https://man.archlinux.org/man/systemd.time.7#CALENDAR_EVENTS
|
||||
# it will use a lot of storage so clear it daily, may change to hourly if required
|
||||
default = "daily";
|
||||
type = types.str;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
# https://search.nixos.org/options?from=0&size=50&sort=alpha_desc&type=packages&query=services.gitlab-runner.
|
||||
environment.systemPackages = [
|
||||
pkgs.gitlab-runner
|
||||
];
|
||||
|
||||
age.secrets.runner_01_nix.file = ../secrets/gitlab/runners/runner01.age;
|
||||
age.secrets.runner_02_general.file = ../secrets/gitlab/runners/runner02.age;
|
||||
|
||||
boot.kernel.sysctl."net.ipv4.ip_forward" = true; # 1
|
||||
virtualisation.docker.enable = true;
|
||||
|
||||
# taken from https://github.com/NixOS/nixpkgs/issues/245365#issuecomment-1663854128
|
||||
virtualisation.docker.listenOptions = ["/run/docker.sock" "127.0.0.1:2375"];
|
||||
|
||||
services.gitlab-runner = {
|
||||
enable = true;
|
||||
|
||||
# clear-docker-cache = {
|
||||
# enable = true;
|
||||
# dates = cfg.runner.docker.cleanup_dates;
|
||||
# };
|
||||
|
||||
services = {
|
||||
# might make a function later to have multiple runners, might never need it though
|
||||
runner_nix = {
|
||||
cloneUrl = cfg.runner.gitlab;
|
||||
description = "For Nix only";
|
||||
registrationFlags = ["--docker-host" "tcp://127.0.0.1:2375"];
|
||||
registrationConfigFile = config.age.secrets.runner_01_nix.path;
|
||||
dockerImage = cfg.runner.docker.image;
|
||||
|
||||
# from https://nixos.wiki/wiki/Gitlab_runner
|
||||
dockerVolumes = [
|
||||
"/nix/store:/nix/store:ro"
|
||||
"/nix/var/nix/db:/nix/var/nix/db:ro"
|
||||
"/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket:ro"
|
||||
];
|
||||
dockerDisableCache = true;
|
||||
preBuildScript = pkgs.writeScript "setup-container" ''
|
||||
mkdir -p -m 0755 /nix/var/log/nix/drvs
|
||||
mkdir -p -m 0755 /nix/var/nix/gcroots
|
||||
mkdir -p -m 0755 /nix/var/nix/profiles
|
||||
mkdir -p -m 0755 /nix/var/nix/temproots
|
||||
mkdir -p -m 0755 /nix/var/nix/userpool
|
||||
mkdir -p -m 1777 /nix/var/nix/gcroots/per-user
|
||||
mkdir -p -m 1777 /nix/var/nix/profiles/per-user
|
||||
mkdir -p -m 0755 /nix/var/nix/profiles/per-user/root
|
||||
mkdir -p -m 0700 "$HOME/.nix-defexpr"
|
||||
. ${pkgs.nix}/etc/profile.d/nix-daemon.sh
|
||||
${pkgs.nix}/bin/nix-channel --add https://nixos.org/channels/nixos-unstable nixpkgs # 3
|
||||
${pkgs.nix}/bin/nix-channel --update nixpkgs
|
||||
${pkgs.nix}/bin/nix-env -i ${concatStringsSep " " (with pkgs; [nix cacert git openssh])}
|
||||
'';
|
||||
environmentVariables = {
|
||||
ENV = "/etc/profile";
|
||||
USER = "root";
|
||||
NIX_REMOTE = "daemon";
|
||||
PATH = "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin";
|
||||
NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt";
|
||||
};
|
||||
tagList = ["nix"];
|
||||
};
|
||||
|
||||
runner_general = {
|
||||
cloneUrl = cfg.runner.gitlab;
|
||||
description = "General Runner";
|
||||
registrationFlags = ["--docker-host" "tcp://127.0.0.1:2375"];
|
||||
registrationConfigFile = config.age.secrets.runner_02_general.path;
|
||||
dockerImage = cfg.runner.docker.image;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -9,6 +9,8 @@ with lib; let
|
|||
port = 4444;
|
||||
in {
|
||||
imports = [
|
||||
./acme.nix
|
||||
./dns.nix
|
||||
];
|
||||
|
||||
options.services.skynet."${name}" = {
|
||||
|
@ -49,8 +51,6 @@ in {
|
|||
domain = "${name}.skynet.ie";
|
||||
port = port;
|
||||
|
||||
settings.server.root_url = "https://${name}.skynet.ie";
|
||||
|
||||
settings.security.admin_password = "$__file{${config.age.secrets.grafana_pw.path}}";
|
||||
|
||||
provision = {
|
||||
|
|
|
@ -11,6 +11,9 @@ with lib; let
|
|||
port_backend = "8087";
|
||||
in {
|
||||
imports = [
|
||||
../acme.nix
|
||||
../dns.nix
|
||||
../nginx.nix
|
||||
inputs.skynet_ldap_backend.nixosModule."x86_64-linux"
|
||||
../../config/users.nix
|
||||
];
|
||||
|
@ -40,6 +43,7 @@ in {
|
|||
#backups = [ "/etc/silver_ul_ical/database.db" ];
|
||||
|
||||
age.secrets.ldap_details.file = ../../secrets/ldap/details.age;
|
||||
age.secrets.ldap_discord.file = ../../secrets/discord/ldap.age;
|
||||
age.secrets.ldap_mail.file = ../../secrets/email/details.age;
|
||||
age.secrets.ldap_wolves.file = ../../secrets/wolves/details.age;
|
||||
|
||||
|
@ -68,6 +72,7 @@ in {
|
|||
# contains teh password in env form
|
||||
env = {
|
||||
ldap = config.age.secrets.ldap_details.path;
|
||||
discord = config.age.secrets.ldap_discord.path;
|
||||
mail = config.age.secrets.ldap_mail.path;
|
||||
wolves = config.age.secrets.ldap_wolves.path;
|
||||
};
|
||||
|
|
|
@ -15,6 +15,9 @@ with lib; let
|
|||
in {
|
||||
# these are needed for teh program in question
|
||||
imports = [
|
||||
../acme.nix
|
||||
../dns.nix
|
||||
../nginx.nix
|
||||
];
|
||||
|
||||
options.services.skynet."${name}" = {
|
||||
|
|
|
@ -10,6 +10,9 @@ with lib; let
|
|||
domain = "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}";
|
||||
in {
|
||||
imports = [
|
||||
./acme.nix
|
||||
./dns.nix
|
||||
./nginx.nix
|
||||
];
|
||||
|
||||
options.services.skynet."${name}" = {
|
||||
|
@ -45,7 +48,6 @@ in {
|
|||
services.skynet.acme.domains = [
|
||||
domain
|
||||
"onlyoffice.${domain}"
|
||||
"whiteboard.${domain}"
|
||||
];
|
||||
|
||||
services.skynet.dns.records = [
|
||||
|
@ -59,18 +61,13 @@ in {
|
|||
r_type = "CNAME";
|
||||
value = config.services.skynet.host.name;
|
||||
}
|
||||
{
|
||||
record = "whiteboard.${cfg.domain.sub}";
|
||||
r_type = "CNAME";
|
||||
value = config.services.skynet.host.name;
|
||||
}
|
||||
];
|
||||
|
||||
# /var/lib/nextcloud/data
|
||||
|
||||
services.nextcloud = {
|
||||
enable = true;
|
||||
package = pkgs.nextcloud30;
|
||||
package = pkgs.nextcloud28;
|
||||
hostName = domain;
|
||||
https = true;
|
||||
|
||||
|
@ -84,10 +81,9 @@ in {
|
|||
|
||||
appstoreEnable = true;
|
||||
|
||||
extraApps = {
|
||||
inherit (config.services.nextcloud.package.packages.apps) richdocuments;
|
||||
extraApps = with config.services.nextcloud.package.packages.apps; {
|
||||
inherit forms groupfolders maps notes onlyoffice polls;
|
||||
};
|
||||
extraAppsEnable = true;
|
||||
|
||||
settings = {
|
||||
trusted_proxies = ["193.1.99.65"];
|
||||
|
@ -97,21 +93,10 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
environment.etc."nextcloud-whiteboard-secret".text = ''
|
||||
JWT_SECRET_KEY=test123
|
||||
'';
|
||||
|
||||
services.nextcloud-whiteboard-server = {
|
||||
enable = true;
|
||||
settings.NEXTCLOUD_URL = "https://nextcloud.skynet.ie";
|
||||
secrets = ["/etc/nextcloud-whiteboard-secret"];
|
||||
};
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
# impacted by https://github.com/NixOS /nixpkgs/issues/352443
|
||||
# services.onlyoffice = {
|
||||
# enable = true;
|
||||
# };
|
||||
services.onlyoffice = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts = {
|
||||
${domain} = {
|
||||
|
@ -123,14 +108,6 @@ in {
|
|||
useACMEHost = "skynet";
|
||||
locations."/".proxyPass = "http://127.0.0.1:8000";
|
||||
};
|
||||
"whiteboard.${domain}" = {
|
||||
forceSSL = true;
|
||||
useACMEHost = "skynet";
|
||||
locations."/" = {
|
||||
proxyPass = "http://localhost:3002";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -9,6 +9,8 @@
|
|||
recommendedGzipSettings = true;
|
||||
recommendedProxySettings = true;
|
||||
|
||||
statusPage = true;
|
||||
|
||||
# give Nginx access to our certs
|
||||
group = "acme";
|
||||
};
|
||||
|
|
|
@ -15,6 +15,7 @@ https://docs.attic.rs/introduction.html
|
|||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
|
@ -22,6 +23,9 @@ with lib; let
|
|||
cfg = config.services.skynet."${name}";
|
||||
in {
|
||||
imports = [
|
||||
inputs.attic.nixosModules.atticd
|
||||
../acme.nix
|
||||
../dns.nix
|
||||
];
|
||||
|
||||
options.services.skynet."${name}" = {
|
||||
|
@ -51,7 +55,7 @@ in {
|
|||
enable = true;
|
||||
|
||||
# Replace with absolute path to your credentials file
|
||||
environmentFile = "/etc/atticd.env";
|
||||
credentialsFile = "/etc/atticd.env";
|
||||
|
||||
settings = {
|
||||
listen = "127.0.0.1:8080";
|
||||
|
|
|
@ -13,6 +13,8 @@ with lib; let
|
|||
port = 11371;
|
||||
in {
|
||||
imports = [
|
||||
../acme.nix
|
||||
../dns.nix
|
||||
];
|
||||
|
||||
options.services.skynet."${name}" = {
|
||||
|
|
|
@ -15,6 +15,8 @@ with lib; let
|
|||
folder = "/var/skynet/${name}";
|
||||
in {
|
||||
imports = [
|
||||
../acme.nix
|
||||
../dns.nix
|
||||
];
|
||||
|
||||
options.services.skynet."${name}" = {
|
||||
|
|
|
@ -1,6 +0,0 @@
|
|||
# Notes on Pelican
|
||||
|
||||
## Panel
|
||||
|
||||
* ``pelican-install`` is in env that can be used to isntall
|
||||
* then go to ``panel-address.skynet.ie/installer`` to finish the setup
|
|
@ -1,30 +0,0 @@
|
|||
{
|
||||
pkgs,
|
||||
dir,
|
||||
}:
|
||||
pkgs.writeShellScriptBin "pelican-install" ''
|
||||
DIR=${dir}
|
||||
|
||||
echo "Installing Pelican panel to $DIR ..."
|
||||
if [ -d $DIR ]; then
|
||||
echo "Directory $DIR already exists, exiting"
|
||||
exit 1
|
||||
fi
|
||||
echo "Creating directory ..."
|
||||
mkdir -p $DIR
|
||||
cd $DIR
|
||||
|
||||
echo "Downloading Pelican panel ..."
|
||||
curl -L https://github.com/pelican-dev/panel/releases/latest/download/panel.tar.gz | tar -xzv
|
||||
echo "Installing Pelican panel using composer ..."
|
||||
yes | composer install --no-dev --optimize-autoloader
|
||||
|
||||
echo "Setting up the environment ..."
|
||||
yes "" | php artisan p:environment:setup
|
||||
|
||||
echo "Setting permissions ..."
|
||||
chmod -R 755 storage/* bootstrap/cache/
|
||||
chown -R nginx:acme $DIR
|
||||
|
||||
echo "Pelican panel installed successfully"
|
||||
''
|
|
@ -1,48 +0,0 @@
|
|||
{
|
||||
pkgs,
|
||||
dir,
|
||||
}:
|
||||
pkgs.writeShellScriptBin "pelican-update" ''
|
||||
DIR=${dir}
|
||||
|
||||
echo "Updateing Pelican panel in $DIR ..."
|
||||
if [ -d $DIR ]; then
|
||||
echo "Directory $DIR found, entering maintenance mode ..."
|
||||
else
|
||||
echo "Directory $DIR does not exist, exiting"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
cd $DIR
|
||||
php artisan down
|
||||
|
||||
echo "Downloading Pelican panel update ..."
|
||||
curl -L https://github.com/pelican-dev/panel/releases/latest/download/panel.tar.gz | tar -xzv
|
||||
|
||||
echo "Setting permissions ..."
|
||||
chmod -R 755 storage/* bootstrap/cache
|
||||
|
||||
echo "Updating Pelican panel using composer ..."
|
||||
yes | composer install --no-dev --optimize-autoloader
|
||||
|
||||
echo "Clearing compiled template cache ..."
|
||||
php artisan view:clear
|
||||
php artisan config:clear
|
||||
|
||||
echo "Optimizing Pelican panel ..."
|
||||
php artisan filament:optimize
|
||||
|
||||
echo "Updating the database ..."
|
||||
php artisan migrate --seed --force
|
||||
|
||||
echo "Setting permissions ..."
|
||||
chown -R nginx:acme $DIR
|
||||
|
||||
echo "Restart Pelican queue service ..."
|
||||
systemctl restart pelican-queue.service
|
||||
|
||||
echo "Exiting maintenance mode ..."
|
||||
php artisan up
|
||||
|
||||
echo "Pelican panel updated successfully"
|
||||
''
|
|
@ -1,24 +0,0 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
docker,
|
||||
gnutar,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pelican-wings";
|
||||
version = "v1.0.0-beta9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/pelican-dev/wings/releases/download/${version}/wings_linux_amd64";
|
||||
hash = "sha256-YaS1bthNSeWXH5drc2yensRqsRAOa2VXvivJOaPybqc=";
|
||||
};
|
||||
|
||||
buildInputs = [docker gnutar];
|
||||
|
||||
phases = ["installPhase"];
|
||||
|
||||
installPhase = ''
|
||||
install -D $src $out/bin/wings
|
||||
'';
|
||||
}
|
|
@ -1,323 +0,0 @@
|
|||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
name = "pelican";
|
||||
cfg = config.services.skynet."${name}";
|
||||
php_pool = name;
|
||||
domain_panel = "${cfg.panel.domain.sub}.${cfg.panel.domain.base}.${cfg.panel.domain.tld}";
|
||||
|
||||
packages = let
|
||||
dir = cfg.panel.dir;
|
||||
in [
|
||||
pkgs.curl
|
||||
pkgs.gnutar
|
||||
pkgs.unzip
|
||||
pkgs.gzip
|
||||
pkgs.php83
|
||||
pkgs.php83Packages.composer
|
||||
pkgs.php83Extensions.gd
|
||||
pkgs.php83Extensions.mysqli
|
||||
pkgs.php83Extensions.mbstring
|
||||
pkgs.php83Extensions.bcmath
|
||||
pkgs.php83Extensions.xml
|
||||
pkgs.php83Extensions.curl
|
||||
pkgs.php83Extensions.zip
|
||||
pkgs.php83Extensions.intl
|
||||
pkgs.php83Extensions.sqlite3
|
||||
(import ./pelican-panel-update.nix {
|
||||
inherit pkgs;
|
||||
inherit dir;
|
||||
})
|
||||
];
|
||||
in {
|
||||
imports = [
|
||||
];
|
||||
|
||||
options.services.skynet."${name}" = {
|
||||
panel = {
|
||||
enable = mkEnableOption "Pelican Panel";
|
||||
|
||||
dir = mkOption {
|
||||
type = types.str;
|
||||
default = "/var/lib/pelican_panel";
|
||||
};
|
||||
|
||||
domain = {
|
||||
tld = mkOption {
|
||||
type = types.str;
|
||||
default = "ie";
|
||||
};
|
||||
|
||||
base = mkOption {
|
||||
type = types.str;
|
||||
default = "skynet";
|
||||
};
|
||||
|
||||
sub = mkOption {
|
||||
type = types.str;
|
||||
#default = name;
|
||||
default = "panel.games";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
wing = {
|
||||
enable = mkEnableOption "Pelican Wing";
|
||||
|
||||
node_name = mkOption {
|
||||
type = types.str;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkMerge [
|
||||
(mkIf cfg.panel.enable {
|
||||
services.skynet.acme.domains = [
|
||||
domain_panel
|
||||
];
|
||||
|
||||
# using https://nixos.org/manual/nixos/stable/index.html#module-services-gitlab as a guide
|
||||
services.skynet.dns.records = [
|
||||
{
|
||||
record = cfg.panel.domain.sub;
|
||||
r_type = "CNAME";
|
||||
value = config.services.skynet.host.name;
|
||||
}
|
||||
];
|
||||
|
||||
environment.systemPackages = packages;
|
||||
|
||||
systemd.timers."pelican-cron" = {
|
||||
wantedBy = ["timers.target"];
|
||||
timerConfig = {
|
||||
OnBootSec = "5m";
|
||||
OnUnitActiveSec = "1m";
|
||||
Unit = "pelican-cron.service";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services."pelican-cron" = {
|
||||
script = ''
|
||||
${pkgs.php83}/bin/php ${cfg.panel.dir}/artisan schedule:run >> /dev/null 2>&1
|
||||
'';
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.pelican-queue = {
|
||||
wantedBy = ["multi-user.target"];
|
||||
serviceConfig = {
|
||||
User = config.services.nginx.user;
|
||||
Group = config.services.nginx.group;
|
||||
Restart = "always";
|
||||
ExecStart = "${pkgs.php83}/bin/php -q ${cfg.panel.dir}/artisan queue:work --tries=3";
|
||||
startLimitInterval = 180;
|
||||
startLimitBurst = 30;
|
||||
RestartSec = "5";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.pelican-panel-setup = {
|
||||
wantedBy = ["pelican-queue.target" "pelican-cron.target"];
|
||||
partOf = [];
|
||||
path = packages;
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
User = "root";
|
||||
Group = "root";
|
||||
TimeoutSec = "infinity";
|
||||
Restart = "on-failure";
|
||||
RemainAfterExit = true;
|
||||
ExecStart = pkgs.writeShellScript "pelican-panel-install" ''
|
||||
DIR=${cfg.panel.dir}
|
||||
|
||||
echo "Installing Pelican panel to $DIR ..."
|
||||
if [ -d $DIR ]; then
|
||||
echo "Directory $DIR already exists, exiting"
|
||||
exit 1
|
||||
fi
|
||||
echo "Creating directory ..."
|
||||
mkdir -p $DIR
|
||||
cd $DIR
|
||||
|
||||
echo "Downloading Pelican panel ..."
|
||||
curl -L https://github.com/pelican-dev/panel/releases/latest/download/panel.tar.gz | tar -xzv
|
||||
echo "Installing Pelican panel using composer ..."
|
||||
yes | composer install --no-dev --optimize-autoloader
|
||||
|
||||
echo "Setting up the environment ..."
|
||||
yes "" | php artisan p:environment:setup
|
||||
|
||||
echo "Setting permissions ..."
|
||||
chmod -R 755 storage/* bootstrap/cache/
|
||||
chown -R ${config.services.nginx.user}:${config.services.nginx.group} $DIR
|
||||
|
||||
echo "Pelican panel installed successfully"
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
services.phpfpm.pools.${php_pool} = {
|
||||
user = config.services.nginx.user;
|
||||
group = config.services.nginx.group;
|
||||
settings = {
|
||||
"listen.owner" = config.services.nginx.user;
|
||||
"listen.group" = config.services.nginx.group;
|
||||
"listen.mode" = "0600";
|
||||
"pm" = "dynamic";
|
||||
"pm.max_children" = 75;
|
||||
"pm.start_servers" = 10;
|
||||
"pm.min_spare_servers" = 5;
|
||||
"pm.max_spare_servers" = 20;
|
||||
"pm.max_requests" = 500;
|
||||
"catch_workers_output" = 1;
|
||||
};
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts."${domain_panel}" = {
|
||||
root = "${cfg.panel.dir}/public";
|
||||
|
||||
forceSSL = true;
|
||||
useACMEHost = "skynet";
|
||||
|
||||
extraConfig = ''
|
||||
index index.html index.htm index.php;
|
||||
charset utf-8;
|
||||
|
||||
access_log off;
|
||||
error_log /var/log/nginx/pelican.app-error.log error;
|
||||
|
||||
client_max_body_size 100m;
|
||||
client_body_timeout 120s;
|
||||
|
||||
sendfile off;
|
||||
|
||||
ssl_session_cache shared:SSL:10m;
|
||||
ssl_protocols TLSv1.2 TLSv1.3;
|
||||
ssl_ciphers "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384";
|
||||
ssl_prefer_server_ciphers on;
|
||||
|
||||
add_header X-Content-Type-Options nosniff;
|
||||
add_header X-XSS-Protection "1; mode=block";
|
||||
add_header X-Robots-Tag none;
|
||||
add_header Content-Security-Policy "frame-ancestors 'self'";
|
||||
add_header X-Frame-Options DENY;
|
||||
add_header Referrer-Policy same-origin;
|
||||
'';
|
||||
|
||||
locations = {
|
||||
"/" = {
|
||||
extraConfig = ''
|
||||
try_files $uri $uri/ /index.php?$query_string;
|
||||
'';
|
||||
};
|
||||
|
||||
"/favicon.ico".extraConfig = ''
|
||||
access_log off;
|
||||
log_not_found off;
|
||||
'';
|
||||
|
||||
"/robots.txt".extraConfig = ''
|
||||
access_log off;
|
||||
log_not_found off;
|
||||
'';
|
||||
|
||||
"~ \\.php$" = {
|
||||
extraConfig = ''
|
||||
fastcgi_split_path_info ^(.+\.php)(/.+)$;
|
||||
fastcgi_pass unix:${config.services.phpfpm.pools.${php_pool}.socket};
|
||||
fastcgi_index index.php;
|
||||
include ${config.services.nginx.package}/conf/fastcgi_params;
|
||||
fastcgi_param PHP_VALUE "upload_max_filesize = 100M \n post_max_size=100M";
|
||||
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||
fastcgi_param HTTP_PROXY "";
|
||||
fastcgi_intercept_errors off;
|
||||
fastcgi_buffer_size 16k;
|
||||
fastcgi_buffers 4 16k;
|
||||
fastcgi_connect_timeout 300;
|
||||
fastcgi_send_timeout 300;
|
||||
fastcgi_read_timeout 300;
|
||||
'';
|
||||
};
|
||||
|
||||
"~ /\\.ht".extraConfig = ''
|
||||
deny all;
|
||||
'';
|
||||
};
|
||||
};
|
||||
})
|
||||
|
||||
(mkIf cfg.wing.enable {
|
||||
services.skynet.acme.domains = [
|
||||
"${cfg.wing.node_name}.${domain_panel}"
|
||||
];
|
||||
|
||||
# using https://nixos.org/manual/nixos/stable/index.html#module-services-gitlab as a guide
|
||||
services.skynet.dns.records = [
|
||||
{
|
||||
record = "${cfg.wing.node_name}.${cfg.panel.domain.sub}";
|
||||
r_type = "CNAME";
|
||||
value = config.services.skynet.host.name;
|
||||
}
|
||||
];
|
||||
services.nginx.virtualHosts = {
|
||||
"${cfg.wing.node_name}.${domain_panel}" = {
|
||||
forceSSL = true;
|
||||
useACMEHost = "skynet";
|
||||
locations."/".proxyPass = "http://127.0.0.1:8080";
|
||||
};
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = [8080 8443];
|
||||
|
||||
virtualisation.docker.enable = true;
|
||||
|
||||
environment.systemPackages = [
|
||||
(pkgs.callPackage ./pelican-wing-package.nix {})
|
||||
];
|
||||
|
||||
users.groups.pelican = {};
|
||||
users.users.pelican = {
|
||||
#createHome = true;
|
||||
isSystemUser = true;
|
||||
#home = "/etc/pelican";
|
||||
group = "pelican";
|
||||
extraGroups = ["docker" "acme"];
|
||||
# X11 is to ensure the directory can be traversed
|
||||
#homeMode = "711";
|
||||
};
|
||||
|
||||
systemd.services.pelican-wings = {
|
||||
description = "Wings Daemon";
|
||||
after = ["docker.service"];
|
||||
requires = ["docker.service"];
|
||||
partOf = ["docker.service"];
|
||||
|
||||
serviceConfig = {
|
||||
User = "root";
|
||||
WorkingDirectory = "/etc/pelican";
|
||||
LimitNOFILE = 4096;
|
||||
PIDFile = "/var/run/wings/daemon.pid";
|
||||
ExecStart = "/run/current-system/sw/bin/wings";
|
||||
Restart = "on-failure";
|
||||
startLimitInterval = 180;
|
||||
startLimitBurst = 30;
|
||||
RestartSec = "5";
|
||||
};
|
||||
|
||||
wantedBy = ["multi-user.target"];
|
||||
};
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"L+ /etc/letsencrypt/live/${cfg.wing.node_name}.${domain_panel}/fullchain.pem - pelican acme - /var/lib/acme/skynet/fullchain.pem"
|
||||
"L+ /etc/letsencrypt/live/${cfg.wing.node_name}.${domain_panel}/privkey.pem - pelican acme - /var/lib/acme/skynet/key.pem"
|
||||
];
|
||||
})
|
||||
];
|
||||
}
|
|
@ -21,7 +21,7 @@ with lib; let
|
|||
)
|
||||
nodes
|
||||
);
|
||||
node = lib.attrsets.mapAttrsToList (key: value: "${value.config.deployment.targetHost}:${toString value.config.services.prometheus.exporters.node.port}") nodes;
|
||||
node = lib.attrsets.mapAttrsToList (key: value: "${value.config.deployment.targetHost}:${toString config.services.prometheus.exporters.node.port}") nodes;
|
||||
};
|
||||
|
||||
# clears any invalid entries
|
||||
|
@ -37,10 +37,8 @@ in {
|
|||
type = types.port;
|
||||
default = 9001;
|
||||
};
|
||||
};
|
||||
|
||||
external = {
|
||||
node = mkOption {
|
||||
external.node = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
description = ''
|
||||
|
@ -48,23 +46,15 @@ in {
|
|||
'';
|
||||
};
|
||||
};
|
||||
|
||||
ports = {
|
||||
node = mkOption {
|
||||
type = types.port;
|
||||
default = 9100;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkMerge [
|
||||
{
|
||||
services.prometheus.exporters.node = {
|
||||
enable = true;
|
||||
port = cfg.ports.node;
|
||||
openFirewall = true;
|
||||
# most collectors are on by default see https://github.com/prometheus/node_exporter for more options
|
||||
enabledCollectors = ["systemd" "processes"];
|
||||
enabledCollectors = ["systemd"];
|
||||
};
|
||||
}
|
||||
(mkIf cfg.server.enable {
|
||||
|
@ -76,7 +66,7 @@ in {
|
|||
job_name = "node_exporter";
|
||||
static_configs = [
|
||||
{
|
||||
targets = filter_empty (exporters.node ++ cfg.external.node);
|
||||
targets = filter_empty (exporters.node ++ cfg.server.external.node);
|
||||
}
|
||||
];
|
||||
}
|
||||
|
|
93
applications/proxmox-lxc.nix
Normal file
93
applications/proxmox-lxc.nix
Normal file
|
@ -0,0 +1,93 @@
|
|||
/*
|
||||
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 ProxmoxLXC.";
|
||||
};
|
||||
privileged = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc ''
|
||||
Whether to enable privileged mounts
|
||||
'';
|
||||
};
|
||||
manageNetwork = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc ''
|
||||
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 = lib.mdDoc ''
|
||||
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;
|
||||
};
|
||||
|
||||
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)
|
||||
[
|
||||
{
|
||||
where = "/sys/kernel/debug";
|
||||
enable = false;
|
||||
}
|
||||
];
|
||||
};
|
||||
}
|
|
@ -144,15 +144,14 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
config = mkMerge [
|
||||
config =
|
||||
{
|
||||
# these values are anabled for every client
|
||||
environment.systemPackages = with pkgs; [
|
||||
restic
|
||||
];
|
||||
}
|
||||
|
||||
(mkIf cfg.server.enable {
|
||||
// mkIf cfg.server.enable {
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
cfg.server.port
|
||||
];
|
||||
|
@ -172,9 +171,8 @@ in {
|
|||
appendOnly = cfg.server.appendOnly;
|
||||
privateRepos = true;
|
||||
};
|
||||
})
|
||||
|
||||
(mkIf enable_client {
|
||||
}
|
||||
// mkIf enable_client {
|
||||
# client stuff here
|
||||
|
||||
# A list of all login accounts. To create the password hashes, use
|
||||
|
@ -183,17 +181,15 @@ in {
|
|||
|
||||
age.secrets.restic.file = ../secrets/backup/restic.age;
|
||||
|
||||
services.restic.backups = mkMerge [
|
||||
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:/${config.services.skynet.host.name}";
|
||||
# #environmentFile = config.age.secrets.backblaze.path;
|
||||
# };
|
||||
}
|
||||
];
|
||||
})
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -10,15 +10,8 @@ with lib; let
|
|||
cfg = config.services.skynet."${name}";
|
||||
in {
|
||||
imports = [
|
||||
# import in past website versions, available at $year.skynet.ie
|
||||
# at teh end of teh year add it here
|
||||
(import ./old_site.nix {year = "2024";})
|
||||
(import ./old_site.nix {year = "2023";})
|
||||
(import ./old_site.nix {year = "2022";})
|
||||
(import ./old_site.nix {year = "2016";})
|
||||
(import ./old_site.nix {year = "2006";})
|
||||
(import ./old_site.nix {year = "2003";})
|
||||
(import ./old_site.nix {year = "1996";})
|
||||
./acme.nix
|
||||
./dns.nix
|
||||
];
|
||||
|
||||
options.services.skynet."${name}" = {
|
||||
|
@ -27,8 +20,11 @@ in {
|
|||
|
||||
config = mkIf cfg.enable {
|
||||
services.skynet.acme.domains = [
|
||||
"*.skynet.ie"
|
||||
"*.discord.skynet.ie"
|
||||
# the root one is already covered by teh certificate
|
||||
"2016.skynet.ie"
|
||||
"discord.skynet.ie"
|
||||
"public.skynet.ie"
|
||||
"renew.skynet.ie"
|
||||
];
|
||||
|
||||
services.skynet.dns.records = [
|
||||
|
@ -39,7 +35,7 @@ in {
|
|||
value = config.services.skynet.host.ip;
|
||||
}
|
||||
{
|
||||
record = "www";
|
||||
record = "2016";
|
||||
r_type = "CNAME";
|
||||
value = config.services.skynet.host.name;
|
||||
}
|
||||
|
@ -48,30 +44,28 @@ in {
|
|||
r_type = "CNAME";
|
||||
value = config.services.skynet.host.name;
|
||||
}
|
||||
{
|
||||
record = "wolves";
|
||||
r_type = "CNAME";
|
||||
value = config.services.skynet.host.name;
|
||||
}
|
||||
{
|
||||
record = "public";
|
||||
r_type = "CNAME";
|
||||
value = config.services.skynet.host.name;
|
||||
}
|
||||
{
|
||||
record = "*.discord";
|
||||
record = "renew";
|
||||
r_type = "CNAME";
|
||||
value = config.services.skynet.host.name;
|
||||
}
|
||||
];
|
||||
|
||||
services.nginx = {
|
||||
virtualHosts = let
|
||||
main_site = {
|
||||
virtualHosts = {
|
||||
# main site
|
||||
"skynet.ie" = {
|
||||
forceSSL = true;
|
||||
useACMEHost = "skynet";
|
||||
locations = {
|
||||
"/".root = "${inputs.skynet_website.defaultPackage."x86_64-linux"}";
|
||||
"/" = {
|
||||
root = "${inputs.skynet_website.defaultPackage."x86_64-linux"}";
|
||||
};
|
||||
|
||||
# this redirects old links to new format
|
||||
"~* ~(?<username>[a-z_0-9]*)(?<files>\\S*)$" = {
|
||||
|
@ -80,15 +74,12 @@ in {
|
|||
};
|
||||
};
|
||||
};
|
||||
in {
|
||||
# main site
|
||||
"www.skynet.ie" = main_site;
|
||||
"skynet.ie" = main_site;
|
||||
|
||||
"wolves.skynet.ie" = {
|
||||
# archive of teh site as it was ~2012 to 2016
|
||||
"2016.skynet.ie" = {
|
||||
forceSSL = true;
|
||||
useACMEHost = "skynet";
|
||||
locations."/".return = "307 https://ulwolves.ie/society/computer";
|
||||
root = "${inputs.skynet_website_2016.defaultPackage."x86_64-linux"}";
|
||||
};
|
||||
|
||||
# a custom discord url, because we are too cheap otehrwise
|
||||
|
@ -97,16 +88,6 @@ in {
|
|||
useACMEHost = "skynet";
|
||||
locations."/".return = "307 https://discord.gg/mkuKJkCuyM";
|
||||
};
|
||||
"compsoc.discord.skynet.ie" = {
|
||||
forceSSL = true;
|
||||
useACMEHost = "skynet";
|
||||
locations."/".return = "307 https://discord.gg/mkuKJkCuyM";
|
||||
};
|
||||
"committee.discord.skynet.ie" = {
|
||||
forceSSL = true;
|
||||
useACMEHost = "skynet";
|
||||
locations."/".return = "307 https://discord.gg/D6mbASJKxU";
|
||||
};
|
||||
|
||||
"public.skynet.ie" = {
|
||||
forceSSL = true;
|
||||
|
@ -114,20 +95,13 @@ in {
|
|||
root = "${inputs.compsoc_public.packages.x86_64-linux.default}";
|
||||
locations."/".extraConfig = "autoindex on;";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# Some old sites need a php pool running
|
||||
services.phpfpm.pools.old_sites = {
|
||||
user = "nobody";
|
||||
settings = {
|
||||
"pm" = "dynamic";
|
||||
"listen.owner" = config.services.nginx.user;
|
||||
"pm.max_children" = 5;
|
||||
"pm.start_servers" = 2;
|
||||
"pm.min_spare_servers" = 1;
|
||||
"pm.max_spare_servers" = 3;
|
||||
"pm.max_requests" = 500;
|
||||
# for alumni members to renew their account
|
||||
"renew.skynet.ie" = {
|
||||
forceSSL = true;
|
||||
useACMEHost = "skynet";
|
||||
root = "${inputs.skynet_website_renew.defaultPackage."x86_64-linux"}";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
|
@ -1,52 +0,0 @@
|
|||
{year}: {
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
with lib; {
|
||||
imports = [];
|
||||
|
||||
config = {
|
||||
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"}";
|
||||
# Handle any of the old php sites
|
||||
# https://stackoverflow.com/a/21911610
|
||||
locations = {
|
||||
"/" = {
|
||||
index = "index.html index.htm index.php";
|
||||
tryFiles = "$uri $uri.html $uri/ @extensionless-php";
|
||||
};
|
||||
|
||||
"~ \\.php$" = {
|
||||
extraConfig = ''
|
||||
fastcgi_pass unix:${config.services.phpfpm.pools.old_sites.socket};
|
||||
fastcgi_index index.php;
|
||||
'';
|
||||
tryFiles = "$uri =404";
|
||||
};
|
||||
|
||||
"@extensionless-php" = {
|
||||
extraConfig = ''
|
||||
rewrite ^(.*)$ $1.php last;
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -1,59 +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.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";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -9,25 +9,11 @@ with lib; let
|
|||
name = "website_users";
|
||||
cfg = config.services.skynet."${name}";
|
||||
php_pool = name;
|
||||
|
||||
custom = domain: user: {
|
||||
"${domain}" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations = {
|
||||
"/" = {
|
||||
alias = "/home/${user}/public_html/";
|
||||
index = "index.html";
|
||||
extraConfig = ''
|
||||
autoindex on;
|
||||
'';
|
||||
tryFiles = "$uri$args $uri$args/ /index.html";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
in {
|
||||
imports = [
|
||||
./acme.nix
|
||||
./dns.nix
|
||||
./nginx.nix
|
||||
];
|
||||
|
||||
options.services.skynet."${name}" = {
|
||||
|
@ -35,10 +21,7 @@ in {
|
|||
};
|
||||
|
||||
config = {
|
||||
# we havea more limited ports range on the skynet server
|
||||
services.skynet.prometheus.ports = {
|
||||
node = 9000;
|
||||
};
|
||||
# ssh access
|
||||
|
||||
# allow more than admins access
|
||||
services.skynet.ldap_client = {
|
||||
|
@ -101,46 +84,41 @@ in {
|
|||
phpEnv."PATH" = lib.makeBinPath [pkgs.php];
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts = lib.mkMerge [
|
||||
services.nginx.virtualHosts = {
|
||||
# main site
|
||||
{
|
||||
"*.users.skynet.ie" = {
|
||||
forceSSL = true;
|
||||
useACMEHost = "skynet";
|
||||
serverName = "~^(?<user>.+)\.users\.skynet\.ie";
|
||||
"*.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
|
||||
# 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";
|
||||
};
|
||||
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";
|
||||
};
|
||||
"~ ^(.+\\.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";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
(custom "outinul.ie" "outinul")
|
||||
(custom "www.outinul.ie" "outinul")
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,77 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
name = "sso";
|
||||
cfg = config.services.skynet."${name}";
|
||||
in {
|
||||
imports = [
|
||||
];
|
||||
|
||||
options.services.skynet."${name}" = {
|
||||
enable = mkEnableOption "Keycloak 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.keycloak_pw.file = ../secrets/keycloak/pw.age;
|
||||
|
||||
services.nginx.virtualHosts = {
|
||||
"${name}.skynet.ie" = {
|
||||
forceSSL = true;
|
||||
useACMEHost = "skynet";
|
||||
locations = {
|
||||
"/" = {
|
||||
proxyPass = "http://localhost:${toString config.services.keycloak.settings.http-port}/";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
services.postgresql.enable = true;
|
||||
|
||||
services.keycloak = {
|
||||
enable = true;
|
||||
|
||||
initialAdminPassword = "sharky_loves_sso";
|
||||
|
||||
database = {
|
||||
type = "postgresql";
|
||||
createLocally = true;
|
||||
|
||||
username = "keycloak";
|
||||
passwordFile = config.age.secrets.keycloak_pw.path;
|
||||
};
|
||||
|
||||
settings = {
|
||||
hostname = "${name}.skynet.ie";
|
||||
http-port = 38080;
|
||||
proxy-headers = "xforwarded";
|
||||
http-enabled = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -9,6 +9,10 @@ with lib; let
|
|||
cfg = config.services.skynet."${name}";
|
||||
in {
|
||||
imports = [
|
||||
./acme.nix
|
||||
./dns.nix
|
||||
./firewall.nix
|
||||
./nginx.nix
|
||||
];
|
||||
|
||||
options.services.skynet."${name}" = {
|
||||
|
|
140
config/dns.nix
140
config/dns.nix
|
@ -1,70 +1,92 @@
|
|||
{lib, ...}: {
|
||||
imports = [
|
||||
# Paths to other modules.
|
||||
# Compose this module out of smaller ones.
|
||||
];
|
||||
|
||||
# this needs to mirror ../applications/dns.nix
|
||||
options.skynet.records = lib.mkOption {
|
||||
description = "Records, sorted based on therir type";
|
||||
type = lib.types.listOf (lib.types.submodule (import ../applications/dns/options-records.nix {
|
||||
inherit lib;
|
||||
}));
|
||||
type = with lib.types;
|
||||
listOf (submodule {
|
||||
options = {
|
||||
record = lib.mkOption {
|
||||
type = str;
|
||||
};
|
||||
r_type = lib.mkOption {
|
||||
type = enum ["A" "CNAME" "TXT" "PTR" "SRV" "MX"];
|
||||
};
|
||||
value = lib.mkOption {
|
||||
type = str;
|
||||
};
|
||||
server = lib.mkOption {
|
||||
description = "Core record for a server";
|
||||
type = bool;
|
||||
default = false;
|
||||
};
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
config = {
|
||||
skynet.records =
|
||||
[
|
||||
# Proxmox hosts
|
||||
{
|
||||
record = "jarvis";
|
||||
r_type = "A";
|
||||
value = "193.1.99.73";
|
||||
server = true;
|
||||
}
|
||||
{
|
||||
record = "ultron";
|
||||
r_type = "A";
|
||||
value = "193.1.99.84";
|
||||
server = true;
|
||||
}
|
||||
# wifi in server room
|
||||
{
|
||||
record = "ash";
|
||||
r_type = "A";
|
||||
value = "193.1.99.114";
|
||||
server = true;
|
||||
}
|
||||
{
|
||||
record = "mimi";
|
||||
r_type = "A";
|
||||
value = "193.1.99.86";
|
||||
server = true;
|
||||
}
|
||||
{
|
||||
record = "nuked";
|
||||
r_type = "CNAME";
|
||||
value = "neuromancer.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.";
|
||||
}
|
||||
];
|
||||
skynet.records = [
|
||||
{
|
||||
record = "optimus";
|
||||
r_type = "A";
|
||||
value = "193.1.99.90";
|
||||
server = true;
|
||||
}
|
||||
{
|
||||
record = "panel.games";
|
||||
r_type = "CNAME";
|
||||
value = "optimus";
|
||||
}
|
||||
{
|
||||
record = "bumblebee";
|
||||
r_type = "A";
|
||||
value = "193.1.99.91";
|
||||
server = true;
|
||||
}
|
||||
{
|
||||
record = "minecraft.compsoc.games";
|
||||
r_type = "CNAME";
|
||||
value = "bumblebee";
|
||||
}
|
||||
{
|
||||
record = "_minecraft._tcp.minecraft.compsoc.games.skynet.ie.";
|
||||
r_type = "SRV";
|
||||
value = "0 10 25518 minecraft.compsoc.games.skynet.ie.";
|
||||
}
|
||||
{
|
||||
record = "minecraft-classic.compsoc.games";
|
||||
r_type = "CNAME";
|
||||
value = "bumblebee";
|
||||
}
|
||||
{
|
||||
record = "_minecraft._tcp.minecraft-classic.compsoc.games.skynet.ie.";
|
||||
r_type = "SRV";
|
||||
value = "0 10 25520 minecraft-classic.compsoc.games.skynet.ie.";
|
||||
}
|
||||
{
|
||||
record = "minecraft.gsoc.games";
|
||||
r_type = "CNAME";
|
||||
value = "bumblebee";
|
||||
}
|
||||
{
|
||||
record = "_minecraft._tcp.minecraft.gsoc.games.skynet.ie.";
|
||||
r_type = "SRV";
|
||||
value = "0 10 25521 minecraft.gsoc.games.skynet.ie.";
|
||||
}
|
||||
{
|
||||
record = "minecraft.phildeb.games";
|
||||
r_type = "CNAME";
|
||||
value = "bumblebee";
|
||||
}
|
||||
{
|
||||
record = "_minecraft._tcp.minecraft.phildeb.games.skynet.ie.";
|
||||
r_type = "SRV";
|
||||
value = "0 10 25522 minecraft.phildeb.games.skynet.ie.";
|
||||
}
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,11 +1,6 @@
|
|||
{
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{lib, ...}:
|
||||
with lib; let
|
||||
port_backend = "8087";
|
||||
cfg = config.skynet.users;
|
||||
in {
|
||||
options.skynet = {
|
||||
users = {
|
||||
|
@ -49,49 +44,29 @@ in {
|
|||
|
||||
config.skynet = {
|
||||
users = {
|
||||
committee = lib.lists.unique (
|
||||
# Committee - Core
|
||||
[
|
||||
# President
|
||||
"silver"
|
||||
# Secretary
|
||||
"kaiden"
|
||||
# Treasurer
|
||||
"peace"
|
||||
# PRO
|
||||
"amymucko"
|
||||
# HSO
|
||||
"skyapples"
|
||||
]
|
||||
# Committee - OCM
|
||||
++ [
|
||||
"connormc"
|
||||
"cordlesscoder"
|
||||
"dca_"
|
||||
"eliza"
|
||||
"emilyrutai"
|
||||
"generically"
|
||||
"mysticwolf"
|
||||
"nanda"
|
||||
"rituk_0817"
|
||||
"sania_m"
|
||||
"shourjyo24_"
|
||||
"sunny"
|
||||
"tatabbyi"
|
||||
"wormyworm5"
|
||||
]
|
||||
# Committee - SISTEM
|
||||
++ []
|
||||
# Admins are part of Committee as well
|
||||
++ cfg.admin
|
||||
);
|
||||
committee = [
|
||||
"silver"
|
||||
"eoghanconlon73"
|
||||
"sidhiel"
|
||||
"maksimsger1"
|
||||
"kaiden"
|
||||
"pine"
|
||||
"nanda"
|
||||
"sourabh1805"
|
||||
"kronsy"
|
||||
"skyapples"
|
||||
];
|
||||
admin = [
|
||||
"silver"
|
||||
"evanc"
|
||||
"eoghanconlon73"
|
||||
"eliza"
|
||||
"esy"
|
||||
];
|
||||
trainee = [];
|
||||
trainee = [
|
||||
"milan"
|
||||
"esy"
|
||||
"kronsy"
|
||||
];
|
||||
lifetime = [];
|
||||
banned = [];
|
||||
|
||||
|
|
1388
flake.lock
generated
1388
flake.lock
generated
File diff suppressed because it is too large
Load diff
123
flake.nix
123
flake.nix
|
@ -12,54 +12,75 @@
|
|||
agenix.url = "github:ryantm/agenix";
|
||||
arion.url = "github:hercules-ci/arion";
|
||||
alejandra = {
|
||||
url = "github:kamadorueda/alejandra";
|
||||
url = "github:kamadorueda/alejandra/3.0.0";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
colmena.url = "github:zhaofengli/colmena";
|
||||
attic.url = github:zhaofengli/attic;
|
||||
|
||||
# we host our own
|
||||
# email
|
||||
# simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
|
||||
simple-nixos-mailserver = {
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
url = "git+https://forgejo.skynet.ie/Skynet/misc_nixos-mailserver";
|
||||
type = "gitlab";
|
||||
host = "gitlab.skynet.ie";
|
||||
owner = "compsoc1%2Fskynet";
|
||||
repo = "misc%2Fnixos-mailserver";
|
||||
};
|
||||
|
||||
######################
|
||||
### skynet backend ###
|
||||
######################
|
||||
skynet_ldap_backend.url = "git+https://forgejo.skynet.ie/Skynet/ldap_backend";
|
||||
# skynet_ldap_backend.url = "git+file:/_college/CompSoc/Skynet/ldap_backend?shallow=1";
|
||||
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";
|
||||
skynet_discord_bot_t-800.url = "git+https://forgejo.skynet.ie/Skynet/discord-bot-t-800";
|
||||
# for testing a local build
|
||||
# skynet_discord_bot.url = "git+file:/_college/CompSoc/Skynet/discord_bot?shallow=1";
|
||||
|
||||
#####################
|
||||
### compsoc stuff ###
|
||||
#####################
|
||||
compsoc_public.url = "git+https://forgejo.skynet.ie/Computer_Society/presentations_compsoc";
|
||||
|
||||
#################
|
||||
### skynet.ie ###
|
||||
#################
|
||||
|
||||
# this should always point to teh current website
|
||||
skynet_website.url = "git+https://forgejo.skynet.ie/Skynet/website_2023";
|
||||
|
||||
# past versions of the current website
|
||||
skynet_website_2024.url = "git+https://forgejo.skynet.ie/Skynet/website_2023?ref=main&rev=8987e33cb709e7f2c30017e77edf9161b87d9885";
|
||||
skynet_website_2023.url = "git+https://forgejo.skynet.ie/Skynet/website_2023?ref=main&rev=c4d61c753292bf73ed41b47b1607cfc92a82a191";
|
||||
skynet_website_2022.url = "git+https://forgejo.skynet.ie/Skynet/website_2023?ref=2022&rev=687a0b1811987cfc27c2e6f5a625c4d59ef577c2";
|
||||
|
||||
skynet_website_2016.url = "git+https://forgejo.skynet.ie/Skynet/website_2016";
|
||||
skynet_website_2006.url = "git+https://forgejo.skynet.ie/Skynet/website_2006";
|
||||
skynet_website_2003.url = "git+https://forgejo.skynet.ie/Skynet/website_2003";
|
||||
skynet_website_1996.url = "git+https://forgejo.skynet.ie/Skynet/website_1996";
|
||||
# account.skynet.ie
|
||||
skynet_ldap_backend = {
|
||||
type = "gitlab";
|
||||
host = "gitlab.skynet.ie";
|
||||
owner = "compsoc1%2Fskynet";
|
||||
repo = "ldap%2Fbackend";
|
||||
};
|
||||
skynet_ldap_frontend = {
|
||||
type = "gitlab";
|
||||
host = "gitlab.skynet.ie";
|
||||
owner = "compsoc1%2Fskynet";
|
||||
repo = "ldap%2Ffrontend";
|
||||
};
|
||||
skynet_website = {
|
||||
type = "gitlab";
|
||||
host = "gitlab.skynet.ie";
|
||||
owner = "compsoc1%2Fskynet";
|
||||
repo = "website%2F2023";
|
||||
};
|
||||
skynet_website_2016 = {
|
||||
type = "gitlab";
|
||||
host = "gitlab.skynet.ie";
|
||||
owner = "compsoc1%2Fskynet";
|
||||
repo = "website%2F2016";
|
||||
};
|
||||
skynet_website_renew = {
|
||||
type = "gitlab";
|
||||
host = "gitlab.skynet.ie";
|
||||
owner = "compsoc1%2Fskynet";
|
||||
repo = "website%2Falumni-renew";
|
||||
};
|
||||
skynet_website_games = {
|
||||
type = "gitlab";
|
||||
host = "gitlab.skynet.ie";
|
||||
owner = "compsoc1%2Fskynet";
|
||||
repo = "website%2Fgames.skynet.ie";
|
||||
};
|
||||
skynet_discord_bot = {
|
||||
type = "gitlab";
|
||||
host = "gitlab.skynet.ie";
|
||||
owner = "compsoc1%2Fskynet";
|
||||
repo = "discord-bot";
|
||||
};
|
||||
compsoc_public = {
|
||||
type = "gitlab";
|
||||
host = "gitlab.skynet.ie";
|
||||
owner = "compsoc1%2Fcompsoc";
|
||||
repo = "presentations%2Fpresentations";
|
||||
};
|
||||
};
|
||||
|
||||
nixConfig = {
|
||||
bash-prompt-suffix = "[Skynet Dev] ";
|
||||
extra-substituters = "https://nix-cache.skynet.ie/skynet-cache";
|
||||
extra-trusted-public-keys = "skynet-cache:zMFLzcRZPhUpjXUy8SF8Cf7KGAZwo98SKrzeXvdWABo=";
|
||||
};
|
||||
|
@ -77,7 +98,7 @@
|
|||
formatter.x86_64-linux = alejandra.defaultPackage."x86_64-linux";
|
||||
|
||||
devShells.x86_64-linux.default = pkgs.mkShell {
|
||||
name = "Skynet";
|
||||
name = "Skynet build env";
|
||||
nativeBuildInputs = [
|
||||
pkgs.buildPackages.git
|
||||
colmena.defaultPackage."x86_64-linux"
|
||||
|
@ -85,28 +106,17 @@
|
|||
pkgs.buildPackages.nmap
|
||||
];
|
||||
buildInputs = [agenix.packages.x86_64-linux.default];
|
||||
shellHook = ''export PROMPT_DIRTRIM=3; export PS1="[Skynet] \w:\$ "'';
|
||||
shellHook = ''export EDITOR="${pkgs.nano}/bin/nano --nonewlines"; unset LD_LIBRARY_PATH;'';
|
||||
};
|
||||
|
||||
colmena = {
|
||||
meta = {
|
||||
nixpkgs = import nixpkgs {
|
||||
system = "x86_64-linux";
|
||||
overlays = [
|
||||
(final: prev: {
|
||||
inherit
|
||||
(final.lixPackageSets.stable)
|
||||
nixpkgs-review
|
||||
nix-direnv
|
||||
nix-eval-jobs
|
||||
nix-fast-build
|
||||
colmena
|
||||
;
|
||||
})
|
||||
];
|
||||
overlays = [];
|
||||
};
|
||||
specialArgs = {
|
||||
inherit inputs self;
|
||||
inherit inputs;
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -154,15 +164,6 @@
|
|||
|
||||
# Public Services
|
||||
calculon = import ./machines/calculon.nix;
|
||||
|
||||
# metrics
|
||||
ariia = import ./machines/ariia.nix;
|
||||
|
||||
# games server - panel
|
||||
optimus = import ./machines/optimus.nix;
|
||||
|
||||
# games server - host
|
||||
bumblebee = import ./machines/bumblebee.nix;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -11,14 +11,30 @@ with lib; let
|
|||
cfg = config.skynet;
|
||||
in {
|
||||
imports = [
|
||||
# This is required for LXC to function properly
|
||||
(modulesPath + "/virtualisation/proxmox-lxc.nix")
|
||||
# custom lxc mocule until the patch gets merged in
|
||||
../applications/proxmox-lxc.nix
|
||||
# (modulesPath + "/virtualisation/proxmox-lxc.nix")
|
||||
|
||||
# for the secrets
|
||||
inputs.agenix.nixosModules.default
|
||||
|
||||
# base application config for all servers
|
||||
# base config for all servers
|
||||
../applications/_base.nix
|
||||
|
||||
# every sever may need the firewall config stuff
|
||||
../applications/firewall.nix
|
||||
|
||||
# every sever needs to have a dns record
|
||||
../applications/dns.nix
|
||||
|
||||
# every server needs teh ldap client for admins
|
||||
../applications/ldap/client.nix
|
||||
|
||||
# every server will need the config to backup to
|
||||
../applications/restic.nix
|
||||
|
||||
# every server will be monitored for grafana
|
||||
../applications/prometheus.nix
|
||||
];
|
||||
|
||||
options.skynet = {
|
||||
|
@ -32,13 +48,7 @@ in {
|
|||
|
||||
config = {
|
||||
# if its a lxc enable
|
||||
proxmoxLXC = {
|
||||
enable = cfg.lxc;
|
||||
manageNetwork = true;
|
||||
manageHostName = true;
|
||||
};
|
||||
|
||||
age.secrets.root_pw.file = ../secrets/base/root_pass.age;
|
||||
proxmoxLXC.enable = cfg.lxc;
|
||||
|
||||
nix = {
|
||||
settings = {
|
||||
|
@ -57,10 +67,10 @@ in {
|
|||
# options = "--delete-older-than 30d";
|
||||
# };
|
||||
|
||||
# to free up to 100GiB whenever there is less than 1GiB left
|
||||
# to free up to 10GiB whenever there is less than 1GiB left
|
||||
extraOptions = ''
|
||||
min-free = ${toString (1024 * 1024 * 1024 * 1)}
|
||||
max-free = ${toString (1024 * 1024 * 1024 * 100)}
|
||||
min-free = ${toString (1024 * 1024 * 1024)}
|
||||
max-free = ${toString (1024 * 1024 * 1024 * 10)}
|
||||
'';
|
||||
};
|
||||
|
||||
|
@ -71,29 +81,23 @@ in {
|
|||
settings.PermitRootLogin = "prohibit-password";
|
||||
};
|
||||
|
||||
users = {
|
||||
mutableUsers = false;
|
||||
users.users.root = {
|
||||
initialHashedPassword = "";
|
||||
|
||||
users.root = {
|
||||
hashedPasswordFile = config.age.secrets.root_pw.path;
|
||||
openssh.authorizedKeys.keys = [
|
||||
# no obligation to have name attached to keys
|
||||
|
||||
openssh.authorizedKeys.keys = [
|
||||
# no obligation to have name attached to keys
|
||||
# Root account
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK6DjXTAxesXpQ65l659iAjzEb6VpRaWKSg4AXxifPw9 Skynet Admin"
|
||||
|
||||
# Root account
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK6DjXTAxesXpQ65l659iAjzEb6VpRaWKSg4AXxifPw9 Skynet Admin"
|
||||
# CI/CD key
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBDvexq/JjsMqL0G5P38klzoOkHs3IRyXYO1luEJuB5R colmena_key"
|
||||
|
||||
# CI/CD key
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBDvexq/JjsMqL0G5P38klzoOkHs3IRyXYO1luEJuB5R colmena_key"
|
||||
# Brendan Golden
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEHNLroAjCVR9Tx382cqdxPZ5KY32r/yoQH1mgsYNqpm Silver_Laptop_WSL_Deb"
|
||||
|
||||
# Brendan Golden
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEHNLroAjCVR9Tx382cqdxPZ5KY32r/yoQH1mgsYNqpm Silver_Laptop_WSL_Deb"
|
||||
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKjaKI97NY7bki07kxAvo95196NXCaMvI1Dx7dMW05Q1 thenobrainer"
|
||||
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDxHpsApRyCvuP2ToGm46G308Og8lO7BYPuz+EqHVU5w esy root"
|
||||
];
|
||||
};
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKjaKI97NY7bki07kxAvo95196NXCaMvI1Dx7dMW05Q1 thenobrainer"
|
||||
];
|
||||
};
|
||||
|
||||
# skynet-admin-linux will always be added, individual servers can override the groups option
|
||||
|
@ -103,8 +107,6 @@ in {
|
|||
# every sever needs to be accessable over ssh for admin use at least
|
||||
firewall.allowedTCPPorts = [22];
|
||||
|
||||
resolvconf.useLocalResolver = false;
|
||||
resolvconf.extraConfig = "name_servers='193.1.99.120 193.1.99.109'";
|
||||
# explisitly stating this is good
|
||||
defaultGateway = {
|
||||
address = "193.1.99.65";
|
||||
|
@ -130,21 +132,19 @@ in {
|
|||
# https://discourse.nixos.org/t/systemd-networkd-wait-online-934764-timeout-occurred-while-waiting-for-network-connectivity/33656/9
|
||||
systemd.network.wait-online.enable = false;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
environment.systemPackages = [
|
||||
# for flakes
|
||||
git
|
||||
git-lfs
|
||||
pkgs.git
|
||||
# useful tools
|
||||
ncdu_2
|
||||
htop
|
||||
nano
|
||||
nmap
|
||||
bind
|
||||
zip
|
||||
traceroute
|
||||
openldap
|
||||
screen
|
||||
inetutils
|
||||
pkgs.ncdu_2
|
||||
pkgs.htop
|
||||
pkgs.nano
|
||||
pkgs.nmap
|
||||
pkgs.bind
|
||||
pkgs.zip
|
||||
pkgs.traceroute
|
||||
pkgs.openldap
|
||||
pkgs.screen
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,56 +0,0 @@
|
|||
/*
|
||||
Name: Link to where information on the name can be found
|
||||
Why: Why is it named this
|
||||
Type: VM/Physical
|
||||
Hardware: - if its a VM, the hardware (PowerEdge r210) if its physical
|
||||
From: 2023/2024/2025/...
|
||||
Role: What role does it have in teh cluster
|
||||
Notes:
|
||||
*/
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
nodes,
|
||||
...
|
||||
}: let
|
||||
# name of the server, sets teh hostname and record for it
|
||||
name = "name";
|
||||
# Assigned IP address
|
||||
ip_pub = "193.1.99.000";
|
||||
|
||||
# dont need to change these
|
||||
hostname = "${name}.skynet.ie";
|
||||
host = {
|
||||
ip = ip_pub;
|
||||
name = name;
|
||||
hostname = hostname;
|
||||
};
|
||||
in {
|
||||
# what configurrations to import, email in this example
|
||||
imports = [
|
||||
../applications/email.nix
|
||||
];
|
||||
|
||||
deployment = {
|
||||
# dont need to change these
|
||||
targetHost = hostname;
|
||||
targetPort = 22;
|
||||
targetUser = null;
|
||||
|
||||
# deployment option: active-dns/active-core/active-ext/active
|
||||
tags = [
|
||||
"active"
|
||||
];
|
||||
};
|
||||
|
||||
services.skynet = {
|
||||
# pass in the details of the host server
|
||||
host = host;
|
||||
|
||||
# enable the backup service
|
||||
backup.enable = true;
|
||||
|
||||
# enable the imported service
|
||||
email.enable = true;
|
||||
};
|
||||
}
|
|
@ -21,7 +21,6 @@ Notes: Used to have Agent Smith as a partner but it died (Ironically)
|
|||
ip = ip_pub;
|
||||
name = name;
|
||||
hostname = hostname;
|
||||
interface = "eno1";
|
||||
};
|
||||
in {
|
||||
imports = [
|
||||
|
@ -45,6 +44,19 @@ in {
|
|||
# keep the wired usb connection alive (front panel)
|
||||
# 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 = {
|
||||
defaultGateway.interface = lib.mkForce "eno1";
|
||||
interfaces.eno1.ipv4.addresses = [
|
||||
{
|
||||
address = ip_pub;
|
||||
prefixLength = 26;
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
# this server is teh firewall
|
||||
skynet_firewall = {
|
||||
# always good to know oneself
|
||||
|
|
|
@ -1,49 +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;
|
||||
};
|
||||
}
|
|
@ -1,51 +0,0 @@
|
|||
/*
|
||||
|
||||
Name: https://en.wikipedia.org/wiki/Bumblebee_(Transformers)
|
||||
Why: Created to sell toys so this vm is for games
|
||||
Type: VM
|
||||
Hardware: -
|
||||
From: 2024
|
||||
Role: Game host
|
||||
Notes:
|
||||
*/
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
nodes,
|
||||
arion,
|
||||
...
|
||||
}: let
|
||||
# name of the server, sets teh hostname and record for it
|
||||
name = "bumblebee";
|
||||
ip_pub = "193.1.99.91";
|
||||
hostname = "${name}.skynet.ie";
|
||||
host = {
|
||||
ip = ip_pub;
|
||||
name = name;
|
||||
hostname = hostname;
|
||||
};
|
||||
in {
|
||||
imports = [
|
||||
../applications/pelican/pelican.nix
|
||||
../applications/games/minecraft.nix
|
||||
];
|
||||
|
||||
deployment = {
|
||||
targetHost = hostname;
|
||||
targetPort = 22;
|
||||
targetUser = null;
|
||||
|
||||
tags = ["active"];
|
||||
};
|
||||
|
||||
services.skynet = {
|
||||
host = host;
|
||||
backup.enable = true;
|
||||
pelican = {
|
||||
wing = {
|
||||
enable = true;
|
||||
node_name = "node01";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -25,8 +25,7 @@ Notes:
|
|||
};
|
||||
in {
|
||||
imports = [
|
||||
../applications/skynet.ie/skynet.ie.nix
|
||||
../applications/skynet.ie/wiki.nix
|
||||
../applications/skynet.ie.nix
|
||||
];
|
||||
|
||||
deployment = {
|
||||
|
@ -41,6 +40,5 @@ in {
|
|||
host = host;
|
||||
backup.enable = true;
|
||||
website.enable = true;
|
||||
wiki.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -26,8 +26,7 @@ Notes: Each user has roughly 20gb os storage
|
|||
};
|
||||
in {
|
||||
imports = [
|
||||
../applications/git/forgejo.nix
|
||||
../applications/git/forgejo_runner.nix
|
||||
../applications/gitlab.nix
|
||||
];
|
||||
|
||||
deployment = {
|
||||
|
@ -35,16 +34,12 @@ in {
|
|||
targetPort = 22;
|
||||
targetUser = null;
|
||||
|
||||
tags = ["active-git"];
|
||||
tags = ["active-gitlab"];
|
||||
};
|
||||
|
||||
services.skynet = {
|
||||
host = host;
|
||||
backup.enable = true;
|
||||
forgejo.enable = true;
|
||||
forgejo_runner = {
|
||||
enable = true;
|
||||
secret = ../secrets/forgejo/runners/token2.age;
|
||||
};
|
||||
gitlab.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -29,10 +29,10 @@ in {
|
|||
../applications/ldap/server.nix
|
||||
../applications/ldap/backend.nix
|
||||
../applications/discord.nix
|
||||
../applications/discord_t-800.nix
|
||||
../applications/bitwarden/vaultwarden.nix
|
||||
../applications/bitwarden/bitwarden_sync.nix
|
||||
../applications/sso.nix
|
||||
../applications/grafana.nix
|
||||
../applications/prometheus.nix
|
||||
];
|
||||
|
||||
deployment = {
|
||||
|
@ -54,12 +54,9 @@ in {
|
|||
# private member services
|
||||
discord_bot.enable = true;
|
||||
|
||||
# for logging on our own discord
|
||||
discord_bot_t-800.enable = true;
|
||||
|
||||
# committee/admin services
|
||||
vaultwarden.enable = true;
|
||||
|
||||
sso.enable = true;
|
||||
prometheus.server.enable = true;
|
||||
grafana.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -22,13 +22,25 @@ Notes:
|
|||
ip = ip_pub;
|
||||
name = name;
|
||||
hostname = hostname;
|
||||
interface = "eno1";
|
||||
};
|
||||
in {
|
||||
imports = [
|
||||
./hardware/RM007.nix
|
||||
];
|
||||
|
||||
networking.hostName = name;
|
||||
# this has to be defined for any physical servers
|
||||
# vms are defined by teh vm host
|
||||
networking = {
|
||||
defaultGateway.interface = lib.mkForce "eno1";
|
||||
interfaces.eno1.ipv4.addresses = [
|
||||
{
|
||||
address = ip_pub;
|
||||
prefixLength = 26;
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
deployment = {
|
||||
targetHost = hostname;
|
||||
targetPort = 22;
|
||||
|
|
|
@ -22,6 +22,9 @@ Notes: Thius vpn is for admin use only, to give access to all the servers via
|
|||
hostname = ip_pub;
|
||||
in {
|
||||
imports = [
|
||||
# applications for this particular server
|
||||
../applications/firewall.nix
|
||||
../applications/dns.nix
|
||||
];
|
||||
|
||||
deployment = {
|
||||
|
|
|
@ -17,7 +17,7 @@ Notes:
|
|||
}: let
|
||||
# name of the server, sets teh hostname and record for it
|
||||
name = "optimus";
|
||||
ip_pub = "193.1.99.90";
|
||||
ip_pub = "193.1.99.112";
|
||||
hostname = "${name}.skynet.ie";
|
||||
host = {
|
||||
ip = ip_pub;
|
||||
|
@ -26,7 +26,7 @@ Notes:
|
|||
};
|
||||
in {
|
||||
imports = [
|
||||
../applications/pelican/pelican.nix
|
||||
../applications/games.nix
|
||||
];
|
||||
|
||||
deployment = {
|
||||
|
@ -40,8 +40,6 @@ in {
|
|||
services.skynet = {
|
||||
host = host;
|
||||
backup.enable = true;
|
||||
pelican = {
|
||||
panel.enable = true;
|
||||
};
|
||||
games.enable = true;
|
||||
};
|
||||
}
|
|
@ -23,8 +23,6 @@ Notes: Does not host offical sites
|
|||
ip = ip_pub;
|
||||
name = name;
|
||||
hostname = hostname;
|
||||
interface = "eth1";
|
||||
cidr = 28;
|
||||
};
|
||||
in {
|
||||
imports = [
|
||||
|
|
|
@ -22,14 +22,14 @@ Notes: Using the server that used to be called Earth
|
|||
ip = ip_pub;
|
||||
name = name;
|
||||
hostname = hostname;
|
||||
# only required for physical servers
|
||||
interface = "eno1";
|
||||
};
|
||||
in {
|
||||
imports = [
|
||||
./hardware/RM002.nix
|
||||
];
|
||||
|
||||
networking.hostName = name;
|
||||
|
||||
deployment = {
|
||||
targetHost = ip_pub;
|
||||
targetPort = 22;
|
||||
|
@ -38,6 +38,18 @@ in {
|
|||
tags = ["active-dns" "dns"];
|
||||
};
|
||||
|
||||
networking = {
|
||||
# needs to have an address statically assigned
|
||||
|
||||
defaultGateway.interface = lib.mkForce "eno1";
|
||||
interfaces.eno1.ipv4.addresses = [
|
||||
{
|
||||
address = "193.1.99.120";
|
||||
prefixLength = 26;
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
services.skynet = {
|
||||
host = host;
|
||||
backup.enable = true;
|
||||
|
|
|
@ -25,7 +25,7 @@ Notes:
|
|||
};
|
||||
in {
|
||||
imports = [
|
||||
../applications/git/forgejo_runner.nix
|
||||
../applications/gitlab_runner.nix
|
||||
];
|
||||
|
||||
deployment = {
|
||||
|
@ -33,15 +33,16 @@ in {
|
|||
targetPort = 22;
|
||||
targetUser = null;
|
||||
|
||||
tags = ["active-git"];
|
||||
tags = ["active-gitlab"];
|
||||
};
|
||||
|
||||
services.skynet = {
|
||||
host = host;
|
||||
backup.enable = true;
|
||||
forgejo_runner = {
|
||||
|
||||
gitlab_runner = {
|
||||
enable = true;
|
||||
secret = ../secrets/forgejo/runners/token1.age;
|
||||
runner.name = "runner01";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
Binary file not shown.
|
@ -1,21 +1,13 @@
|
|||
age-encryption.org/v1
|
||||
-> ssh-ed25519 V1pwNA kWC0Tr0nlHEelEzS9xAzZ5UwI1vTgeaBS+zQJCxHe1A
|
||||
dcVKgK28SA4abje/xfC2bqlDzrkThJh0hpsyCtfGPDM
|
||||
-> ssh-ed25519 4PzZog H/hrMeDv4EmuSvR79vX7spZyF6t506ZKVHWHl4HN1wQ
|
||||
E4+skv4K1fTqG1cIbRqRr89Ti6D78wxEzap3Sl0UZU8
|
||||
-> ssh-ed25519 dA0vRg SgmoRqftGwIG34Py02bfdEv2HlI6fPBiKmcBmz2VaiI
|
||||
DKzlODXbQf9xzUzJHlwtIZbGw3qG2ApfssEF1/nZe+Q
|
||||
-> ssh-ed25519 5Nd93w Q8fxVcYwxbeXJzpKCOWH4/D3t8bWSUm9E4spASzIKnQ
|
||||
80fe2FiI+5OTojxu32OfFJwS3l/cMPr+5tErOr5wmcM
|
||||
-> ssh-ed25519 q8eJgg zgw/JH1HOdTE38Cr/61gcGo6OruuFUCAUJ4wmNHSXWs
|
||||
l7ta9JGOwCZCjnfui2Zo3PVF+Ge/UoPL0xm5lZ0GGF8
|
||||
-> ssh-ed25519 KVr8rw CcJymhaWM76X91C0ECPlZqaN2IARwxo1WMZRmlevnzA
|
||||
syAw8YySWxtDonZ5txKVNynCdziInCzy4u5kv6mH8PU
|
||||
-> ssh-ed25519 fia1eQ 0ocrOjhQ+CEJK8Li3rDegYkMXkBpjAAStjgvVHGQx3Q
|
||||
YORVM3sEbE6PLVuwfMkxe9gYqTVVT7DGoG+kQcxaPiQ
|
||||
-> ssh-ed25519 Km71ZA 9W2stpyr/9osFppfqBDjeDzZ6ltU+spmBoeWJ+I8sys
|
||||
C6DGgwvbwW0r1E3L6o7LUOnPo/n8Sl8tGzm3NlsXGcw
|
||||
-> ssh-ed25519 3pl/Kw pm1noozCEdPbd4f8rkSD/gicvfWTEN1kvYp7TLb68Uo
|
||||
VH2XUbhIf4nYTmp6rkGt99RcI2xxa7F9QXmDp88r1CY
|
||||
--- lNlQ5pwix455easITfJ8dztlPYg8Pi77sbAsOQF19dI
|
||||
‹#@3öá|ÈKíÛ%ké±xL,ò5°x/QTbz<04>ÆjÀ.”7ÿÏÇ-]‹2ñbùí_ ><16>éNëJamÀ¬^ë„áCðŒÒ]VvhÔ|<7C>ý¡¢D›Ì€"
|
||||
-> ssh-ed25519 V1pwNA olslO4c+ZlJtfdnTvlUz/JToxVa4mKVMc2eImIb3R34
|
||||
xVWXF6S38aPtZnhVdJBFcNMLZbsXyfGOyP4xvVmcqwg
|
||||
-> ssh-ed25519 4PzZog zmdNvTqZx9XNzXITLXZrIrtlKm1+r3BCthr5z3JNMDo
|
||||
hGyzFvvPf/OpNwBKml3R7nas8n3KihaMtZipnbB6Hx4
|
||||
-> ssh-ed25519 5Nd93w FB2Q42uQesjMDfE0WpVAp/0bob/37k1BDBBH13ul5QM
|
||||
tFrXKb372CcnEMaunjm9aJ6ZBEXLK/EvhAD0Lc5haqQ
|
||||
-> ssh-ed25519 q8eJgg yzncjdMSAILkSPzccY9uq4yULhbVi447IkC2mk+b5GY
|
||||
YdEh5Fbr4U1Jwr2r7tNDorzrxyRVy5n5Cb9hhQG+TPs
|
||||
-> ssh-ed25519 3pl/Kw sZ0skpiwJWPoqGMIhIUonQkJ5Pa1i37X9OyJHVwRngs
|
||||
FqHMytq+bYoQBI/BwQvmjR1hvInhltkcuV1H6mcolUY
|
||||
--- 0MouBOwGiCtj1xzuEZNiu0v/1vsqrHX349hRrTADwZs
|
||||
sÑÈå+7¾¸pëûÉ<C3BB>ÖõÀ`hâ*p¿¼Œ„B½N°îyb:4TÛ°,ù"yæÚ«˜Î“@N€R]Ñжb uk/1ê߆jDn®È]À'Æz¶
‡á¿éoG
|
Binary file not shown.
Binary file not shown.
|
@ -1,21 +1,13 @@
|
|||
age-encryption.org/v1
|
||||
-> ssh-ed25519 V1pwNA 79HhvqifubFk4bhlUPgKbgSplC41o8/uZV27eaeM0SA
|
||||
mSJ2rkmOlgXyQAXj6pbFoajxCwPzKDBUWRPXqvHrW+8
|
||||
-> ssh-ed25519 4PzZog w+6c3JxUfEkgvDz7pq+451XSGC64TCNWau9zOGajpjQ
|
||||
mEdXqG+GpaYVj6ICYPkCyA9ZRNmMtNsxWNeOpYOhkF0
|
||||
-> ssh-ed25519 dA0vRg Iy3bkGWSkMvk3wH05ETCFqZzUIc835XyJGHXlfmG2VI
|
||||
ShexjmkSwsEgHR3uj+sftcB49zbp2z40Mi7NN7VYcII
|
||||
-> ssh-ed25519 5Nd93w TM6CtcmxkTqQTP5UVD/1HPijQhMQsYdPrknDREwxtFw
|
||||
+ld4GvbKQSKAUwMYzDSxtZqiN3OdnWlszYVzOrMbU0Q
|
||||
-> ssh-ed25519 q8eJgg UgE7W6Lf/jdlSs2TpZNX2wRTY3iwQ1MzZE7zAN5Abz0
|
||||
oYf9iiAeoVg4RLYWEvw5xyGevxYQiiqELw/NLiBCZWI
|
||||
-> ssh-ed25519 KVr8rw ZtAdKYXNsNCo7MzfBlQrax/sWItsFQtEo/tESJaviXs
|
||||
Njql6s/+QtIbBmsbMYllDxodpIaBnRaMoojap4jUVwQ
|
||||
-> ssh-ed25519 fia1eQ nIgFm64i5MPK/GvKl35nnXOO4hoD6+mFzJsFeB/6ICw
|
||||
bJoDOMX3ek/5lVLeI1v99C24l4EwFcXIFAAlTMJb+Co
|
||||
-> ssh-ed25519 Km71ZA sTHVMQlRs5/xewuUa6yFjuqCEqmWlekSwab0z4OWJRc
|
||||
ExJw8np5XfBSSLo4cwwYoDoi/GxSGKkTn5rcKdMmI34
|
||||
-> ssh-ed25519 IzAMqA N6d6EYxr2LUzuHrH83h06JE5MGPcqdAMixJH3GZed0Q
|
||||
+dE0EBX7jPvMv2qMI3mIuiM9TrhFYQwwC/+Ta+DiCNY
|
||||
--- g8A4+bzRE56xnD8tVagvXopX6VlcS5iJcOcKTxC0ZGk
|
||||
¦K!î¡'Ì_*ƒVŠEJɇÊ?Ë{å¨&’Ø\Aùur¹AX¦wgzãÆ ¢XÚ¨z·¿ôؤeðøŠì²N0&Ûɵ$à$&Ɉý:‰
|
||||
-> ssh-ed25519 V1pwNA 0/cU2Vgq/42KkZH/OdX+GkEMp//Ymhko0ve9DrEqJUA
|
||||
rXykR1ai6r6SWyw0D3u8IXb/dTTN2e+/ua4pZ1Jkk6g
|
||||
-> ssh-ed25519 4PzZog HiABbxUkRWcOjZDOwQHspZ8FSz02NplQaeiLtF8s5Ew
|
||||
MR5FLVLkFVgZhBUWZQxFhl8t2NEEmDlOaeoMzs1P1uk
|
||||
-> ssh-ed25519 5Nd93w +dB0KgoeMx+Sfo4jTO19xJzyHgTDHddOghcx4mQzHBk
|
||||
ntdc2r3If99wlMSmi43KL5hA5SkSoWpRkxiHxFeEt4o
|
||||
-> ssh-ed25519 q8eJgg MgW6ZgKhont3NfMn2n8b3ciHn4YpSH4iBLvfsVS6/W0
|
||||
a0L0EYlHJYBwjEa8jvo9HMZONe4oGj7f39zZfbVfz9M
|
||||
-> ssh-ed25519 IzAMqA 6V4Q49p/QtxquDW3zJHPUpKzb1mzuTc6vk8Az/G5FFU
|
||||
QTKkUwN9ikycTHd3hFBFCk3yyBl8k4IS16brmZSSCEE
|
||||
--- 8OJR8TzbavDcD31O+iiNL7Q4elIJ2vP9/EBDkoNKTUU
|
||||
õ¸G“SQ&g_@bV޹w)<29>‚ò±‡J‹0ÂîÓp6µRædh[žët"ú/D:¦œÂl¾^Tú¸¦<C2B8>)…yâ=5ó"qTh:Ni™
|
|
@ -1,21 +1,13 @@
|
|||
age-encryption.org/v1
|
||||
-> ssh-ed25519 V1pwNA UWCmhr1Mj4BVH+0MJ2zBCRQMVYFK+eEp2AhdYTWSRiw
|
||||
EL7DlSXyemeZtJw+1SO+vSf2NGg/sPEz5r+p3OntrFo
|
||||
-> ssh-ed25519 4PzZog HIqzyRkhsIgOgxBNZK1HBTBUIpHPDZEhIfo9zmXEqzU
|
||||
2m9H93js26tJJHwM4ce+8DH7oLf3zEBeQ3sT3zHpOP0
|
||||
-> ssh-ed25519 dA0vRg 1W13Q5mX61EH31BM/FEk7l92Lo/5WuoMLo39wmwVjW4
|
||||
raNdTsgJcKlwqmBE+zVEjfL6VPyzHhcMpNrcl6Y6DmY
|
||||
-> ssh-ed25519 5Nd93w 2gYsG5vFoosuvJo+O+eQscfyoLqYBxOReiT5kdV+bBE
|
||||
82ghrnctaXECGxn77VT6YfGPuDKwfh+dJ/+3/SBTA8Y
|
||||
-> ssh-ed25519 q8eJgg vzSwKw4EzJksqujeJqfg+1YNM3sgp5Zw7Qld+XNS21Y
|
||||
65wJiSlqdjZm3Ps2Dg4DB0LzPLgwcYQvJgRvRkeblBw
|
||||
-> ssh-ed25519 KVr8rw f2MjAAqmuw4UcgvjkRku9XX+SYqY6oAfgS1ayVDVa3Y
|
||||
m1nl/CW9GYaCyShT28JZdECirBJdfBoiK3V2tRBrj5o
|
||||
-> ssh-ed25519 fia1eQ Zkvg9fYBubmg81c7NqEp9fRbSLm2WKVDil+DwnfuPlw
|
||||
NN+1CMVxAstqBT7qqAhL9whaEvyWgsNXgBOSWmjTqtA
|
||||
-> ssh-ed25519 Km71ZA kfU2W/uwQORahVWcg1qYQ5Q2QhZnAkbzjv9As4fJfis
|
||||
w+rVDQ0oyLGqTT8yVr7mCOV+55dItAcALIa4ABw5bDI
|
||||
-> ssh-ed25519 IzAMqA Ir8ygCowpY6f4egB9xqplPzP4mJFL1sh+JaQVZrtZEk
|
||||
y679U8nCE9L8seAvVypssgj2p7aZlIW2Q2TgQqHhpoU
|
||||
--- Dh0JCQdTvVZYtwnzgqEl+WHxOTXmOzr4/TaHz45r+fc
|
||||
TÞý.¼0ôzY'”oaï.Èe-ßê%ñÕ5?(Ê|€ŽàuÌsýº;ÞìŒ*/Ë©Éw²Ð£0Vp–
|
||||
-> ssh-ed25519 V1pwNA GVmv4CgKJ4b8Hv52C+1f/g58CbBLacpZ1CuyMrH+P3c
|
||||
2JJ0TfpA4V+ZjbcbRxVN/NKPTm/KtKQ/A5fE33n0jAU
|
||||
-> ssh-ed25519 4PzZog 8ZoG98iY1oUChmdWuRzxwAY0Lk88FVwMH6M5+HctGjg
|
||||
TZ6bTswrAXji/YEaqUcZpxcqZnijvZBa3nq/rDorHkc
|
||||
-> ssh-ed25519 5Nd93w 1QLznyfI5HuZiFOKlDJW/tw0tRiz/VADYJTfQVxzrRg
|
||||
2n5f2UMzG7BFNV7zyPw4lleQdQJsRRG+0lcbuTvP1Pg
|
||||
-> ssh-ed25519 q8eJgg 1ihAcMOK6p+chq0ivA0JY5QJrjhkGc9b1AxzWHFa3Xc
|
||||
nfC3dXD6J4S18qjUO91hSNxOGnukFVFykq8HqntmKv8
|
||||
-> ssh-ed25519 IzAMqA wBM3jR8cmXa6yvNi1wTsdBX6qotosuBRu1rKYLJ/FCk
|
||||
MUtMJjn+8Fbx9CjpUaciJPd8NOXxsJHGT/x60OF6O1U
|
||||
--- d0tAB4cQva5jGPj8G8v5GrSFu0WfmjSYU+BmvDZsaLU
|
||||
wÀ’'”Dzޞšjǵ‘«Ø$d-–µÊ¢¯…ÓC󣘽5îÝŸWª, íFjÓê¬Yî9çÂ[[´8à ¾
|
|
@ -1,26 +1,20 @@
|
|||
age-encryption.org/v1
|
||||
-> ssh-ed25519 V1pwNA 6NKUbOSUbwVjzW/ZUpl8qEiUTTegFlji4+tVJyqY3SE
|
||||
fRQvaKnLMkVBboTEriQpWlGY9VBAP3ppsEbAB2QTScs
|
||||
-> ssh-ed25519 4PzZog mp/+b5LpB+DvRduqAZiKWqkZq6+tlyQgVTZz7Oge2Us
|
||||
OycqmZyDr3levWSfRFxypJOkITLDix0Q15Todya6BNc
|
||||
-> ssh-ed25519 dA0vRg yp/4LvS9DbdatHFWFsP5qhH8CP8Bs0IjVSenUtG4+Xs
|
||||
hHiJEtl1ffYXltsJzuEMLGUl2i/i3pFzv4bjbx/cbOI
|
||||
-> ssh-ed25519 5Nd93w BTngmy4NGLGKhC8lPos63QEVBKoQT82KswQ22EypcQQ
|
||||
OCnJMkOwwXQVbtCitUizXM4nynC6a1tiPSkm7MxulWA
|
||||
-> ssh-ed25519 q8eJgg NaEjVcDBVICRgXuJchEdE4vg3qmkNmJAbDDxLq1fX0M
|
||||
YFwUmEPwJIik5YJ2SV5IAmqGlY+h24voJJlrBaoCBwA
|
||||
-> ssh-ed25519 KVr8rw ZnyVITZFkuozEs/rbTdxXDQNS3Nggo+JkBL1Icht2SM
|
||||
B4jVVts5lK1kIlOWMl0eiN7TpsTeJZWIu7NqildxeGE
|
||||
-> ssh-ed25519 fia1eQ kvzARRScl/eypC2a5cY66sXcH+TZqz4sYg4W/k9iJxQ
|
||||
Ga+4TVvXiQ6i5/+fgUQ3E5tJiLqdBsEsXjenXEpRV/A
|
||||
-> ssh-ed25519 IzAMqA 5sizvlhLhAhAR1bViHJtRJ8fAIO56TAuLVSOwE177QE
|
||||
b9oJ8BC2xiBjvc3D0H0EF7bSNDlpvIidyBCTf04ndJI
|
||||
-> ssh-ed25519 uZzB3g g9y66zNmQbqP6Rbhg2t06W3YOgy8DkRvJZbWVegT71s
|
||||
2dH7E76tDMrWQJbLPefyORP66iaPHQnSjwu8NCdSyJo
|
||||
-> ssh-ed25519 Hb0ipQ azOzBLXfshInlFVpV0PzIBidL/VzA/+kKRXFFVD6ZF4
|
||||
iXBF/Wcv4KWo5qUXUlyimuo0l6aClKxOCtkm3MxAIBc
|
||||
-> ssh-ed25519 IzAMqA EWitYyV8RsPIB6HEFE2OI/C1zcC6WfBEeDI62rGVmkk
|
||||
Bk9tdSqIjLjat21J2LM8RXAt9GwdQxYdfPzqDtCjunE
|
||||
--- waY7j+HMEOdqEZs/TcLEhUY9gJs6ZSc51VNfuCmCxJ4
|
||||
Ý;dÙ9A‡vÔé±nq<“ê;TèáƒB؇$ÐGÌvï¯h
|
||||
»\^Žé§lÖ¯`š¼ÄÎ?l¸<0C>au~üЧ×yâ[ךju²üvÂ;]!œ6Ëè±ãXIs4ÇŒ!Ù@ß϶û¬‘|›úïª">eÈÿ[VVŠž´,ÿ5˜ý8N§¹Œh<04><>[ƒ×´ZD,zý&âñíó¡”õIØ>ŠØù¡<C3B9>|ÎézÉm
|
||||
-> ssh-ed25519 V1pwNA f6xGNtufcGjWlCNkhlF1YMNhwMIjpW0ojqD7fDhPjBE
|
||||
fCVybFD61VIpm20zeVvKCsOclGhzN7RwRViw6EeWY8o
|
||||
-> ssh-ed25519 4PzZog nHWP3E5ZNvSwTjeNWL5qqmPsnXBWUEs/e7trIQuT2CI
|
||||
n9zztxz/XTIY5mPLSkFabYfsGugSrP7bdrXzf993MTo
|
||||
-> ssh-ed25519 5Nd93w 1Nxqu7Lgv+KBNSoWMem3dBou4xrafQcE4XFlGCgwpCk
|
||||
vZe2WYM+FfrNXog4iEKAwlAQsAuDEp2tdl/WzhRaju0
|
||||
-> ssh-ed25519 q8eJgg ywDORriWBqKl15CDZccFC0EbX8StgGYP3nbkOwKDbTU
|
||||
ULGvROpIUv8GG/WdRIxpfovjl/08knlgQxpipUJe5vk
|
||||
-> ssh-ed25519 IzAMqA RgipLXB0jBR4ghCrXXMx9/Pu03E4gBYow4gWYDPzHCc
|
||||
gVAHf9H0fZrPL/8+NWx5Jlr/7UrvQdpLSGXEMiNdmrQ
|
||||
-> ssh-ed25519 uZzB3g UbeXy7a4ZkdEjIIBCLD/zNKmlY2ooTO0CbGl1Y9lJRg
|
||||
aajwx+NrY7iwOkT9hkk9ocdUlNm1f4epqXNosPxJpr0
|
||||
-> ssh-ed25519 Hb0ipQ 8sdgjex0JqgckMibuS1jdiJgkjvWGO8tUvlpWoYmxiM
|
||||
CoUeJ+vEbBit9JZhvyz0dHX5IgNywGE4XfeCtVV94GI
|
||||
-> ssh-ed25519 IzAMqA 41gq5+Itn20lMFlS7AnJ5JLl6OEbJ9Q32M/1TUDl0is
|
||||
PFjQ3Gb4LajOxSjJgp6s2dkZrDFinniDGL8hXtlomqE
|
||||
--- vxbU9/Jgdf0fkUD3hrdHUgPV3ipn9MazV54zlh4s4Yc
|
||||
+I¾d®¤†/ìff£È›1˜/xOä®<C3A4>ã=÷"<›( £O‡ŸÇfsrh+=Eâ{Ø=è
²
|
||||
šÙïÝîCõ&ØQûës¹‹ÒùÙüVùu}4Åéìä4¿U‰ëÙ<>½USj%ËiƒHXÚšõÈÌã7ÂF«Ù݆¦º4ý>ѨføÕ0ŠãÇÆ¶)ìDXÊ)À“Ï—‡°$2<>YXå×Ù®<C399>šÿ£%¸sÛ
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -1,29 +1,19 @@
|
|||
age-encryption.org/v1
|
||||
-> ssh-ed25519 V1pwNA sW9NG3ZnVZ7XN4iMceA+WNwEmGp5mB8fYRML4JMxTx4
|
||||
Ugwsmg4yXfq9YH99RoV2MymOyhHn+WEFbhSq3jOS+Jk
|
||||
-> ssh-ed25519 4PzZog ncbPVDYkLeBV89U+YKVSGRyNDIdLDuN/YV9AiGcYfkY
|
||||
rifseFii9IZI6t2cDfhi1GXQQRngI8IM+3H8znbMA/0
|
||||
-> ssh-ed25519 dA0vRg ZU44BDl8VU2ri+qNYEEj8GF4x4gGUQPnr6YlFA5itGk
|
||||
zV29wfmrtyxEU1JFEm5P7pfkWwzmNpXflfLRsyZ3vCA
|
||||
-> ssh-ed25519 5Nd93w BCqKxqNscTU2iEm4h/78KCzMjRWtHlO3rwZZjq2lJFQ
|
||||
Y9yLQ33RvcO1g3a1q3w47Y0kgg1NZpdlYk34LrZ69mw
|
||||
-> ssh-ed25519 q8eJgg lWbDTedbgvxvGpMPDWdrghAKO3duh85kaOR+7xsPd3E
|
||||
MzwcVM+gzJ/IApGVZNNM+RuYp7EKZyxCDjRkipL3aYU
|
||||
-> ssh-ed25519 KVr8rw 8vJTA9ABfwuZyFwhFZD4n187b6gmq7zCLALqp56mFyw
|
||||
iQ4MtJ1YtYycFi8qCs4N0/nIXccaw2swi9yIvOLmVmA
|
||||
-> ssh-ed25519 fia1eQ hZzB90WDGom3oaOlWlcBg8iAMAfbZGyosgFIa8AiTWI
|
||||
HekDEc26Y121KRtKLavDD1xKcaClVgn2tGPrgQYWQBo
|
||||
-> ssh-ed25519 Km71ZA uunwnxdg7A6ZGTbV51r5XL/2hJN/VFIUas0TVxid0Xc
|
||||
zGx6iHfu+rZ9WbtIITtzDk0nzkFCeIRQpdRVoj7dj0E
|
||||
-> ssh-ed25519 IzAMqA 17lTeNgkOhX6iOPix/YeKZyztDHYLu6OIjZOctANpmQ
|
||||
fu8VIba1ZNy3QvnVk3bPmCA1n6/dcB02epAs0GLb6zE
|
||||
-> ssh-ed25519 uZzB3g I0QOJAnUor5hnoKDlFeSuW82o94zcWcs6VvKTq37lVo
|
||||
S6o+cem4L12E8V/DzbvL75azwrhLgZJXkxWXuCd4+Z4
|
||||
-> ssh-ed25519 Hb0ipQ cEsppH2jMi71R0513L/vq7MaFYYWiRrWZKricdhW/H8
|
||||
IvRQejJ2AOQAeWUumh4an0LUSBJYMMnOIr9PU8FjYiA
|
||||
-> ssh-ed25519 IzAMqA cL7V3gfdSkpHtkcDhaH0ATTWUzBir09Xhe91wlaGJ14
|
||||
GU8IQvHlwyBBONJKufQRwEr7nZy6y36XszV+E97VA94
|
||||
--- Nq7IuDZY4GM8UBq0wdEnn/kZEJRdUlmqR75SlX75Q7w
|
||||
oÖT·¹ëjˆo¬çÅ(Rð«Z¹lðmÑ’&f¶›7;a8¦÷B£€ò|±û‹ù«Ó”B/l”ª
|
||||
îÉÐg#˜L’›ò†‰"‹Ù/* ¶,aÜ…ã€.f.QÄ
|
||||
Õ“¨oEÃM×V=å2ä¦q‘÷;IawkFØ\" Ÿç±Q¾7$.`MûR§XúÛ°
|
||||
-> ssh-ed25519 V1pwNA mAJQEFu0p2nxajUh4C7FrKnnyTEFVagT6rtCsKqDz18
|
||||
a85pGwh2S35v+VwC8DnIL0TJobCk8EihiN7p7bwlxiI
|
||||
-> ssh-ed25519 4PzZog NbDMBIfNzmoG6jSRTrDpKbHm+5pd8tVLZhZbnzvGZRk
|
||||
VzXjnmCR17I7ZX5b356OCRHJF7W10aj3SBF0MCcnzwY
|
||||
-> ssh-ed25519 5Nd93w sNsptEu0kFqWKSTeEXvdsa38ka+h+LKXBqrTIqmE6jY
|
||||
RrPnod0YsfbXGcfwKz3BfYyVQa2+OFR18X6f5V9xqX4
|
||||
-> ssh-ed25519 q8eJgg 7YPlbAGSZPq1IvLqk2EB0S7WfemTLkUv6FC5GrZHWDE
|
||||
tTGgiNjuJl/3DLc/GKIczm5G38LZGekAXTF2TXUo+PU
|
||||
-> ssh-ed25519 IzAMqA PcRZNr3VHZuB9XD3sRASaY8JaL45c8pF9Am/7P+94iU
|
||||
Sml3WvRZ/wrUO5fqn02cJneCfjnZ5fJr9d3dTdqyCdg
|
||||
-> ssh-ed25519 uZzB3g bWlsuR71mtorLasEP7+2cuH2S2B8uM222D6nQC5Rgw4
|
||||
rUQ1sXbeaehQm1e3/JVR8cQqE2hkwmUFV/PQ9Se1H1M
|
||||
-> ssh-ed25519 Hb0ipQ kgBnX7+sd0rxcp88Hglenuf3qfoo1syJQceGxMbWDSQ
|
||||
rb5cvTxSjInGgJRZq33vCIa23LkeFHbLCy2s3hZXSzI
|
||||
-> ssh-ed25519 IzAMqA 0pLUe6dFlP9w2JPn53Mo6xXJNuJrLHH9mqerGYp4lFM
|
||||
IvjADrsuDTHI0Ljzr899pG5/bwi+V+KfCt3hn6Nf/UA
|
||||
--- jAsttyHTXJjcXYQym/QFfEvD8eMk+SK9IegD0p2bZ7Y
|
||||
5:¡-<2D>Éþl+5ņe<ëîS÷<53>¥YÆ£RKCÄä‰H<E280B0><éï1etõ¡Þ"¼ä‚Êaʉ?åQ&õÔ÷’PíÓ<C3AD>‰€´—ï8Cšw?NÄP‘¶Wìf|&‘¨BÈšßö†][WÓÁr¢ÁÃ|>»‡Ó«SKŒ‚<C592>“ŒÊ³³%-«&M"uпuöz
|
Binary file not shown.
|
@ -1,23 +0,0 @@
|
|||
age-encryption.org/v1
|
||||
-> ssh-ed25519 V1pwNA ZZzPHXiieqnKeatxqOpOyJJdPCSrpU151rNY3PgewCc
|
||||
usq82uQE6qxnwb5EYHlfXSl1A+oqV/DZcKlHmheNrLs
|
||||
-> ssh-ed25519 4PzZog GPaAefwdrHHdkDJT4OHYFdmjUbXEQz3lLkGfu2M/c30
|
||||
hoWO80LE9PEMkqlQLD4WXIDc9rgX0uMbNzHkiXcVWRM
|
||||
-> ssh-ed25519 dA0vRg 1WCuZ91cuKBZi7gFFVArvvAvMh6aU0AufX2vDHiXvTI
|
||||
yUUbM5kXyyiNlvV7UWXNNhBe3JZ+ZxdoXf1FRwQiHt4
|
||||
-> ssh-ed25519 5Nd93w 8HkcjdSrVbg3TQFn/ldlqYEU3aPHFBIcXnzovwMv2Vc
|
||||
+2kX+X1uYoUnyUyLYLLWeRw99OC3St30ky6Xsf7ls+Y
|
||||
-> ssh-ed25519 q8eJgg moUF6G0Qsz6+vJTMFoKIusiCfapHvaRBdOoB9r2uP00
|
||||
limKEFL+4G28+jc5pOiNt1OkpQRzSXKq+3If8/Dfe+E
|
||||
-> ssh-ed25519 KVr8rw /G4TpEFysiCx/eF25IA9gjmX4w1yGM6m2Lx1mTmf0mU
|
||||
nXIuYPbV3S+0+3Ce45iPeAzZlIr1i0RnGWSLg3KBH5I
|
||||
-> ssh-ed25519 fia1eQ tXV4gH4gIjFYWNxLV0AQVOvahTtvFWK5W6tNZTjA9ig
|
||||
pxpIIZ4+/ItpG6nolOS7lxGwSkhwq1XvdxePxWsJYCE
|
||||
-> ssh-ed25519 Km71ZA QRM3tBeZJGVMwZ51ZBlxGIzwGOyMB9ppGNq4pUyRsHo
|
||||
+0QO4JlKaOUH5MY+w02Rq0DDNk76eSD2EVIAvQeiZ9Y
|
||||
-> ssh-ed25519 CqOTGQ Ystm+4YnAlTTYPiHBXVa8lM/MGEfZ3OcmxiT8QcdKSY
|
||||
F2b5grk6m2sVnhhWF68WxUemgtZHYSIJZ9e7eBKtIjA
|
||||
-> ssh-ed25519 uZzB3g PepFlWAg+221m5eOVoNl1TIRVrS6lpkrQ9Dgce+Grwc
|
||||
6/8sTiO+P/HgNbB8YyRVylAPPp3lwF4D6FbWWaPSxtE
|
||||
--- 0PQ3rJZdbEfye9mLMrQJ0jGvJSiZ+9dh9Bv6bpGEBNs
|
||||
^;Yh=p«3<C2AB>>FÂ:2b6û+¥C²À“ÅEÉ6Ÿ3óýT´EÚ.è[,[Ú'¼È3„¢<E2809E>¯P 6_|ê
*AÇùÓQ*ôj¬cƒ
|
|
@ -1,23 +0,0 @@
|
|||
age-encryption.org/v1
|
||||
-> ssh-ed25519 V1pwNA Lw89KnIDDurZQ0UaqDS1utTrKCGXR+Uxs3od/5n09io
|
||||
1JECYcXRBNWwzoagvEKeoWoW2d8da15eWPfTD8nKqX0
|
||||
-> ssh-ed25519 4PzZog LB5CnkEPX2RH8vWdD15KMs/qgNbw3e7G8qCV1CMf8kE
|
||||
pO77W91WR/8MRPLIuJrLk5ib9CPp7xHuUmTS8fmQ3KM
|
||||
-> ssh-ed25519 dA0vRg QhtuGTY1MEpEjRahnU3WtON6Xda7y3HvGXpB3HcDfBk
|
||||
6sCAQhU4K2nQ5pMbGYY75TKUXxZ4BKHCb6sOHMAuNEA
|
||||
-> ssh-ed25519 5Nd93w 2QcbhnmxOkTrRUMrHR4X3spMUnsLXN9DDnh49qFAYx0
|
||||
SD47vo7tOPWmvXR2wTj+BSsxJUqnlXOu8HlTEOExeC4
|
||||
-> ssh-ed25519 q8eJgg 9TqmbSDG4KOl14FNZmZKFZ5Q/60K657phquz+qpIgyU
|
||||
odOvsccHqgXoC7WgKcFjJDm5it9ZGm5ifjU2pt5hQZ4
|
||||
-> ssh-ed25519 KVr8rw w0fZq3VUrN8wi4UrhMUfrviUiaWl4Ol+tbTXN/urISs
|
||||
TY+dO2Z6TmN9DBPuo1vyxgeXbDcqZlRoP+Q1IN6O/ks
|
||||
-> ssh-ed25519 fia1eQ 5Aqk1jkUQkomeBioV7LAPMzurJ1dHdYHbzLHXH7mrRQ
|
||||
j+7aPUOeJAI10FL4DjXKlYEkC25gM7TNy/X5vFk68+8
|
||||
-> ssh-ed25519 Km71ZA S9le6/bZxnkPVuCLqiYc8VMk8LXlk0BVJUtJYc/CmB4
|
||||
DTjvS3wBo+RHy0klprrgKS1wYAMAkfzPkpw/ip7KwpE
|
||||
-> ssh-ed25519 CqOTGQ xba3GuenbljaFEcgaX5UknPWjJSyQOMBaJSGk4VHZg4
|
||||
uzGnhgquJHT4+0zop9wNg6Fm8ka/9Ri1yPjw65VnGtA
|
||||
-> ssh-ed25519 uZzB3g WaU+50ui82IQHobA1QB62WX7bnjgxSVy9LAGjYifuHI
|
||||
H0O4GIRchLil79zqim5v46RT8Xbu5zi0dKSRPiT6kHc
|
||||
--- vg0SOy4LbcYEcxJMe6lbREFPPcxrRI/dJM7Lx3VC1rQ
|
||||
b–x‰â¯mVâ^hŽ0•Þúl@ƒ^Áôô–›ŸRy€ñS\rÈéÐÕµ;œ@™±t~U«YM)‚œÃAø?Ʋ<C386>W˹m,1I“
|
Binary file not shown.
|
@ -1,22 +1,14 @@
|
|||
age-encryption.org/v1
|
||||
-> ssh-ed25519 V1pwNA dHoon26BhGIqe6TjYS7Q93OC2vhr64B7ofHzX8FiJxk
|
||||
EcH7j44+zOHBcJOw0AwpziXtUPxOH//MGacSa7rDNT0
|
||||
-> ssh-ed25519 4PzZog CrrMq81Ep/Gm9qYcZjRJ1IpXtFGp/1XDfBCB6OSGbiY
|
||||
gJ+PFL0Sx7izMk54jJr3LPvfZ9DMQP5/FjAXkRw/mkc
|
||||
-> ssh-ed25519 dA0vRg r5S3Fqlmqeeeu75r9COpp4mS07YWY0HP11zby9AjCyY
|
||||
DGkeIp0M6dIA4WM4KYVZiwalHjou6qzLOFUnksIPU2Q
|
||||
-> ssh-ed25519 5Nd93w bm2DM8tuydnEqbcM7/aMgHtU/cnnfENGHgMgXPft414
|
||||
7bFV4Mx/gSaEM7+rJbqjjuod0U7tl8ODbK1+qY7gtmE
|
||||
-> ssh-ed25519 q8eJgg 35Ce/4wweXHadDG1ryl1d53G7IxEOwOFQATYgC6WzBY
|
||||
5va0fHjZXbH/2ZAFioTcmyeFCid8vrgTFXK6wR/ranA
|
||||
-> ssh-ed25519 KVr8rw dyfXPAGfWlbmjpiol87idweWsU/c1v4gwq18Y/4oZBo
|
||||
MiuhfBeQeMlHsi7hz0OgOiLIbFjeSaUoJ+xlIHkAmpY
|
||||
-> ssh-ed25519 fia1eQ +GTfP3+0hcdmM9qtZvUw2bZ+32guClfXwRTfvOg5Tzc
|
||||
8gSAdoh1DRoiD6KTpm5F/hFvT02/3bf4ayD/dICjpTs
|
||||
-> ssh-ed25519 Km71ZA g3doqjZJ0GP9PgkZ5l/ePPxI3gyvILvrQAx4En6r2kA
|
||||
O2lJGGq/LLsjtzwnfyUSD8Avw+5KbuNGd5XA8FwWJOw
|
||||
-> ssh-ed25519 uZzB3g 79FGgQhIwzLPTKUBhv6RdT3RqBe+JRb3DYLPt5mAPDg
|
||||
gp9dUDfNPnhAX75SJhFxBmyNdaH8umAQcYzjBHkPEoo
|
||||
--- XZ+0tCvAK9SgY5daynCjTqE5M0N3ip+wVIg8o/18AEs
|
||||
`ÁT6,NH]ÝÄåÒ‘ÿ*q»zíC«'‰€T
|
||||
#\ÔL‡b0zðB•«Æ
F̽H@ À†·ùs!"zêÁÖ«ë8Çj}Õí%ÐFEiÌ ä…ŽB¬–fü@†A˜›JµÚq¨}cÀUC=Ä%s¢&lbpË€\<Ühx1K&ñ<>XÌ¥3Li˜¦¬|—Çý(_°Ô2©ËX’g
|
||||
-> ssh-ed25519 V1pwNA JVsw8ztM2WBL6uR3IHhdsrJpRddMTzcd2WwpLMTbE3Q
|
||||
WSw1UmfUPZEIcJ9Rr5i1s8ZiV0O4qrEmPHPHfvzvuP0
|
||||
-> ssh-ed25519 4PzZog LgiBGLVRfnntheKxXFjqP7GNhD0hwOaTMQ70vDEkbSQ
|
||||
9MGIeJUi3Y3yxUNF+NEWRj+jP52r41XRPBV0246gMDw
|
||||
-> ssh-ed25519 5Nd93w 8dEhOqim1Ryg6UpeCDv3e7ykF3IMri3ut/S5yuwieyI
|
||||
m56/6dPG34+lVybgmjLBQNI9ba+sz8OpUu3QapEm+BM
|
||||
-> ssh-ed25519 q8eJgg wQM2ASijF3YgUBOzpB0OAIZ2XH7lLsEj0wHpzUhe72M
|
||||
IycltOHlMVE/g7F31mqiIFWsCPuFAHociD2pP3bOc54
|
||||
-> ssh-ed25519 uZzB3g Q3I0tbKR4g1QRryO4Dx1B409TuS1jLcOWW+OGh0a2X8
|
||||
SjK/s4Qp/TG6ED7fg2TaFAX8FyRPVu48l9epc3wWO40
|
||||
--- CUHCxUu6RfoD6zNpkmDgWBg+SF7FvZLDZKQojCSFkg4
|
||||
»+úndê¥ëÖü~<18>oµÕpË8bÞÎd@Õ‹ñ±³GíI6 ðÏ[„1|Jš7<C5A1>oÄ»™ÊW‚ÖQ7yc<79>õëá29ö°Ü” Ryi<zè'ûƒԘl´H¤``ëg³Ê2r1¤!#
|
||||
mØNc¤b©K÷3'Æìà4A58·dÀ£ÔvIw»Þ—]:(43^<5E><>þæ-·=B
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -1,21 +1,13 @@
|
|||
age-encryption.org/v1
|
||||
-> ssh-ed25519 V1pwNA sIoha/7vcAIuauOaV8gQA1spz0NZWfcc4rr2zgUP2k8
|
||||
+XELN1EFpMnDsVYgPnSaRm4qduSY+80RCfEFnBPCj/0
|
||||
-> ssh-ed25519 4PzZog ffub2ZpZEkysUNemtue5UroJj+/Oxi+nIstX7/txi2w
|
||||
MsvvInOvekc27UTViomCZbeikTKm1vqTKsanOpeSQ8c
|
||||
-> ssh-ed25519 dA0vRg ymDF91ZONYNjDV5Gktf0at2kUkfYbPSja9iWOqcBxVk
|
||||
gw7IgyRSVKfxeebADqYH7z+TZJcWIMS3g14U3FrDS7c
|
||||
-> ssh-ed25519 5Nd93w n17TARvCsIOmSp0WjZQEczLCFsAVYf9lDlJDdZeqzFU
|
||||
gRRE87qCSiKevHShj1k0bw+kwOVblwhMGh94WRYdqIM
|
||||
-> ssh-ed25519 q8eJgg 7ZJM3hSRIaQSpMnE594tD3qsufP0IwI5ngmitx/SW34
|
||||
Yibvj3cTOT6TOHSFBgeBwpXbGNFjeYs+oNjbfP3GRgc
|
||||
-> ssh-ed25519 KVr8rw O8njcmXqC4uurmzk0MLECH/pVlVqA0dqM9uL00vKlls
|
||||
h1dhNulCkCc3O8GmNSt67dxK2XhibTJHxx2loo2Y26s
|
||||
-> ssh-ed25519 fia1eQ NE6qJvq6AK7bIlbq7QSJqQwpGv6cgQFv/L/6MXOQUzI
|
||||
uk1G8a1cECFkjbt7bjcXOYQDHcTBCQwhyqcTg3pIC0o
|
||||
-> ssh-ed25519 Km71ZA wQh+XFb10AF8fdeDGM3mMJG6N43ej48QML69Xa+xFHQ
|
||||
eDuMG3MT8EuzS+QCAHLUi1NhRWp67jJamSL5iUQKi9c
|
||||
-> ssh-ed25519 IpLDOw wTE9a1YrhG1NqYTOBoihrNH3xt2fKOmGHvx5liEfeHM
|
||||
Rv9+kBZamBTDS8XGRaTsuUW/t6p5kYnbfNyyZY5n590
|
||||
--- 2HVyulzZ1Z3kQSSDH6HN/mu8uT+u8yohmt0bpe/VNQw
|
||||
ŒM\$0ëÁgÄiºS¹mЦ‡lgÁJJ_yJª»ÓÀì<²¾.l<¹“‡cÁ<1E>~84•v¼ûG²´¹Pû$ª ˉN°{ý5c
|
||||
-> ssh-ed25519 V1pwNA ly/9CnXtgQlXTbKcK+gD+v0Ck7rmGtNrA/S9XfBdg3s
|
||||
6skVNVJTgCf/EWlDbH6urfr4CUibVH/N+HcfIYPkzTo
|
||||
-> ssh-ed25519 4PzZog 7+Fc9ec8zvlKP6VGKJa3MRN6p9bUrA07/BlL8rSnp3w
|
||||
YgALG1b8QOmMqWuqr9iVxAal9cWFf8me0KT1Mg0onko
|
||||
-> ssh-ed25519 5Nd93w /lx/evI9jsXzHMxXYQMoavWucTMiGMXwxACpjXYFZlU
|
||||
nVWhQydOO8eaTYcR66u1MeH/glmwTDJnJM0I9tXUvV0
|
||||
-> ssh-ed25519 q8eJgg wYOxbUUXrTgY9XkUz02qtW8TaYJfNej9VBdwvfUWrT8
|
||||
/47DLKQGt1M3fJWDHo2Eg2ij4jCGd17ieYZ8gA/uYjY
|
||||
-> ssh-ed25519 IzAMqA FfUA/kyLBOFIHFUO+PSsdTwaRjGvfsq7OTMXYo7/WjM
|
||||
jEn8y+mncrOPmDzvsK90X2D/m8ZxmuIL8H0h27YP3hM
|
||||
--- ibLXLaT49j/Mb8CwbcL+Gjwy5GJ5YDX31JQFqfOIXRw
|
||||
ºôag9Òa“Yâ«Ò<C2AB>öä”<C3A4>GADóðgûÅi°^ýUaß±Fà YÏã@4><01>¬óÐàò£Ý*‚Š?úÉ„5»F-íã8Ã
|
|
@ -1,22 +0,0 @@
|
|||
age-encryption.org/v1
|
||||
-> ssh-ed25519 V1pwNA lV3ABJKTunaYK+s7681CNJBvp0JM/OhSSnkQ2pF5lGk
|
||||
VokFm+m3stF3HjebxOBmIiWTQqmBaSR+RiWQE6dMQJw
|
||||
-> ssh-ed25519 4PzZog EDXgO1cHPd8xxDbmL/lunkG3McC4a/wzBlFe16ByHS0
|
||||
eTNXJMKNSCesEXT0XAuZEhhCyX7eumglnIJ/00y+WTk
|
||||
-> ssh-ed25519 dA0vRg sKq17tK9/rB+VNTYQ/aoTzEcfzeMJTkN+a/Oz0+g9ks
|
||||
TNrHE3fFaAEMrrJ1264rh3UbJ8jBTxGSaeVPWzX3y3o
|
||||
-> ssh-ed25519 5Nd93w UkQintKS9V/5QH4arHtPKPe33ktNhE4Jl7illmlNuXQ
|
||||
u0t1110eebk8SYm5e4jI+d1vOSvUCZRJGIqNZ/WmdPs
|
||||
-> ssh-ed25519 q8eJgg uBJUJaR7prW8b/jjhXBjax5lVsnGYpifqZVqExVivyo
|
||||
hp2Y6RPzNaPZaX4sgOWVStdVWHe8taocUhToaojni4I
|
||||
-> ssh-ed25519 KVr8rw /j1ASDGc0GM7/Rt6RgBj2u2rlARs+iJixYR2gGFvshU
|
||||
JRPezd9xI6o89hX74agVVLAtX1Lp7dgjkr5ndQfDjSw
|
||||
-> ssh-ed25519 fia1eQ +NO/LIWFudIdovclnaX55jr/x52Rs4sHbP4jxepYHEk
|
||||
0ykDlD2um8a9gUea1JXrGfP6QsPV+DWIPqfD5cbvCCo
|
||||
-> ssh-ed25519 Km71ZA lAJq3SkNxUWZcmwMWyWrCaCrzyjnJK2A4G2kysZdvGU
|
||||
wmxgYru5pzJkfkTP8CmI9z8GeqpJdgGO4BmbLWPJ4Jw
|
||||
-> ssh-ed25519 IzAMqA 0yLa+jpL+6w8TvvbFM5IUUrpUncc8HLxuDjKM4t7mC8
|
||||
QeeibbBquSOjVimgtszMPTxzgsVUNui1euB4knkzwL0
|
||||
--- K9L+f43VUTIuWWMG8Zuzw+27zIPe6l/ortS4i+XhdHc
|
||||
$sey^$"©™+ú¼Ó‚úôM;½¾’¢µxê¬?a2äý3þ/ k¸'NXÍiV¥´
¸"äòõ€,V°˜
|
||||
Ü@µº`GëÑ%
|
|
@ -1,29 +1,21 @@
|
|||
age-encryption.org/v1
|
||||
-> ssh-ed25519 V1pwNA QL6Ov/gY2LGGxdb2lBmAO5TWpSM6Lu7lrDoRAjpt8Xk
|
||||
Y/N8e/lbtGq8x5XKEArhGB24sylZg28CUDy1ZPMEB6E
|
||||
-> ssh-ed25519 4PzZog edg0jd91dvzl7GCpYhcXae+1/J/S7Gg7oB8K9qUKZUw
|
||||
vBWclnGBVsTqiU5CvyufRsNNcoOEuEsYshO4a57e0XI
|
||||
-> ssh-ed25519 dA0vRg JZhFcar8MPdXQqWZb1MPFDBefI8WxouCZVzvZ+igeDo
|
||||
b7R3MyTA5+PlAj4BwtXkTCJbePocqpjuKj0zQpG87Rc
|
||||
-> ssh-ed25519 5Nd93w raDPqiw/0CK8as7sZPRIWE1XY+V5koTvnoc5l9NdhUY
|
||||
VwLkfOyCLQVoh36x8E5u5Dg+o2t9qewebT1LTPRV7hg
|
||||
-> ssh-ed25519 q8eJgg TubfJ7d+08VQbYFfffHxbvhYhckzyz9uQ5HHGse/Bxc
|
||||
SP2/NKROJ4NBAXdCCkatR1NxlW8A9IVZp3FjuVXGNhs
|
||||
-> ssh-ed25519 KVr8rw Y0bWtD5FMzN+XqOzX0GYxjPAfeL/ZTLsK7mENlaDVHo
|
||||
32oRZds/6yzxrElqqcJruLPm7Xbn0bcA2ppwmVar4aQ
|
||||
-> ssh-ed25519 fia1eQ Iv0l4N/M7OtcJaIOl7aYkKXEW0JT1LLcj57Gb+P6bEw
|
||||
1L4QHCzndPVMR3d2QxZJpGBFWkkWVzv82T0Jmy25kU0
|
||||
-> ssh-ed25519 Km71ZA bsyk9/F9MsQ03wk9WSfr/Iq/EqZRbgE6GFAdsF/FXCM
|
||||
eM3IYnk2eV6qAmQSLlNcSXrDjvsKYWj3tJwqsQeE9ts
|
||||
-> ssh-ed25519 IzAMqA DDn7GvKbl6QCccy++gIDIkuH1r8GhpbI53yIj1VxyxE
|
||||
EVXTTiXXhgZCEQ8re0bgMZF+uNr7iRAk65ibxz4iyYA
|
||||
-> ssh-ed25519 uZzB3g rtqfhmxAGTYy01kY2dZfhGpN1PaElLRzvFNGkQnJzyc
|
||||
W5o3/PyNCOwZ1t/XHVakAvNzj3ldBw7cGVa+70a0dp4
|
||||
-> ssh-ed25519 Hb0ipQ nZpBkwWQyy1x5AgVA048LCwHsSsrH5fmWBjQBH3dNF8
|
||||
eGNcytct1cZC141au5Unv8rFPlfrxhCTOs8iHq5IIwk
|
||||
-> ssh-ed25519 IzAMqA QI7Ce9DZ94RAmB9928z5Gq7z56fSvxNPdfsRfHIVrgM
|
||||
+GswWufQ9qHx2xCOoaI5k1uf585J7jb2I+7TFkjnzhw
|
||||
-> ssh-ed25519 IzAMqA ZQX4lsE9Rx35VOnmfcQe0VdZsusK+kJXTSfEMkzAC10
|
||||
Bhx9zoOlyRqfxDMKmqtyFfc0VCWdIf3Any0MySMaDTI
|
||||
--- 3iKU0fXNNfC1wSSA0O5dSyTLtTdE7YWlaN17LyUnMhQ
|
||||
Îá²
uŽc© ŸçõÄO¶hâ^™ÿU«…æŽ<04>—¸M¢»¨ë¿ÒI7O&§Ëî©whùÊ|LhV«Ú†h<E280A0>hYµ`ë»\×hGºoʤÏÚñ°=jQæI]ªùhὈæa ¹ìW½çß|²dƒ!>àaX¡7‡†rÿNòŒÐ£v:ôçæžÀýY•¢"D¹ƒAGÝýòë‰=¼j£´ÅìLd°Ö¢ö×àÜC"0ÑvœñaŒ##‘Í—©´XÈ-ºRäšìPv$Œ|´Ü±ûá1Þž»0>eiÎx<C38E>Ýô 9€ŸÐì>ÌVå«zH^Jl´Uˆ
|
||||
-> ssh-ed25519 V1pwNA /IQ5l2eXrrxtC9ZtYtQi82rpqQD5LVOyAgzrjYAmLVk
|
||||
e/ULJRshHNKSY8v+lddX00rhm1ii4zw0U46Htumd4Ak
|
||||
-> ssh-ed25519 4PzZog cEO6aPXe10V9nY4vKWIzgKz/5/0shjzbHH+jjt19dXE
|
||||
cIrJXB1/5kjfMAPHR8ek+WuLHba05hGk7KnRNY301SM
|
||||
-> ssh-ed25519 5Nd93w qOK+kkjKSLEYnWCU5f0cy6yFcFIzunY31uDvnqftrCo
|
||||
pYz2l61GcLd1ZQU4TibDRwc7Sy3HQlfES2qRt8WsME8
|
||||
-> ssh-ed25519 q8eJgg XwYlR8abqGTOsjFxY1CYYbl6AAWMFHE9f5zOJVUK/jI
|
||||
Ii//xUhCfMSTDoRb/JbkbzL5cWlNnJ6Kwwc1H+XCvr8
|
||||
-> ssh-ed25519 IzAMqA kC3qub54kRSAlhyMJM72l3DNKPzFd7iTk7yNx/6SSXk
|
||||
sT4hQIhdhBYZOeTi8Lt4D71J7k6HYCjp9I/cN7ol9nM
|
||||
-> ssh-ed25519 uZzB3g ppoO2ra7th0nNB6Xk2uQvAQXLFR1nHbFzk/Q5AAquBI
|
||||
Q8ElJrjHviaQ3MiMG2+S9IvpCG59eY6+JPLjFYDNZcA
|
||||
-> ssh-ed25519 Hb0ipQ cvfhLv3RcJdMYh9DsZPj9KwZC/+a3q0ZlNrAzynkoSE
|
||||
yiTiIdGTbMVYFsszLBeebzskelPXjFFUfSEfaHkIREM
|
||||
-> ssh-ed25519 IzAMqA krl921HVATtddpaAgXiVkvnsWF6YK63KTLeCU2nMQgk
|
||||
MgBCXoQ+oWCAr81XgAVZAzNFl2QyjW37UKN/slHWw0I
|
||||
-> ssh-ed25519 IzAMqA gEZ68r9oW4erwX6nQUYCdU5Te2v3b2u22P5vbr8TiUc
|
||||
ASErPItPSCfSvfp97bUZEBtPx9Ckne8krLpySN868fY
|
||||
--- icoZR+iL03NY/bQLdVm8zJ4/bR7nCd2eVksI44b0XN0
|
||||
)ø!c"îaŽ TÁb
_pø0;ÿ]½Iy–;†æàGÔÆ0ñá¨Zâçð‚uåuRÃÅQé#…Äù”úEhcH‹qÏËÄ
ÍXoÎYþ¡‹ÜÕ¿ìdLC³þ&¿,lþ—GoÀ90Œº<C592>¡{†'úf?”ªæ¥nl2½óöæâ+›ývXß©8‘'¢ˆ+ ìtmu–0™ ¢ÜYÕDR<44>1Â{¨ÈE3Síà¨)LXRAæÏ÷MÉÿßê»±ùR;ËÙ<>Ígd)Í:íÃʺLƒibq<<3C>ƒ¥~=—^Ò¦qo)\+½=À}BlJ‰¡
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue