diff options
| -rwxr-xr-x | host/Rory-nginx/configuration.nix | 4 | ||||
| -rwxr-xr-x | host/Rory-nginx/hosts/rory.gay/git.nix | 7 | ||||
| -rwxr-xr-x | modules/base-server.nix | 11 | ||||
| -rwxr-xr-x | modules/base.nix | 12 |
4 files changed, 17 insertions, 17 deletions
diff --git a/host/Rory-nginx/configuration.nix b/host/Rory-nginx/configuration.nix index 34d9db1..1fbafd5 100755 --- a/host/Rory-nginx/configuration.nix +++ b/host/Rory-nginx/configuration.nix @@ -41,6 +41,7 @@ "vives.thearcanebrony.net" = import ./hosts/thearcanebrony.net/vives.nix; "*.bots.thearcanebrony.net" = import ./hosts/thearcanebrony.net/bots.nix; "lfs.rory.gay" = import ./hosts/rory.gay/lfs.nix; + "git.rory.gay" = import ./hosts/rory.gay/git.nix; "tunnel.rory.boo" = import ./hosts/rory.boo/tunnel.nix; "boorunav.com" = import ./hosts/boorunav.com/root.nix; "catgirlsaresexy.com" = import ./hosts/catgirlsaresexy.com/root.nix; @@ -48,6 +49,9 @@ }; }; }; + systemd.services.nginx.requires = [ "data.mount" ]; + security.acme.acceptTerms = true; + security.acme.defaults.email = "root@thearcanebrony.net"; sound.enable = false; hardware.pulseaudio.enable = false; diff --git a/host/Rory-nginx/hosts/rory.gay/git.nix b/host/Rory-nginx/hosts/rory.gay/git.nix new file mode 100755 index 0000000..56954e4 --- /dev/null +++ b/host/Rory-nginx/hosts/rory.gay/git.nix @@ -0,0 +1,7 @@ +{ + root = "/data/nginx/html_git"; + enableACME = true; + addSSL = true; + extraConfig = '' + autoindex on;''; +} diff --git a/modules/base-server.nix b/modules/base-server.nix index 492272b..f985b41 100755 --- a/modules/base-server.nix +++ b/modules/base-server.nix @@ -41,13 +41,6 @@ i18n.defaultLocale = "en_US.UTF-8"; services = { - openssh = { - enable = true; - #allow more logins in cases where i have many ssh keys on a system - extraConfig = '' - MaxAuthTries 32 - ''; - }; prometheus = { exporters = { node = { @@ -93,9 +86,5 @@ }; }; }; - security.sudo.wheelNeedsPassword = false; - nixpkgs.config.allowUnfree = true; - - system.stateVersion = "22.11"; # DO NOT EDIT! } diff --git a/modules/base.nix b/modules/base.nix index 089142f..72672e4 100755 --- a/modules/base.nix +++ b/modules/base.nix @@ -8,7 +8,7 @@ ]; networking = { - hostName = lib.mkDefault "Rory-nix-base"; + hostName = lib.mkDefault "Rory-nix-base"; firewall = { enable = false; # allowedTCPPorts = [ ... ]; @@ -29,9 +29,6 @@ }; }; - security.sudo.wheelNeedsPassword = false; - nixpkgs.config.allowUnfree = true; - sound.enable = lib.mkDefault true; hardware.pulseaudio.enable = lib.mkDefault true; @@ -47,7 +44,8 @@ #sshfs duf kitty.terminfo - vimPlugins.vim-nix + neovim +# vimPlugins.vim-nix ]; systemd.coredump.extraConfig = lib.mkDefault '' @@ -55,5 +53,7 @@ ''; nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nixpkgs.config.allowUnfree = true; + security.sudo.wheelNeedsPassword = false; system.stateVersion = "22.11"; # DO NOT EDIT! -} \ No newline at end of file +} |