forked from fediversity/fediversity
		
	for now, we have to stop using vmVariant so the test works
This commit is contained in:
		
							parent
							
								
									dab12bc2b8
								
							
						
					
					
						commit
						0f8972a8f0
					
				
					 2 changed files with 16 additions and 16 deletions
				
			
		| 
						 | 
				
			
			@ -84,4 +84,6 @@ When mastodon is running in production mode, we have a few problems:
 | 
			
		|||
- mastodon is trying to fetch `missing.png` without ssl (`http://`). This isn't allowed, and i'm not sure why it's doing it.
 | 
			
		||||
- mastodon is trying to fetch `custom.css` from https://mastodon.localhost (no port), which is not the configured `LOCAL_DOMAIN`, so it's unclear why.
 | 
			
		||||
 | 
			
		||||
NixOS tests do not take the configuration from `virtualisation.vmVariant`. This seems like an oversight since people don't tend to mix normal NixOS configurations with the ones they're using for tests. This should be pretty easy to rectify upstream.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										30
									
								
								garage.nix
									
										
									
									
									
								
							
							
						
						
									
										30
									
								
								garage.nix
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -125,23 +125,21 @@ in {
 | 
			
		|||
  };
 | 
			
		||||
 | 
			
		||||
  config = {
 | 
			
		||||
    virtualisation.vmVariant = { config, ... }: {
 | 
			
		||||
      virtualisation.diskSize = 2048;
 | 
			
		||||
      virtualisation.forwardPorts = [
 | 
			
		||||
        {
 | 
			
		||||
          from = "host";
 | 
			
		||||
          host.port = 3901;
 | 
			
		||||
          guest.port = 3901;
 | 
			
		||||
        }
 | 
			
		||||
        {
 | 
			
		||||
          from = "host";
 | 
			
		||||
          host.port = 3902;
 | 
			
		||||
          guest.port = 3902;
 | 
			
		||||
        }
 | 
			
		||||
      ];
 | 
			
		||||
    virtualisation.diskSize = 2048;
 | 
			
		||||
    virtualisation.forwardPorts = [
 | 
			
		||||
      {
 | 
			
		||||
        from = "host";
 | 
			
		||||
        host.port = 3901;
 | 
			
		||||
        guest.port = 3901;
 | 
			
		||||
      }
 | 
			
		||||
      {
 | 
			
		||||
        from = "host";
 | 
			
		||||
        host.port = 3902;
 | 
			
		||||
        guest.port = 3902;
 | 
			
		||||
      }
 | 
			
		||||
    ];
 | 
			
		||||
 | 
			
		||||
      environment.systemPackages = [ pkgs.minio-client pkgs.awscli ];
 | 
			
		||||
    };
 | 
			
		||||
    environment.systemPackages = [ pkgs.minio-client pkgs.awscli ];
 | 
			
		||||
 | 
			
		||||
    networking.firewall.allowedTCPPorts = [ 3901 3902 ];
 | 
			
		||||
    services.garage = {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue