forked from fediversity/fediversity
		
	Compare commits
	
		
			2 commits
		
	
	
		
			7646147f9e
			...
			d50d908d5d
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| d50d908d5d | |||
| e92e927f07 | 
					 4 changed files with 3 additions and 40 deletions
				
			
		| 
						 | 
					@ -12,7 +12,7 @@ on:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
jobs:
 | 
					jobs:
 | 
				
			||||||
  _checks:
 | 
					  _checks:
 | 
				
			||||||
    needs: ["deployment-basic","deployment-cli","deployment-model-nixops4","deployment-model-ssh","deployment-model-tf","deployment-model-tf-proxmox","deployment-panel","nixops-deployment-providers-default","nixops-deployment-providers-fedi200","nixops-deployment-providers-fedi201","nixops-deployment-providers-forgejo-ci","nixops-deployment-providers-test","nixops-deployment-providers-vm02116","nixops-deployment-providers-vm02187","nixosConfigurations-fedi200","nixosConfigurations-fedi201","nixosConfigurations-forgejo-ci","nixosConfigurations-test01","nixosConfigurations-test02","nixosConfigurations-test03","nixosConfigurations-test04","nixosConfigurations-test05","nixosConfigurations-test06","nixosConfigurations-test11","nixosConfigurations-test12","nixosConfigurations-test13","nixosConfigurations-test14","nixosConfigurations-vm02116","nixosConfigurations-vm02187","panel","pre-commit","proxmox-basic","test-mastodon-service","test-peertube-service","vmOptions-fedi200","vmOptions-fedi201","vmOptions-test01","vmOptions-test02","vmOptions-test03","vmOptions-test04","vmOptions-test05","vmOptions-test06","vmOptions-test11","vmOptions-test12","vmOptions-test13","vmOptions-test14"]
 | 
					    needs: ["deployment-basic","deployment-cli","deployment-model-nixops4","deployment-model-ssh","deployment-model-tf","deployment-model-tf-proxmox","deployment-panel","nixops-deployment-providers-default","nixops-deployment-providers-fedi201","nixops-deployment-providers-forgejo-ci","nixops-deployment-providers-test","nixops-deployment-providers-vm02116","nixops-deployment-providers-vm02187","nixosConfigurations-fedi201","nixosConfigurations-forgejo-ci","nixosConfigurations-test01","nixosConfigurations-test02","nixosConfigurations-test03","nixosConfigurations-test04","nixosConfigurations-test05","nixosConfigurations-test06","nixosConfigurations-test11","nixosConfigurations-test12","nixosConfigurations-test13","nixosConfigurations-test14","nixosConfigurations-vm02116","nixosConfigurations-vm02187","panel","pre-commit","proxmox-basic","test-mastodon-service","test-peertube-service","vmOptions-fedi201","vmOptions-test01","vmOptions-test02","vmOptions-test03","vmOptions-test04","vmOptions-test05","vmOptions-test06","vmOptions-test11","vmOptions-test12","vmOptions-test13","vmOptions-test14"]
 | 
				
			||||||
    runs-on: native
 | 
					    runs-on: native
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
      - run: true
 | 
					      - run: true
 | 
				
			||||||
| 
						 | 
					@ -71,12 +71,6 @@ jobs:
 | 
				
			||||||
      - uses: actions/checkout@v4
 | 
					      - uses: actions/checkout@v4
 | 
				
			||||||
      - run: nix build .#checks.x86_64-linux.nixops-deployment-providers-default -vL
 | 
					      - run: nix build .#checks.x86_64-linux.nixops-deployment-providers-default -vL
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  nixops-deployment-providers-fedi200:
 | 
					 | 
				
			||||||
    runs-on: native
 | 
					 | 
				
			||||||
    steps:
 | 
					 | 
				
			||||||
      - uses: actions/checkout@v4
 | 
					 | 
				
			||||||
      - run: nix build .#checks.x86_64-linux.nixops-deployment-providers-fedi200 -vL
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  nixops-deployment-providers-fedi201:
 | 
					  nixops-deployment-providers-fedi201:
 | 
				
			||||||
    runs-on: native
 | 
					    runs-on: native
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
| 
						 | 
					@ -107,12 +101,6 @@ jobs:
 | 
				
			||||||
      - uses: actions/checkout@v4
 | 
					      - uses: actions/checkout@v4
 | 
				
			||||||
      - run: nix build .#checks.x86_64-linux.nixops-deployment-providers-vm02187 -vL
 | 
					      - run: nix build .#checks.x86_64-linux.nixops-deployment-providers-vm02187 -vL
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  nixosConfigurations-fedi200:
 | 
					 | 
				
			||||||
    runs-on: native
 | 
					 | 
				
			||||||
    steps:
 | 
					 | 
				
			||||||
      - uses: actions/checkout@v4
 | 
					 | 
				
			||||||
      - run: nix build .#checks.x86_64-linux.nixosConfigurations-fedi200 -vL
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  nixosConfigurations-fedi201:
 | 
					  nixosConfigurations-fedi201:
 | 
				
			||||||
    runs-on: native
 | 
					    runs-on: native
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
| 
						 | 
					@ -227,12 +215,6 @@ jobs:
 | 
				
			||||||
      - uses: actions/checkout@v4
 | 
					      - uses: actions/checkout@v4
 | 
				
			||||||
      - run: nix build .#checks.x86_64-linux.test-peertube-service -vL
 | 
					      - run: nix build .#checks.x86_64-linux.test-peertube-service -vL
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  vmOptions-fedi200:
 | 
					 | 
				
			||||||
    runs-on: native
 | 
					 | 
				
			||||||
    steps:
 | 
					 | 
				
			||||||
      - uses: actions/checkout@v4
 | 
					 | 
				
			||||||
      - run: nix build .#checks.x86_64-linux.vmOptions-fedi200 -vL
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  vmOptions-fedi201:
 | 
					  vmOptions-fedi201:
 | 
				
			||||||
    runs-on: native
 | 
					    runs-on: native
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,20 +0,0 @@
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
  _class = "nixops4Resource";
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  fediversityVm = {
 | 
					 | 
				
			||||||
    name = "fedi200";
 | 
					 | 
				
			||||||
    isFediversityVm = true;
 | 
					 | 
				
			||||||
    vmId = 200;
 | 
					 | 
				
			||||||
    description = "Testing machine for Hans";
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    domain = "abundos.eu";
 | 
					 | 
				
			||||||
    ipv4 = {
 | 
					 | 
				
			||||||
      address = "95.215.187.200";
 | 
					 | 
				
			||||||
      gateway = "95.215.187.1";
 | 
					 | 
				
			||||||
    };
 | 
					 | 
				
			||||||
    ipv6 = {
 | 
					 | 
				
			||||||
      address = "2a00:51c0:13:1305::200";
 | 
					 | 
				
			||||||
      gateway = "2a00:51c0:13:1305::1";
 | 
					 | 
				
			||||||
    };
 | 
					 | 
				
			||||||
  };
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
| 
						 | 
					@ -25,6 +25,8 @@ in
 | 
				
			||||||
        HTTP_ADDR = "127.0.0.1";
 | 
					        HTTP_ADDR = "127.0.0.1";
 | 
				
			||||||
        LANDING_PAGE = "explore";
 | 
					        LANDING_PAGE = "explore";
 | 
				
			||||||
      };
 | 
					      };
 | 
				
			||||||
 | 
					      # try a non-`level` queue as a temporary work-around to https://git.fediversity.eu/fediversity/fediversity/issues/459
 | 
				
			||||||
 | 
					      queue.TYPE = "channel";
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    settings.service.ENABLE_NOTIFY_MAIL = true;
 | 
					    settings.service.ENABLE_NOTIFY_MAIL = true;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -7,7 +7,6 @@ Currently, this repository keeps track of the following VMs:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Machine | Proxmox | Description
 | 
					Machine | Proxmox | Description
 | 
				
			||||||
--------|---------|-------------
 | 
					--------|---------|-------------
 | 
				
			||||||
[`fedi200`](./dev/fedi200) | fediversity | Testing machine for Hans
 | 
					 | 
				
			||||||
[`fedi201`](./dev/fedi201) | fediversity | FediPanel
 | 
					[`fedi201`](./dev/fedi201) | fediversity | FediPanel
 | 
				
			||||||
[`vm02116`](./dev/vm02116) | procolix | Forgejo
 | 
					[`vm02116`](./dev/vm02116) | procolix | Forgejo
 | 
				
			||||||
[`vm02187`](./dev/vm02187) | procolix | Wiki
 | 
					[`vm02187`](./dev/vm02187) | procolix | Wiki
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue