fixed https://github.com/NixOS/nixpkgs/issues/398172 in nixpkgs fork.
just waiting for https://github.com/NixOS/nixpkgs/pull/398536 to get reviewed and merged.
This commit is contained in:
		
							parent
							
								
									357f6ae2f6
								
							
						
					
					
						commit
						90fe4a9ad0
					
				
					 4 changed files with 9 additions and 9 deletions
				
			
		
							
								
								
									
										12
									
								
								flake.lock
									
										
									
										generated
									
									
									
								
							
							
						
						
									
										12
									
								
								flake.lock
									
										
									
										generated
									
									
									
								
							| 
						 | 
				
			
			@ -225,16 +225,16 @@
 | 
			
		|||
    },
 | 
			
		||||
    "nixpkgs": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1743095683,
 | 
			
		||||
        "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=",
 | 
			
		||||
        "owner": "nixos",
 | 
			
		||||
        "lastModified": 1744623728,
 | 
			
		||||
        "narHash": "sha256-4yNH4c7zkUi3nuYHsmRRXXAcDLkT/fP5eQPoLhqMWwA=",
 | 
			
		||||
        "owner": "gabevenberg",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6",
 | 
			
		||||
        "rev": "b87080e2ab4478d9fb9b89114a9bea3e62ddd98f",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
        "owner": "nixos",
 | 
			
		||||
        "ref": "nixos-unstable",
 | 
			
		||||
        "owner": "gabevenberg",
 | 
			
		||||
        "ref": "restic-server-htpasswd-file",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -3,7 +3,7 @@
 | 
			
		|||
 | 
			
		||||
  inputs = {
 | 
			
		||||
    # Nixpkgs
 | 
			
		||||
    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 | 
			
		||||
    nixpkgs.url = "github:gabevenberg/nixpkgs/restic-server-htpasswd-file";
 | 
			
		||||
 | 
			
		||||
    nixos-wsl = {
 | 
			
		||||
      url = "github:nix-community/NixOS-WSL/main";
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -12,7 +12,7 @@ in {
 | 
			
		|||
      sopsFile = "${inputs.nix-secrets}/restic-server";
 | 
			
		||||
      format = "binary";
 | 
			
		||||
      # TODO: fix https://github.com/NixOS/nixpkgs/issues/398172 to remove this.
 | 
			
		||||
      path = "/backup/restic/.htpasswd";
 | 
			
		||||
      # path = "/backup/restic/.htpasswd";
 | 
			
		||||
      owner = "restic";
 | 
			
		||||
    };
 | 
			
		||||
    secrets.restic-url = {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -92,7 +92,7 @@
 | 
			
		|||
      dataDir = cfg.server.repositoryPath;
 | 
			
		||||
      listenAddress = "127.0.0.1:${cfg.server.port}";
 | 
			
		||||
      # TODO: fix https://github.com/NixOS/nixpkgs/issues/398172 to enable this.
 | 
			
		||||
      # extraFlags = ["--htpasswd-file='${cfg.server.htpasswdPath}'"];
 | 
			
		||||
      htpasswd-file = cfg.server.htpasswdPath;
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    services.nginx.virtualHosts =
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue