reciproka/reciproka-ops
1
0
Fork 0
Code Issues 6 Pull requests Packages Projects Releases Wiki Activity

Merge branch 'nixos-24.05' into consensus

Browse source
This commit is contained in:
Fiscal Velvet Poet 2024-06-05 23:08:27 +10:00
parent 6e924f3ba4 fcabd95e7e
commit eadae376a7
Signed by: fiscalvelvetpoet
GPG key ID: D8EBFD58B023BD47
4 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
flake.lock
View file

@ -197,11 +197,11 @@
}, },
"nixpkgsUnstable": { "nixpkgsUnstable": {
"locked": { "locked": {
"lastModified": 1716293225, "lastModified": 1717196966,
"narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=", "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916", "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -213,16 +213,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1716633019, "lastModified": 1717281328,
"narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=", "narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e", "rev": "b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-23.11", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

2
flake.nix
View file

@ -19,7 +19,7 @@
flake = false; flake = false;
url = git+https://reciproka.dev/resrok/resrok-web/?ref=consensus; url = git+https://reciproka.dev/resrok/resrok-web/?ref=consensus;
}; };
nixpkgs.url = github:NixOS/nixpkgs/?ref=nixos-23.11; nixpkgs.url = github:NixOS/nixpkgs/?ref=nixos-24.05;
nixpkgsUnstable.url = github:NixOS/nixpkgs/?ref=nixos-unstable; nixpkgsUnstable.url = github:NixOS/nixpkgs/?ref=nixos-unstable;
utils.url = "github:numtide/flake-utils"; utils.url = "github:numtide/flake-utils";
voc-web = { voc-web = {

1
hardware/raspberry_pi_3_model_B.nix
View file

@ -31,7 +31,6 @@
raspberryPi = { raspberryPi = {
enable = false; enable = false;
version = 3; version = 3;
uboot.enable = true;
firmwareConfig = '' firmwareConfig = ''
arm_64bit=1 # Force kernel loading system to assume a 64-bit kernel arm_64bit=1 # Force kernel loading system to assume a 64-bit kernel
display_auto_detect=1 # Enable auto detection of screen resolution display_auto_detect=1 # Enable auto detection of screen resolution

7
profiles/reciproka-forgejo.nix
View file

@ -19,6 +19,7 @@ in {
httpPort = 3002; # Provided unique port httpPort = 3002; # Provided unique port
rootUrl = "https://reciproka.dev/"; # Root web URL rootUrl = "https://reciproka.dev/"; # Root web URL
settings = let settings = let
DEFAULT.APP_NAME = "Reciproka Kolektivo: Forgejo Service"; # Give the site a name
server = { server = {
DOMAIN = "reciproka.dev"; # Domain name DOMAIN = "reciproka.dev"; # Domain name
HTTP_PORT = 3002; # Provided unique port HTTP_PORT = 3002; # Provided unique port
@ -73,11 +74,7 @@ in {
ensureUsers = [ ensureUsers = [
{ {
name = "forgejo"; # Ensure the database user persists name = "forgejo"; # Ensure the database user persists
ensurePermissions = { ensureDBOwnership = true;
# Ensure the database permissions persist
"DATABASE forgejo" = "ALL PRIVILEGES";
"ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES";
};
} }
]; ];
package = pkgs.postgresql_16; package = pkgs.postgresql_16;