aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--hosts/sagittarius/sops.nix28
-rw-r--r--hosts/sagittarius/web/acme.nix16
-rw-r--r--hosts/sagittarius/web/blog.nix2
-rw-r--r--hosts/sagittarius/web/default.nix8
-rw-r--r--hosts/sagittarius/web/git.nix52
-rw-r--r--hosts/sagittarius/web/navidrome.nix2
-rw-r--r--hosts/sagittarius/web/static.nix2
-rw-r--r--hosts/sagittarius/web/vaultwarden.nix2
8 files changed, 58 insertions, 54 deletions
diff --git a/hosts/sagittarius/sops.nix b/hosts/sagittarius/sops.nix
index 9050687..a58b4b2 100644
--- a/hosts/sagittarius/sops.nix
+++ b/hosts/sagittarius/sops.nix
@@ -9,25 +9,25 @@
# sopsFile = ../../secrets/forgejo-runner-token.env;
# format = "dotenv";
# };
- # "porkbun-acme-conf" = {
- # sopsFile = ../../secrets/porkbun.env;
- # format = "dotenv";
- # };
+ "porkbun-acme-conf" = {
+ sopsFile = ../../secrets/porkbun.env;
+ format = "dotenv";
+ };
# "priv-blog-auth-file" = {
# sopsFile = ../../secrets/priv.sorre.xyz.htpasswd.txt;
# owner = "nginx";
# format = "binary";
# };
- # "wg-ca-key" = {
- # sopsFile = ../../secrets/ca/certs/sagittarius.sorre.internal.key;
- # owner = "nginx";
- # format = "binary";
- # };
- # "wg-ca-crt" = {
- # sopsFile = ../../secrets/ca/certs/sagittarius.sorre.internal.crt;
- # owner = "nginx";
- # format = "binary";
- # };
+ "wg-ca-key" = {
+ sopsFile = ../../secrets/ca/certs/sagittarius.sorre.internal.key;
+ owner = "nginx";
+ format = "binary";
+ };
+ "wg-ca-crt" = {
+ sopsFile = ../../secrets/ca/certs/sagittarius.sorre.internal.crt;
+ owner = "nginx";
+ format = "binary";
+ };
};
};
}
diff --git a/hosts/sagittarius/web/acme.nix b/hosts/sagittarius/web/acme.nix
index aa7d24a..85c0c75 100644
--- a/hosts/sagittarius/web/acme.nix
+++ b/hosts/sagittarius/web/acme.nix
@@ -1,11 +1,11 @@
{ config, ... }:
{
- # security.acme = {
- # acceptTerms = true;
- # defaults = {
- # email = "isabella@sorre.xyz";
- # dnsProvider = "porkbun";
- # environmentFile = config.sops.secrets."porkbun-acme-conf".path;
- # };
- # };
+ security.acme = {
+ acceptTerms = true;
+ defaults = {
+ email = "isabella@sorre.xyz";
+ dnsProvider = "porkbun";
+ environmentFile = config.sops.secrets."porkbun-acme-conf".path;
+ };
+ };
}
diff --git a/hosts/sagittarius/web/blog.nix b/hosts/sagittarius/web/blog.nix
index 5580450..1788d15 100644
--- a/hosts/sagittarius/web/blog.nix
+++ b/hosts/sagittarius/web/blog.nix
@@ -8,7 +8,7 @@
imports = [ ./acme.nix ];
services.nginx = {
- enable = false;
+ # enable = false;
virtualHosts."sorre.xyz" = {
enableACME = true;
diff --git a/hosts/sagittarius/web/default.nix b/hosts/sagittarius/web/default.nix
index 2424eaf..1cfc7aa 100644
--- a/hosts/sagittarius/web/default.nix
+++ b/hosts/sagittarius/web/default.nix
@@ -1,11 +1,11 @@
{ ... }:
{
imports = [
- ./blog.nix
- ./mediadb.nix
+ # ./blog.nix
+ # ./mediadb.nix
./git.nix
- ./static.nix
- ./navidrome.nix
+ # ./static.nix
+ # ./navidrome.nix
./vaultwarden.nix
];
}
diff --git a/hosts/sagittarius/web/git.nix b/hosts/sagittarius/web/git.nix
index 205d661..8e7b772 100644
--- a/hosts/sagittarius/web/git.nix
+++ b/hosts/sagittarius/web/git.nix
@@ -1,6 +1,6 @@
{ config, ... }:
let
- secrets = config.sops.secrets;
+ # secrets = config.sops.secrets;
domainInternal = "git.sorre.internal";
domainPublic = "git.sorre.xyz";
@@ -9,20 +9,22 @@ let
};
in
{
+ imports = [ ./acme.nix ];
+
services.nginx = {
- enable = false;
- virtualHosts."${domainInternal}" = {
- forceSSL = true;
- sslCertificateKey = secrets."wg-ca-key".path;
- sslCertificate = secrets."wg-ca-crt".path;
- listen = [
- {
- addr = "100.64.0.3";
- port = 443;
- ssl = true;
- }
- ];
- };
+ enable = true;
+ # virtualHosts."${domainInternal}" = {
+ # forceSSL = true;
+ # sslCertificateKey = secrets."wg-ca-key".path;
+ # sslCertificate = secrets."wg-ca-crt".path;
+ # listen = [
+ # {
+ # addr = "100.64.0.3";
+ # port = 443;
+ # ssl = true;
+ # }
+ # ];
+ # };
virtualHosts."${domainPublic}" = {
enableACME = true;
@@ -30,24 +32,26 @@ in
};
};
- services.cgit.internal = {
- enable = false;
- user = "cgit-internal";
- group = "cgit";
- nginx.virtualHost = domainInternal;
- gitHttpBackend.checkExportOkFiles = false;
- scanPath = "/var/lib/git/repos/isabella";
- settings = commonSettings;
- };
+ # services.cgit.internal = {
+ # enable = false;
+ # user = "cgit-internal";
+ # group = "cgit";
+ # nginx.virtualHost = domainInternal;
+ # gitHttpBackend.checkExportOkFiles = false;
+ # scanPath = "/var/lib/git/repos/isabella";
+ # settings = commonSettings;
+ # };
services.cgit.public = {
- enable = false;
+ enable = true;
user = "cgit-public";
group = "cgit";
nginx.virtualHost = domainPublic;
gitHttpBackend.checkExportOkFiles = false;
repos = {
futils.path = "/var/lib/git/repos/isabella/futils";
+ sorre-website.path = "/var/lib/git/repos/isabella/sorre-website";
+ xpkgs.path = "/var/lib/git/repos/isabella/xpkgs";
nixos-config.path = "/var/lib/git/repos/isabella/nixos-config";
};
settings = commonSettings;
diff --git a/hosts/sagittarius/web/navidrome.nix b/hosts/sagittarius/web/navidrome.nix
index 0878a66..6992b28 100644
--- a/hosts/sagittarius/web/navidrome.nix
+++ b/hosts/sagittarius/web/navidrome.nix
@@ -18,7 +18,7 @@ in
};
services.nginx = {
- enable = false;
+ # enable = false;
virtualHosts."navidrome" = {
serverName = domain;
diff --git a/hosts/sagittarius/web/static.nix b/hosts/sagittarius/web/static.nix
index 6947a70..617cac9 100644
--- a/hosts/sagittarius/web/static.nix
+++ b/hosts/sagittarius/web/static.nix
@@ -3,7 +3,7 @@
imports = [ ./acme.nix ];
services.nginx = {
- enable = false;
+ # enable = false;
virtualHosts."static.sorre.xyz" = {
enableACME = true;
diff --git a/hosts/sagittarius/web/vaultwarden.nix b/hosts/sagittarius/web/vaultwarden.nix
index 15c4d47..526c7bc 100644
--- a/hosts/sagittarius/web/vaultwarden.nix
+++ b/hosts/sagittarius/web/vaultwarden.nix
@@ -6,7 +6,7 @@ let
in
{
services.vaultwarden = {
- enable = false;
+ # enable = false;
configureNginx = false;
dbBackend = "sqlite";
inherit domain;
generated by cgit v1.3.1 (git 2.54.0) at 2026-10-27 09:27:30 +0000