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

774 commits

This branch
This branch
All branches
Author SHA1 Message Date
teutat3s 94ae6c9302
fix(mastodon): use working unix sockets for streaming api 
The streaming API is currently unusable because we still pass traffic
to the old unix socket path.
Since c82195d9e8 (diff-157b1ef68573bbec951d6e551513a555e2d1ca7a161a68f1978b11d39a0bef1eR789-R803)
there are multiple unix sockets involved.
 2024-01-17 10:32:03 +01:00
teutat3s ebc34e50bc
Merge pull request 'chore: bump flake inputs' (#97) from chore/bump-flake-inputs into main 
Reviewed-on: pub-solar/infra#97
 2024-01-17 08:58:53 +00:00
teutat3s 67ff6f8656
chore: bump flake inputs 
• Updated input 'deploy-rs':
    'github:serokell/deploy-rs/b709d63debafce9f5645a5ba550c9e0983b3d1f7' (2023-12-20)
  → 'github:serokell/deploy-rs/1776009f1f3fb2b5d236b84d9815f2edee463a9b' (2024-01-10)
• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5' (2023-12-01)
  → 'github:hercules-ci/flake-parts/07f6395285469419cf9d078f59b5b49993198c00' (2024-01-11)
• Updated input 'flake-parts/nixpkgs-lib':
    'github:NixOS/nixpkgs/e92039b55bcd58469325ded85d4f58dd5a4eaf58?dir=lib' (2023-11-29)
  → 'github:NixOS/nixpkgs/b0d36bd0a420ecee3bc916c91886caca87c894e9?dir=lib' (2023-12-30)
• Updated input 'home-manager':
    'github:nix-community/home-manager/d5824a76bc6bb93d1dce9ebbbcb09a9b6abcc224' (2023-12-23)
  → 'github:nix-community/home-manager/5f0ab0eedc6ede69beb8f45561ffefa54edc6e65' (2024-01-11)
• Updated input 'keycloak-theme-pub-solar':
    'git+https://git.pub.solar/pub-solar/keycloak-theme?ref=main&rev=bba54d2f5cd616ff5fded4c95f1e4f99faa2f5d0' (2023-12-03)
  → 'git+https://git.pub.solar/pub-solar/keycloak-theme?ref=main&rev=73f1ae5ca6ff8886960cd0eb89d46a9f4af86cb4' (2024-01-11)
• Updated input 'nix-darwin':
    'github:lnl7/nix-darwin/8a8321271f0835fae2cb195e1137cb381fdbcc8e' (2023-12-27)
  → 'github:lnl7/nix-darwin/0dd382b70c351f528561f71a0a7df82c9d2be9a4' (2024-01-03)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/d02d818f22c777aa4e854efc3242ec451e5d462a' (2023-12-25)
  → 'github:nixos/nixpkgs/3dc440faeee9e889fe2d1b4d25ad0f430d449356' (2024-01-10)
• Updated input 'unstable':
    'github:nixos/nixpkgs/5f64a12a728902226210bf01d25ec6cbb9d9265b' (2023-12-24)
  → 'github:nixos/nixpkgs/317484b1ead87b9c1b8ac5261a8d2dd748a0492d' (2024-01-08)
 2024-01-12 00:20:11 +01:00
b12f 28e77fa6ce
Merge pull request 'fix: remove QuickInstantCommons extension' (#96) from fix/mediawiki-recent-changes into main 
Reviewed-on: pub-solar/infra#96
Reviewed-by: b12f <b12f@noreply.git.pub.solar>
 2024-01-08 22:57:41 +00:00
teutat3s 5590b5b1b3
fix: remove QuickInstantCommons extension 
Docker image updated in 529554b4d1

Seems currently broken:
https://wiki.pub.solar/index.php/Special:RecentChanges with the
extension enabled throws:

Internal error LogicException: Backend with name 'wikimediacommons-backend' already registered.
 2024-01-08 21:53:14 +01:00
teutat3s 95f224a9b7
Merge pull request 'feat: update mediawiki to 1.41.0, enable new extension TemplateStyles' (#95) from feat/mediawiki-updates into main 
Reviewed-on: pub-solar/infra#95
Reviewed-by: b12f <b12f@noreply.git.pub.solar>
 2024-01-08 17:12:23 +00:00
teutat3s 8d06c61d2f
fix: remove duplicate wgLogo setting 2024-01-08 17:56:48 +01:00
teutat3s 1d018ade9b
feat: enable InstantCommons 
https://www.mediawiki.org/wiki/InstantCommons
https://commons.wikimedia.org/wiki/Commons:Reusing_content_outside_Wikimedia/technical#InstantCommons
 2024-01-08 17:56:33 +01:00
teutat3s 05f7dbe262
feat: enable wgUseInstantCommons 
https://commons.wikimedia.org/wiki/Commons:Reusing_content_outside_Wikimedia/technical#InstantCommons
 2024-01-08 17:42:57 +01:00
teutat3s 1c05fd39a4
docs: how to update mediawiki wiki.pub.solar 2024-01-08 14:54:25 +01:00
teutat3s a7f98c2d45
fix: ensure mediawiki logo survives updates 2024-01-08 14:35:43 +01:00
teutat3s a59e9cb6ea
feat: update mediawiki to 1.41.0, enable extension 
TemplateStyles

https://gerrit.wikimedia.org/g/mediawiki/core/%2B/REL1_41/RELEASE-NOTES-1.41
 2024-01-08 14:14:34 +01:00
b12f 99ff776932
Merge pull request 'feat: shutdown freenode IRC bridge, use shorter IRC aliases,' (#93) from feat/matrix-shutdown-irc-freenode-bridge into main 
Reviewed-on: pub-solar/infra#93
Reviewed-by: b12f <b12f@noreply.git.pub.solar>
 2024-01-08 11:53:45 +00:00
teutat3s f2217a1409
feat: shutdown freenode IRC bridge, use shorter 
IRC aliases, use nixos matrix-synapse service config for homeserver port
 2024-01-07 20:15:16 +01:00
Hendrik Sokolowski 0fe02a9f73
fix uploads path eventually (#92) 
yeah yeah

Reviewed-on: pub-solar/infra#92
Reviewed-by: b12f <b12f@noreply.git.pub.solar>
Co-authored-by: Hendrik Sokolowski <hensoko@gssws.de>
Co-committed-by: Hendrik Sokolowski <hensoko@gssws.de>
 2024-01-07 16:18:43 +00:00
Hendrik Sokolowski b37ad608a4
update mediawiki config (#91) 
* disable logging to /dev/stderr
* fix upload path

Reviewed-on: pub-solar/infra#91
Reviewed-by: b12f <b12f@noreply.git.pub.solar>
Co-authored-by: Hendrik Sokolowski <hensoko@gssws.de>
Co-committed-by: Hendrik Sokolowski <hensoko@gssws.de>
 2024-01-07 15:44:21 +00:00
teutat3s 5e3a4b159f
Merge pull request 'docs: initial docs for ci' (#90) from docs/ci into main 
Reviewed-on: pub-solar/infra#90
Reviewed-by: b12f <b12f@noreply.git.pub.solar>
 2024-01-07 15:26:32 +00:00
b12f 737f6ec35d
Merge pull request 'docs: add privacy hardening docs' (#89) from docs/privacy-hardening into main 
Reviewed-on: pub-solar/infra#89
Reviewed-by: teutat3s <teutat3s@noreply.git.pub.solar>
 2024-01-07 14:51:18 +00:00
teutat3s 2da3aecfbe
docs: initial Forgejo Actions docs 2024-01-07 15:43:40 +01:00
teutat3s f993c0a94a
docs: init drone CI docs 2024-01-07 15:43:26 +01:00
Benjamin Bädorf 9cf04fd710
docs: add privacy hardening docs 2024-01-07 00:32:59 +01:00
teutat3s 9bde9237d2
Merge pull request 'Update forgejo / drone CI' (#86) from fix/drone-ci into main 
Reviewed-on: pub-solar/infra#86
Reviewed-by: b12f <b12f@noreply.git.pub.solar>
 2024-01-06 14:29:46 +00:00
teutat3s e3f00b7d19
fix: update drone forgejo oauth secrets 2023-12-29 19:27:45 +01:00
teutat3s 7e8f3c8cf5
fix: update forgejo-actions-runner token, use 
docker image from https://git.pub.solar/pub-solar/actions-base-image
 2023-12-29 19:26:43 +01:00
teutat3s 92c606b28f
Merge pull request 'chore: bump flake inputs, ssh security update' (#85) from chore/bump-flake-inputs into main 
Reviewed-on: pub-solar/infra#85
Reviewed-by: b12f <b12f@noreply.git.pub.solar>
 2023-12-28 21:17:23 +00:00
teutat3s afca5c3735
chore: bump Nextcloud to version 28 2023-12-28 17:38:41 +01:00
teutat3s e97ce6d40f
chore: bump flake inputs 
• Updated input 'agenix':
    'github:ryantm/agenix/13ac9ac6d68b9a0896e3d43a082947233189e247' (2023-11-29)
  → 'github:ryantm/agenix/417caa847f9383e111d1397039c9d4337d024bf0' (2023-12-24)
• Added input 'agenix/systems':
    'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09)
• Updated input 'deploy-rs':
    'github:serokell/deploy-rs/915327515f5fd1b7719c06e2f1eb304ee0bdd803' (2023-12-13)
  → 'github:serokell/deploy-rs/b709d63debafce9f5645a5ba550c9e0983b3d1f7' (2023-12-20)
• Updated input 'home-manager':
    'github:nix-community/home-manager/1488651d02c1a7a15e284210f0d380a62d8d8cef' (2023-12-17)
  → 'github:nix-community/home-manager/d5824a76bc6bb93d1dce9ebbbcb09a9b6abcc224' (2023-12-23)
• Updated input 'nix-darwin':
    'github:lnl7/nix-darwin/4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d' (2023-11-24)
  → 'github:lnl7/nix-darwin/8a8321271f0835fae2cb195e1137cb381fdbcc8e' (2023-12-27)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f' (2023-12-17)
  → 'github:nixos/nixpkgs/d02d818f22c777aa4e854efc3242ec451e5d462a' (2023-12-25)
• Updated input 'unstable':
    'github:nixos/nixpkgs/a9bf124c46ef298113270b1f84a164865987a91c' (2023-12-11)
  → 'github:nixos/nixpkgs/5f64a12a728902226210bf01d25ec6cbb9d9265b' (2023-12-24)
 2023-12-28 17:38:06 +01:00
teutat3s e1cab88e3d
Merge pull request 'chore: update flake inputs home-manager, nixpkgs, remove temporary input release-2311' (#84) from chore/bump-flake-inputs into main 
Reviewed-on: pub-solar/infra#84
 2023-12-20 11:00:30 +00:00
teutat3s 7cc3a261ed
chore: update flake inputs home-manager, nixpkgs, 
remove temporary input release-2311

• Updated input 'home-manager':
    'github:nix-community/home-manager/6761b8188b860f374b457eddfdb05c82eef9752f' (2023-12-10)
  → 'github:nix-community/home-manager/1488651d02c1a7a15e284210f0d380a62d8d8cef' (2023-12-17)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7' (2023-12-12)
  → 'github:nixos/nixpkgs/1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f' (2023-12-17)
• Removed input 'release-2311'
 2023-12-18 12:41:30 +01:00
teutat3s 2e2ca2fc82
Merge pull request 'feat(matrix): enable sliding-sync' (#83) from feat/matrix-synapse-sliding-sync into main 
Reviewed-on: pub-solar/infra#83
Reviewed-by: Akshay Mankar <axeman@noreply.git.pub.solar>
 2023-12-16 15:34:28 +00:00
teutat3s a310b414f7
fix: update well-known for sliding-sync 2023-12-16 14:57:36 +01:00
teutat3s 768d4c78bc
fix: use nginx locations recommended by upstream 
https://github.com/matrix-org/sliding-sync#same-hostname
 2023-12-16 14:48:08 +01:00
teutat3s a56f8d2a00
fix: add missing SYNCV3_SECRET env var 2023-12-16 14:33:20 +01:00
teutat3s 14fa3fdec2
feat(matrix): enable sliding-sync 
Sliding Sync is an implementation of MSC3575 and a prerequisite for
running the new (still beta) Element X clients (Element X iOS and
Element X Android).

https://github.com/matrix-org/sliding-sync
https://github.com/matrix-org/matrix-spec-proposals/blob/kegan/sync-v3/proposals/3575-sync.md
 2023-12-16 13:53:34 +01:00
teutat3s c48a405e44
Merge pull request 'fix(keycloak): NullPointerException' (#82) from fix/keycloak-needs-nightly into main 
Reviewed-on: pub-solar/infra#82
Reviewed-by: b12f <b12f@noreply.git.pub.solar>
 2023-12-14 17:08:08 +00:00
teutat3s 4de835127f
fix(keycloak): NullPointerException 
Use nightly to fix Cannot invoke "org.keycloak.models.RealmModel.getClientScopesStream()" because "realm" is null

Until 23.0.2 is out

https://github.com/keycloak/keycloak/pull/25313

https://github.com/keycloak/keycloak/issues/25176
https://github.com/keycloak/keycloak/issues/25183
 2023-12-14 01:53:29 +01:00
teutat3s 17baf5aa2f
Merge pull request 'feat: nixpkgs updates 2023-12-13' (#81) from feat/nixpkgs-updates into main 
Reviewed-on: pub-solar/infra#81
Reviewed-by: b12f <b12f@noreply.git.pub.solar>
 2023-12-14 00:19:21 +00:00
teutat3s e6177069ab
fix(security): pull in forgejo 1.20.6-1 early 
https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1206-1

https://github.com/NixOS/nixpkgs/pull/274026
https://nixpk.gs/pr-tracker.html?pr=274026

• Added input 'release-2311':
    'github:nixos/nixpkgs/c15f414581b4eb4113eed52ed303a1e62771fb6f' (2023-12-13)
 2023-12-14 00:49:21 +01:00
teutat3s 4562bda0bf
fix(ci): avoid nix trying to use GH access-token 
The GITHUB_TOKEN env var is set on each step by
https://code.forgejo.org/forgejo/runner, but only to communicate with
forgejo to access the repo (if it is private)

error: unable to download '4e422edf6b': HTTP error 401
 2023-12-14 00:40:38 +01:00
teutat3s efb789d658
docs: how to show diff with nix before deploying 
updates
 2023-12-14 00:40:38 +01:00
teutat3s 294f3b7836
fix: add result to gitignore 2023-12-14 00:40:37 +01:00
teutat3s e8bab677db
chore: update flake inputs 
• Updated input 'deploy-rs':
    'github:serokell/deploy-rs/660180bbbeae7d60dad5a92b30858306945fd427' (2023-11-02)
  → 'github:serokell/deploy-rs/915327515f5fd1b7719c06e2f1eb304ee0bdd803' (2023-12-13)
• Updated input 'deploy-rs/flake-compat':
    'github:edolstra/flake-compat/009399224d5e398d03b22badca40a37ac85412a1' (2022-11-17)
  → 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04)
• Updated input 'deploy-rs/utils':
    'github:numtide/flake-utils/5aed5285a952e0b949eb3ba02c12fa4fcfef535f' (2022-11-02)
  → 'github:numtide/flake-utils/4022d587cbbfd70fe950c1e2083a02621806a725' (2023-12-04)
• Added input 'deploy-rs/utils/systems':
    'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09)
• Updated input 'home-manager':
    'github:nix-community/home-manager/aeb2232d7a32530d3448318790534d196bf9427a' (2023-11-24)
  → 'github:nix-community/home-manager/6761b8188b860f374b457eddfdb05c82eef9752f' (2023-12-10)
• Updated input 'nixos-flake':
    'github:srid/nixos-flake/7c9168884128ed4634751b3e2f5553b09d7b8cb0' (2023-11-28)
  → 'github:srid/nixos-flake/4e422edf6b511f8e214b392cf1a0d4707a0399a4' (2023-12-09)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/5de0b32be6e85dc1a9404c75131316e4ffbc634c' (2023-12-01)
  → 'github:nixos/nixpkgs/cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7' (2023-12-12)
• Updated input 'unstable':
    'github:nixos/nixpkgs/e92039b55bcd58469325ded85d4f58dd5a4eaf58' (2023-11-29)
  → 'github:nixos/nixpkgs/a9bf124c46ef298113270b1f84a164865987a91c' (2023-12-11)
 2023-12-14 00:40:31 +01:00
teutat3s f0fb575c81
Merge pull request 'feat: grafana + prometheus + loki on flora-6' (#77) from feat/grafana into main 
Reviewed-on: pub-solar/infra#77
Reviewed-by: Akshay Mankar <axeman@noreply.git.pub.solar>
 2023-12-13 23:21:32 +00:00
teutat3s d734adce58
fix: new Greenbaum mail server is mail.greenbaum.zone 2023-12-13 20:45:35 +01:00
teutat3s e3d4f61a42
feat(nachtigall): send logs to loki, https+basic auth 
Use caddy as reverse proxy for loki on flora-6, add basic auth

Add promtail to nachtigall, push logs to flora-6
 2023-12-13 19:18:56 +01:00
teutat3s 10bb3295de
fix: grafana editor role is unused for now 2023-12-13 17:52:01 +01:00
teutat3s e8cf4dceb0
fix(flora-6): allow traffic from br-+ interfaces 2023-12-13 17:51:34 +01:00
teutat3s 1b9a6bb0c2
fix: don't ignore interfaces that can change 2023-12-13 02:12:12 +01:00
teutat3s 219b67df20
fix: add 4 logs retention for loki 2023-12-13 02:12:12 +01:00
teutat3s 6c1fa290e8
feat(prometheus): add job to scrape nachtigall.pub.solar 2023-12-13 02:12:12 +01:00