v/infrastructure
1
0
Fork 0
Code Issues 13 Pull requests 1 Projects Releases Packages Activity Actions

hopefully fix mastodon

Browse source
This commit is contained in:
Vivian 2023-12-09 10:31:06 +01:00
parent 6255373ab2
commit 0fe2bdbcc5
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/common/hm-modules/rust.nix
View file

@ -5,7 +5,7 @@ in {
options.programs.v.rust = { enable = mkEnableOption "rust"; }; options.programs.v.rust = { enable = mkEnableOption "rust"; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
home = { home = {
packages = with pkgs; [ rustup cargo-nextest cargo-msrv ]; packages = with pkgs; [ rustup cargo-nextest cargo-msrv cargo-dist cargo-cross];
file = { file = {
".cargo/config.toml".text = '' ".cargo/config.toml".text = ''

1
nixos/common/users/vivian.nix
View file

@ -1,7 +1,6 @@
{ pkgs, ... }: { { pkgs, ... }: {
# The block that specifies my user account. # The block that specifies my user account.
users.extraUsers.vivian = { users.extraUsers.vivian = {
uid = 1000;
# This account is intended for a non-system user. # This account is intended for a non-system user.
isNormalUser = true; isNormalUser = true;

4
nixos/hosts/hades/nginx/configuration.nix
View file

@ -52,6 +52,10 @@ in
locations."= /.well-known/host-meta".extraConfig = '' locations."= /.well-known/host-meta".extraConfig = ''
return 301 https://fedi.xirion.net$request_uri; return 301 https://fedi.xirion.net$request_uri;
''; '';
locations."/.well-known/webfinger".extraConfig = ''
add_header Access-Control-Allow-Origin '*';
return 301 https://fedi.xirion.net$request_uri;
'';
}; };
# virtualHosts."blog.xirion.net" = proxy "http://10.10.10.12"; # virtualHosts."blog.xirion.net" = proxy "http://10.10.10.12";
"git.xirion.net" = proxy "http://10.10.10.12"; "git.xirion.net" = proxy "http://10.10.10.12";