mirror of
https://git.pvv.ntnu.no/Drift/pvv-nixos-config.git
synced 2026-01-10 01:18:24 +01:00
Compare commits
7 Commits
ebff173946
...
nettsiden-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f580a3ddce | ||
|
|
91f02c7b75 | ||
|
|
22fb43fa63 | ||
|
|
0e1ab4c85c | ||
|
|
cdb72b972d | ||
|
|
12dcd1551b | ||
|
|
dbbe06f628 |
@@ -4,9 +4,9 @@ on:
|
|||||||
push:
|
push:
|
||||||
jobs:
|
jobs:
|
||||||
evals:
|
evals:
|
||||||
runs-on: ubuntu-latest
|
runs-on: debian-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v6
|
||||||
- run: apt-get update && apt-get -y install sudo
|
- run: apt-get update && apt-get -y install sudo
|
||||||
- uses: https://github.com/cachix/install-nix-action@v31
|
- uses: https://github.com/cachix/install-nix-action@v31
|
||||||
- run: echo -e "show-trace = true\nmax-jobs = auto\ntrusted-users = root\nexperimental-features = nix-command flakes\nbuild-users-group =" > /etc/nix/nix.conf
|
- run: echo -e "show-trace = true\nmax-jobs = auto\ntrusted-users = root\nexperimental-features = nix-command flakes\nbuild-users-group =" > /etc/nix/nix.conf
|
||||||
|
|||||||
8
flake.lock
generated
8
flake.lock
generated
@@ -129,11 +129,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764830810,
|
"lastModified": 1765903589,
|
||||||
"narHash": "sha256-I/pVqi4STwmJbpFDI9TmU9PS1lKuYdbJLcztukvZ3PU=",
|
"narHash": "sha256-JRLmckeM4G2hkH2V3VdfjHrrsWgJ8j7rZDYYjHTkRqA=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "df52aa968679a62745bf42c272de53fdd9a035ac",
|
"rev": "7c86d342e68506fcd83cb74af3336f99ff522a0a",
|
||||||
"revCount": 16,
|
"revCount": 24,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.pvv.ntnu.no/Projects/minecraft-kartverket.git"
|
"url": "https://git.pvv.ntnu.no/Projects/minecraft-kartverket.git"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -55,8 +55,10 @@ in {
|
|||||||
DOOR_SECRET = includeFromSops "door_secret";
|
DOOR_SECRET = includeFromSops "door_secret";
|
||||||
|
|
||||||
DB = {
|
DB = {
|
||||||
DSN = "mysql:dbname=www-data_nettside;host=mysql.pvv.ntnu.no";
|
# DSN = "mysql:dbname=www-data_nettside;host=mysql.pvv.ntnu.no";
|
||||||
USER = "www-data_nettsi";
|
# USER = "www-data_nettsi";
|
||||||
|
DSN = "pgsql:dbname=pvv_nettsiden;host=postgres.pvv.ntnu.no";
|
||||||
|
USER = "pvv_nettsiden";
|
||||||
PASS = includeFromSops "mysql_password";
|
PASS = includeFromSops "mysql_password";
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -78,7 +80,8 @@ in {
|
|||||||
};
|
};
|
||||||
|
|
||||||
services.phpfpm.pools."pvv-nettsiden".settings = {
|
services.phpfpm.pools."pvv-nettsiden".settings = {
|
||||||
# "php_admin_value[error_log]" = "stderr";
|
"php_flag[display_errors]" = true;
|
||||||
|
"php_admin_value[error_log]" = "syslog";
|
||||||
"php_admin_flag[log_errors]" = true;
|
"php_admin_flag[log_errors]" = true;
|
||||||
"catch_workers_output" = true;
|
"catch_workers_output" = true;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ in
|
|||||||
} ''
|
} ''
|
||||||
# Bigger icons
|
# Bigger icons
|
||||||
install -Dm444 "${cfg.package.src}/templates/repo/icon.tmpl" "$out/repo/icon.tmpl"
|
install -Dm444 "${cfg.package.src}/templates/repo/icon.tmpl" "$out/repo/icon.tmpl"
|
||||||
sed -i -e 's/24/48/g' "$out/repo/icon.tmpl"
|
sed -i -e 's/24/60/g' "$out/repo/icon.tmpl"
|
||||||
'';
|
'';
|
||||||
in ''
|
in ''
|
||||||
install -Dm444 ${logo-svg} ${cfg.customDir}/public/assets/img/logo.svg
|
install -Dm444 ${logo-svg} ${cfg.customDir}/public/assets/img/logo.svg
|
||||||
|
|||||||
@@ -121,6 +121,10 @@ in {
|
|||||||
picture = {
|
picture = {
|
||||||
DISABLE_GRAVATAR = true;
|
DISABLE_GRAVATAR = true;
|
||||||
ENABLE_FEDERATED_AVATAR = false;
|
ENABLE_FEDERATED_AVATAR = false;
|
||||||
|
|
||||||
|
AVATAR_MAX_FILE_SIZE = 1024 * 1024 * 5;
|
||||||
|
# NOTE: go any bigger than this, and gitea will freeze your gif >:(
|
||||||
|
AVATAR_MAX_ORIGIN_SIZE = 1024 * 1024 * 2;
|
||||||
};
|
};
|
||||||
actions.ENABLED = true;
|
actions.ENABLED = true;
|
||||||
ui = {
|
ui = {
|
||||||
|
|||||||
@@ -1,20 +1,34 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
fetchgit,
|
fetchFromGitea,
|
||||||
makeWrapper,
|
makeWrapper,
|
||||||
nodejs,
|
nodejs,
|
||||||
buildNpmPackage,
|
buildNpmPackage,
|
||||||
|
fetchpatch,
|
||||||
}:
|
}:
|
||||||
buildNpmPackage {
|
buildNpmPackage {
|
||||||
pname = "delete-your-element";
|
pname = "delete-your-element";
|
||||||
version = "3.1-unstable-2025-06-23";
|
version = "3.3-unstable-2025-12-09";
|
||||||
src = fetchgit {
|
src = fetchFromGitea {
|
||||||
url = "https://git.pvv.ntnu.no/Drift/delete-your-element.git";
|
domain = "git.pvv.ntnu.no";
|
||||||
rev = "67658bf68026918163a2e5c2a30007364c9b2d2d";
|
owner = "Drift";
|
||||||
sha256 = "sha256-jSQ588kwvAYCe6ogmO+jDB6Hi3ACJ/3+rC8M94OVMNw=";
|
repo = "delete-your-element";
|
||||||
|
rev = "1c0c545a024ef7215a1a3483c10acce853f79765";
|
||||||
|
hash = "sha256-ow/PdlHfU7PCwsjJUEzoETzONs1KoKTRMRQ9ADN0tGk=";
|
||||||
};
|
};
|
||||||
npmDepsHash = "sha256-HNHEGez8X7CsoGYXqzB49o1pcCImfmGYIw9QKF2SbHo=";
|
|
||||||
|
patches = [
|
||||||
|
(fetchpatch {
|
||||||
|
name = "ooye-fix-package-lock-0001.patch";
|
||||||
|
url = "https://cgit.rory.gay/nix/OOYE-module.git/plain/pl.patch?h=ee126389d997ba14be3fe3ef360ba37b3617a9b2";
|
||||||
|
hash = "sha256-dP6WEHb0KksDraYML+jcR5DftH9BiXvwevUg38ALOrc=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
npmDepsHash = "sha256-OXOyO6LxK/WYYVysSxkol0ilMUZB+osLYUE5DpJlbps=";
|
||||||
|
# npmDepsHash = "sha256-Y+vgp7+7pIDm64AYSs8ltoAiON0EPpJInbmgn3/LkVA=";
|
||||||
dontNpmBuild = true;
|
dontNpmBuild = true;
|
||||||
|
makeCacheWritable = true;
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user