janhaa/infra
1
0
Fork 0
forked from pub-solar/infra
Code Pull requests Activity
204 commits 10 branches 0 tags 2.5 MiB
Commit graph

204 commits

This branch
This branch
All branches
Author SHA1 Message Date
teutat3s c88a0608f6
fix: matrix delegation via well-known for test domain 
We use pub.solar as our server_name and matrix.pub.solar:8448 for matrix
federation traffic. The well-known record served at
https://pub.solar/.well-known/matrix/server should point to
matrix.pub.solar:8448. The same is true for test.pub.solar and
matrix.test.pub.solar:8448.

https://matrix-org.github.io/synapse/latest/delegate.html
 2023-11-18 17:46:56 +01:00
teutat3s f213f93085
fix: remove nix from devshell 
This caused nix version 2.13 being using in the devshell instead of
recent version 2.18, which we use by default in PubSolarOS
 2023-11-18 17:33:28 +01:00
Benjamin Bädorf 33e003d4b4
feat: add wellknown for matrix test domain 2023-11-18 17:32:56 +01:00
b12f 0e83deff1b
Merge pull request 'chore: update flake inputs' (#57) from update-flake-inputs into main 
Reviewed-on: pub-solar/infra#57
Reviewed-by: b12f <b12f@noreply.git.pub.solar>
 2023-11-15 23:25:38 +00:00
teutat3s da393fa1ed
chore: update flake inputs 
• Updated input 'deploy-rs':
    'github:serokell/deploy-rs/e3f41832680801d0ee9e2ed33eb63af398b090e9' (2023-09-18)
  → 'github:serokell/deploy-rs/660180bbbeae7d60dad5a92b30858306945fd427' (2023-11-02)
• Updated input 'home-manager':
    'github:nix-community/home-manager/07682fff75d41f18327a871088d20af2710d4744' (2023-09-19)
  → 'github:nix-community/home-manager/04bac349d585c9df38d78e0285b780a140dc74a4' (2023-11-12)
• Updated input 'nix-darwin':
    'github:lnl7/nix-darwin/afe83cbc2e673b1f08d32dd0f70df599678ff1e7' (2023-10-27)
  → 'github:lnl7/nix-darwin/e67f2bf515343da378c3f82f098df8ca01bccc5f' (2023-11-13)
• Updated input 'nixos-flake':
    'github:srid/nixos-flake/2c25190ceacdaaae7e8afbecfa87096bb499a431' (2023-08-22)
  → 'github:srid/nixos-flake/40010feda1ac1afdcc2571ef550ef3de44926b0e' (2023-11-12)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/60b9db998f71ea49e1a9c41824d09aa274be1344' (2023-10-26)
  → 'github:nixos/nixpkgs/d4b5a67bbe9ef750bd2fdffd4cad400dd5553af8' (2023-11-14)
• Updated input 'unstable':
    'github:nixos/nixpkgs/63678e9f3d3afecfeafa0acead6239cdb447574c' (2023-10-26)
  → 'github:nixos/nixpkgs/e44462d6021bfe23dfb24b775cc7c390844f773d' (2023-11-12)
 2023-11-15 21:54:38 +01:00
teutat3s 3104253b89
Merge pull request 'mediawiki' (#51) from mediawiki into main 
Reviewed-on: pub-solar/infra#51
Reviewed-by: teutat3s <teutat3s@noreply.git.pub.solar>
 2023-11-15 20:54:05 +00:00
teutat3s 31002fbf11
fix: rebase leftover 2023-11-15 21:44:11 +01:00
teutat3s f2364b314a
fix: keycloak secret file permissions 2023-11-15 21:43:44 +01:00
b12f f5185e5c15
feat: add mediawiki 
Co-authored-by: @teutat3s <teutates@mailbox.org>
 2023-11-15 21:40:29 +01:00
b12f 6642a69ca4
Merge pull request 'fix: link to our statutes / satzung' (#56) from fix/nextcloud-link-satzung into main 
Reviewed-on: pub-solar/infra#56
Reviewed-by: b12f <b12f@noreply.git.pub.solar>
 2023-11-15 18:54:54 +00:00
teutat3s 25549fdc53
fix: link to our statutes / satzung 2023-11-15 18:54:47 +00:00
b12f e3650e2ecd
Merge pull request 'feat: flora-6' (#48) from feat/flora-6 into main 
Reviewed-on: pub-solar/infra#48
Reviewed-by: b12f <b12f@noreply.git.pub.solar>
 2023-11-15 18:54:38 +00:00
teutat3s d5922ff2b8
fix: disable DNSSEC for now because of an issue in 
systemd https://github.com/systemd/systemd/issues/10579

Without this change, there are random SERVFAIL responses with Greenbaum DNS
when using allow-downgrade. Fixes DNS queries for lev-1.int.greenbaum.zone

❯ dig obs-portal.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.int.greenbaum.zone

; <<>> DiG 9.18.19 <<>> obs-portal.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.int.greenbaum.zone
;; global options: +cmd
;; Got answer:
;; ->>HEADER<<- opcode: QUERY, status: SERVFAIL, id: 1871
;; flags: qr rd ra; QUERY: 1, ANSWER: 1, AUTHORITY: 0, ADDITIONAL: 1

;; OPT PSEUDOSECTION:
; EDNS: version: 0, flags:; udp: 65494
;; QUESTION SECTION:
;obs-portal.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.int.greenbaum.zone. IN A

;; ANSWER SECTION:
obs-portal.svc.e5756d08-36fd-424b-f8bc-acdb92ca7b82.lev-1.int.greenbaum.zone. 22 IN A 192.168.128.82

;; Query time: 105 msec
;; SERVER: 127.0.0.53#53(127.0.0.53) (UDP)
;; WHEN: Thu Nov 09 10:38:02 UTC 2023
;; MSG SIZE  rcvd: 121
 2023-11-15 18:54:32 +00:00
teutat3s 3e0af35c75
wip: actions runner 2023-11-15 18:54:32 +00:00
teutat3s 9c1d19d49f
nachtigall: move SSH private key from user to host 2023-11-15 18:54:32 +00:00
teutat3s 43512ae6e7
forgejo-actions-runner: use Node.js docker images 
Regenerate auth token
 2023-11-15 18:54:32 +00:00
teutat3s 1bd7e5c0e7
docs: clean up 2023-11-15 18:54:32 +00:00
teutat3s f24a29196c
secrets: add drone, forgejo-actions-runner secrets and rekey 2023-11-15 18:54:32 +00:00
teutat3s 7be3567e6d
flora-6: refactor to use flake.parts 2023-11-15 18:54:32 +00:00
b12f 7cc7517d9c
Merge pull request 'ci: run flake checks only on pull requests' (#55) from ci-on-pr-only into main 
Reviewed-on: pub-solar/infra#55
Reviewed-by: b12f <b12f@noreply.git.pub.solar>
 2023-11-15 18:47:13 +00:00
teutat3s 72badc7283
ci: run flake checks only on pull requests 2023-11-15 18:47:00 +00:00
b12f e1827c7fc6
Merge pull request 'feat: advertise sliding sync support to matrix clients' (#54) from matrix-sliding-sync into main 
Reviewed-on: pub-solar/infra#54
Reviewed-by: b12f <b12f@noreply.git.pub.solar>
 2023-11-15 18:46:39 +00:00
teutat3s e041f05505
feat: advertise sliding sync support to matrix clients 2023-11-10 19:02:13 +01:00
b12f ef56e0f206
Merge pull request 'fix: CI + cachix' (#53) from fix/ci-cachix into main 
Reviewed-on: pub-solar/infra#53
Reviewed-by: b12f <b12f@noreply.git.pub.solar>
 2023-11-09 19:14:08 +00:00
teutat3s c66846d148
ci: nix based image 2023-11-09 20:10:40 +01:00
teutat3s dbc99864df
Bump flake flake.parts input 2023-11-09 20:10:40 +01:00
teutat3s b8e213d626
ci: try Node.js docker images 2023-11-09 20:10:08 +01:00
b12f fda21f8633
Merge pull request 'fix/add-matrix-wellknown' (#52) from fix/add-matrix-wellknown into main 
Reviewed-on: pub-solar/infra#52
Reviewed-by: teutat3s <teutat3s@noreply.git.pub.solar>
 2023-11-08 15:33:21 +00:00
Benjamin Bädorf b085c2e2b2
feat: add all matrix well-known data to nginx 2023-11-07 15:19:55 +01:00
Benjamin Bädorf 6fa03994b1
fix: add matrix well-known for pub.solar 2023-11-07 15:12:24 +01:00
b12f 8f603dad45
Merge pull request 'fix/backup-repositories-droppie' (#50) from fix/backup-repositories-droppie into main 
Reviewed-on: pub-solar/infra#50
Reviewed-by: teutat3s <teutat3s@noreply.git.pub.solar>
 2023-11-06 22:59:25 +00:00
Benjamin Bädorf d69e0350ef
fix: use clean new directory for backups on droppie 2023-11-06 22:59:17 +00:00
Benjamin Bädorf 07df547f33
fix: specify sftp storage for droppie restic backups 2023-11-06 22:59:17 +00:00
b12f 77a4460a36
Merge pull request 'fix: store forgejo sessions in DB' (#49) from fix/forgejo-store-sessions-in-db into main 
Reviewed-on: pub-solar/infra#49
Reviewed-by: b12f <b12f@noreply.git.pub.solar>
 2023-11-06 22:58:50 +00:00
teutat3s 428fcab009
fix: store forgejo sessions in DB 
See:
https://docs.gitea.com/administration/config-cheat-sheet#session-session
 2023-11-06 22:34:51 +01:00
teutat3s f576c7385d
Merge pull request 'backups' (#47) from feat/backups into main 
Reviewed-on: pub-solar/infra#47
Reviewed-by: teutat3s <teutat3s@noreply.git.pub.solar>
 2023-11-06 21:24:03 +00:00
Benjamin Bädorf c8233cf6a7
chore: simplify sudo command for backups 2023-11-06 22:22:36 +01:00
Benjamin Bädorf 052d752d27
feat: add settings_local.json to mailman-web backup 2023-11-06 22:20:29 +01:00
Benjamin Bädorf e8f72b6cf7
fix: remove unlock zfs module from lib 2023-11-06 22:09:22 +01:00
Benjamin Bädorf 20fbcbb571
fix: two typos 2023-11-06 21:07:24 +00:00
Benjamin Bädorf 841757517f
refactor: small backup refactoring 2023-11-06 21:07:24 +00:00
Benjamin Bädorf 42fbde31e5
feat: droppie backups for all nachtigall services 2023-11-06 21:07:24 +00:00
Benjamin Bädorf e7c70c6cd0
fix: nachtigall root ssh key config fixes 2023-11-06 21:07:24 +00:00
teutat3s a63e0e2154
Merge pull request 'feat: enable gitea actions in forgejo' (#40) from feat/gitea-actions into main 
Reviewed-on: pub-solar/infra#40
Reviewed-by: b12f <b12f@noreply.git.pub.solar>
 2023-11-06 21:07:01 +00:00
teutat3s 487e12015a
ci: add pub-solar cachix 
https://app.cachix.org
 2023-11-06 22:06:32 +01:00
teutat3s 6a96345760
feat: enable gitea actions in forgejo 
See: https://docs.gitea.com/usage/actions/quickstart
 2023-11-06 22:06:16 +01:00
b12f 62e1e0cddc
Merge pull request 'refactor: change file structure to use modules dir' (#41) from refactor/file-structure into main 
Reviewed-on: pub-solar/infra#41
Reviewed-by: teutat3s <teutat3s@noreply.git.pub.solar>
 2023-11-06 12:11:46 +00:00
Benjamin Bädorf e8ad662631
refactor: change file structure to use modules dir 
This commit changes the file structure around, so that we have the
following parts:

`/modules` contains reusable logic blocks for hosts.
`/hosts` contains host configurations.
`/lib` contains nix library functions.
`/overlays` contains overlay files.
`/public-keys` contains all information regarding public keys.

This change reduces the complexity of flake.nix, instead delegating this
out to the `default.nix` files in the above directories.
 2023-11-06 13:11:30 +01:00
b12f 65a660117a
Merge pull request 'feat: add declarative root ssh key on nachtigall' (#46) from feat/declarative-root-ssh-nachtigall into main 
Reviewed-on: pub-solar/infra#46
Reviewed-by: teutat3s <teutat3s@noreply.git.pub.solar>
 2023-11-05 20:54:39 +00:00
Benjamin Bädorf d011cb04e1
feat: add declarative root ssh key on nachtigall 2023-11-05 19:35:37 +01:00