Deploy Scylla

Signed-off-by: Danila Fedorin <danila.fedorin@gmail.com>
This commit is contained in:
2025-12-27 19:31:21 +00:00
parent d4576c6287
commit 249472e6d0
3 changed files with 80 additions and 9 deletions

View File

@@ -1,4 +1,4 @@
{ pkgs, system, blog, web-files, ... }: { pkgs, system, blog, web-files, Scylla, ... }:
let let
productionSite = blog.english { productionSite = blog.english {
ssl = true; ssl = true;
@@ -27,7 +27,20 @@ let
locations."/".proxyPass = "http://localhost:3000/"; locations."/".proxyPass = "http://localhost:3000/";
}; };
}; };
allVirtualHosts = [gitea webFiles] ++ map blog.virtualHostFor [productionSite draftSite]; scylla = {
"scylla.danilafe.com" = {
root = Scylla;
addSSL = true;
enableACME = true;
locations."/static/" = {
tryFiles = "$uri =404";
};
locations."/" = {
tryFiles = "$uri $uri/ /index.html";
};
};
};
allVirtualHosts = [scylla gitea webFiles] ++ map blog.virtualHostFor [productionSite draftSite];
in in
{ {
imports = [ imports = [

67
flake.lock generated
View File

@@ -1,8 +1,29 @@
{ {
"nodes": { "nodes": {
"Scylla": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1766862133,
"narHash": "sha256-//tElNDA44kTCRNS8MzBdXA4uCwEfLHI/NVw9PtmLDs=",
"ref": "refs/heads/master",
"rev": "38968c3247945ba99718d7564163f8bf685756c5",
"revCount": 168,
"type": "git",
"url": "https://dev.danilafe.com/Matrix-Programs/Scylla.git"
},
"original": {
"type": "git",
"url": "https://dev.danilafe.com/Matrix-Programs/Scylla.git"
}
},
"bergamot-elm": { "bergamot-elm": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_4",
"nixpkgs": [ "nixpkgs": [
"blog", "blog",
"web-files", "web-files",
@@ -26,7 +47,7 @@
}, },
"bergamot-elm_2": { "bergamot-elm_2": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_6",
"nixpkgs": [ "nixpkgs": [
"web-files", "web-files",
"nixpkgs" "nixpkgs"
@@ -50,7 +71,7 @@
"blog": { "blog": {
"inputs": { "inputs": {
"blog-source": "blog-source", "blog-source": "blog-source",
"flake-utils": "flake-utils", "flake-utils": "flake-utils_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@@ -197,6 +218,24 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_7": {
"inputs": {
"systems": "systems_7"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1766736597, "lastModified": 1766736597,
@@ -215,7 +254,7 @@
}, },
"resume": { "resume": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_3",
"nixpkgs": [ "nixpkgs": [
"blog", "blog",
"nixpkgs" "nixpkgs"
@@ -237,6 +276,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"Scylla": "Scylla",
"blog": "blog", "blog": "blog",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"web-files": "web-files_2" "web-files": "web-files_2"
@@ -332,10 +372,25 @@
"type": "github" "type": "github"
} }
}, },
"systems_7": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"web-files": { "web-files": {
"inputs": { "inputs": {
"bergamot-elm": "bergamot-elm", "bergamot-elm": "bergamot-elm",
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_5",
"nixpkgs": [ "nixpkgs": [
"blog", "blog",
"nixpkgs" "nixpkgs"
@@ -358,7 +413,7 @@
"web-files_2": { "web-files_2": {
"inputs": { "inputs": {
"bergamot-elm": "bergamot-elm_2", "bergamot-elm": "bergamot-elm_2",
"flake-utils": "flake-utils_6", "flake-utils": "flake-utils_7",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]

View File

@@ -5,8 +5,10 @@
blog.inputs.nixpkgs.follows = "nixpkgs"; blog.inputs.nixpkgs.follows = "nixpkgs";
web-files.url = "git+https://dev.danilafe.com/Nix-Configs/web-files.git"; web-files.url = "git+https://dev.danilafe.com/Nix-Configs/web-files.git";
web-files.inputs.nixpkgs.follows = "nixpkgs"; web-files.inputs.nixpkgs.follows = "nixpkgs";
Scylla.url = "git+https://dev.danilafe.com/Matrix-Programs/Scylla.git";
Scylla.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = { self, nixpkgs, blog, web-files }: outputs = { self, nixpkgs, blog, web-files, Scylla }:
let let
system = "x86_64-linux"; system = "x86_64-linux";
in in
@@ -17,6 +19,7 @@
inherit system; inherit system;
blog = blog.lib."${system}"; blog = blog.lib."${system}";
web-files = web-files.defaultPackage."${system}"; web-files = web-files.defaultPackage."${system}";
Scylla = Scylla.defaultPackage."${system}";
}; };
modules = [ ./configuration.nix ]; modules = [ ./configuration.nix ];
}; };