From 206980aa9815ba81250bef36eac626aa4d651e61 Mon Sep 17 00:00:00 2001 From: rndusr Date: Fri, 29 Mar 2024 15:54:34 -0500 Subject: [PATCH] remove roundcube --- boxes/netbox/default.nix | 38 +++++++++++++++++++----------- flake.lock | 51 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 14 deletions(-) diff --git a/boxes/netbox/default.nix b/boxes/netbox/default.nix index 8bdee39..0cafbc4 100644 --- a/boxes/netbox/default.nix +++ b/boxes/netbox/default.nix @@ -187,12 +187,22 @@ forceSSL = true; enableACME = true; root = "/var/www/beepboop.systems"; + locations."/" = { + extraConfig = '' + if ($request_uri ~ ^/(.*)\.html(\?|$)) { + return 302 /$1; + } + try_files $uri $uri.html $uri/ =404; + ''; + }; }; services.nginx.virtualHosts."git.beepboop.systems" = { forceSSL = true; enableACME = true; - locations."/".proxyPass = "http://localhost:3001"; + locations."/" = { + proxyPass = "http://localhost:3001"; + }; }; services.nginx.virtualHosts."bit.beepboop.systems" = { @@ -245,19 +255,19 @@ email = "nickforanick@protonmail.com"; }; - services.roundcube = { - enable = true; - # this is the url of the vhost, not necessarily the same as the fqdn of - # the mailserver - hostName = "cube.beepboop.systems"; - extraConfig = '' - # starttls needed for authentication, so the fqdn required to match - # the certificate - $config['smtp_server'] = "tls://${config.mailserver.fqdn}"; - $config['smtp_user'] = "%u"; - $config['smtp_pass'] = "%p"; - ''; - }; +# services.roundcube = { +# enable = true; +# # this is the url of the vhost, not necessarily the same as the fqdn of +# # the mailserver +# hostName = "cube.beepboop.systems"; +# extraConfig = '' +# # starttls needed for authentication, so the fqdn required to match +# # the certificate +# $config['smtp_server'] = "tls://${config.mailserver.fqdn}"; +# $config['smtp_user'] = "%u"; +# $config['smtp_pass'] = "%p"; +# ''; +# }; services.nginx.virtualHosts."roundcube.beepboop.systems" = { forceSSL = true; diff --git a/flake.lock b/flake.lock index 02f83f7..dbcef2d 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "base16-schemes": { + "flake": false, + "locked": { + "lastModified": 1696158499, + "narHash": "sha256-5yIHgDTPjoX/3oDEfLSQ0eJZdFL1SaCfb9d6M0RmOTM=", + "owner": "tinted-theming", + "repo": "base16-schemes", + "rev": "a9112eaae86d9dd8ee6bb9445b664fba2f94037a", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-schemes", + "type": "github" + } + }, "blobs": { "flake": false, "locked": { @@ -112,6 +128,25 @@ "type": "github" } }, + "nix-colors": { + "inputs": { + "base16-schemes": "base16-schemes", + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1707825078, + "narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=", + "owner": "misterio77", + "repo": "nix-colors", + "rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1", + "type": "github" + }, + "original": { + "owner": "misterio77", + "repo": "nix-colors", + "type": "github" + } + }, "nix-formatter-pack": { "inputs": { "nixpkgs": [ @@ -224,6 +259,21 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1697935651, + "narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "e1e11fdbb01113d85c7f41cada9d2847660e3902", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1705856552, @@ -308,6 +358,7 @@ "firefox-addons": "firefox-addons", "home-manager": "home-manager", "home-manager-phone": "home-manager-phone", + "nix-colors": "nix-colors", "nix-on-droid": "nix-on-droid", "nixpkgs": "nixpkgs", "phone-nixpkgs": "phone-nixpkgs",