diff --git a/hosts/www/nginx.nix b/hosts/www/nginx.nix index c84f18c..a7df103 100644 --- a/hosts/www/nginx.nix +++ b/hosts/www/nginx.nix @@ -77,9 +77,6 @@ in autoindex on; ''; }; - "/all.ics" = { - return = "301 https://www.berlin.ccc.de/calendars/all.ics"; - }; "~ ^/calendars/([^/]+\.ics)$" = { alias = "/srv/http/calendars/$1"; extraConfig = '' diff --git a/hosts/www/openssh.nix b/hosts/www/openssh.nix index cdf2abb..288b5d3 100644 --- a/hosts/www/openssh.nix +++ b/hosts/www/openssh.nix @@ -8,8 +8,8 @@ isSystemUser = true; group = "deploy"; openssh.authorizedKeys.keys = [ - "command=\"${pkgs.rsync}/bin/rsync --server -vlogDtpre.iLsfxCIvu --delete-after . /srv/http/www/\",restrict ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM35LG+xuDaoHQ2bYD4eRc3P6Cl3JVYntoP5Gu9R+mZC deploy@www.berlin.ccc.de production" - "command=\"${pkgs.rsync}/bin/rsync --server -vlogDtpre.iLsfxCIvu --delete-after . /srv/http/www-staging/\",restrict ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKjjLtnGf7w5D/ON+P2HpMZ5HA2fWp5YSQMGMuu5CjUt deploy@www.berlin.ccc.de staging" + "command=\"${pkgs.rsync}/bin/rsync --server -vlogDtpre.iLsfxCIvu . /srv/http/www/\",restrict ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM35LG+xuDaoHQ2bYD4eRc3P6Cl3JVYntoP5Gu9R+mZC deploy@www.berlin.ccc.de production" + "command=\"${pkgs.rsync}/bin/rsync --server -vlogDtpre.iLsfxCIvu . /srv/http/www-staging/\",restrict ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKjjLtnGf7w5D/ON+P2HpMZ5HA2fWp5YSQMGMuu5CjUt deploy@www.berlin.ccc.de staging" ]; }; groups.deploy = { };