summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nixos/tente-configuration.nix47
1 files changed, 23 insertions, 24 deletions
diff --git a/nixos/tente-configuration.nix b/nixos/tente-configuration.nix
index b7192ea..3c52332 100644
--- a/nixos/tente-configuration.nix
+++ b/nixos/tente-configuration.nix
@@ -76,45 +76,44 @@ in
];
networking.firewall.allowedUDPPorts = [];
- # List services that you want to enable:
-
- # Enable the OpenSSH daemon.
- services.openssh.enable = true;
-
users.groups.www-data = {};
systemd.tmpfiles.rules = [
"d /srv/www 2770 root www-data -"
];
- services.gitolite = {
- enable = true;
- adminPubkey = ""; # TODO: submit PR to nixpkgs to make this option optional
- user = "git";
- group = "git";
- dataDir = "/srv/gitolite";
- extraGitoliteRc = ''
- $RC{UMASK} = 0027;
- '';
- };
-
- security.acme = {
- acceptTerms = true; # https://letsencrypt.org/repository/
- defaults.email = acmeEmail;
- };
+ services = {
+ openssh.enable = true;
+
+ gitolite = {
+ enable = true;
+ adminPubkey = ""; # TODO: submit PR to nixpkgs to make this option optional
+ user = "git";
+ group = "git";
+ dataDir = "/srv/gitolite";
+ extraGitoliteRc = ''
+ $RC{UMASK} = 0027;
+ '';
+ };
- services.nginx = {
- enable = true;
- group = "www-data";
+ nginx = {
+ enable = true;
+ group = "www-data";
+ };
# My personal website
- virtualHosts."${domain}" = {
+ nginx.virtualHosts.${domain} = {
enableACME = true;
forceSSL = true;
root = "/srv/www/${domain}";
};
};
+ security.acme = {
+ acceptTerms = true; # https://letsencrypt.org/repository/
+ defaults.email = acmeEmail;
+ };
+
# Copy the NixOS configuration file and link it from the resulting system
# (/run/current-system/configuration.nix). This is useful in case you
# accidentally delete configuration.nix.