diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index 846a4f5..0000000 --- a/AUTHORS +++ /dev/null @@ -1 +0,0 @@ -Scott "R00tPiG Security" Lindsey (rootpig) — owner diff --git a/OWNER.md b/OWNER.md deleted file mode 100644 index e7f075e..0000000 --- a/OWNER.md +++ /dev/null @@ -1,10 +0,0 @@ -# Repository owner - -**Owner / credited author:** Scott "R00tPiG Security" Lindsey (`rootpig`) - -Forgejo: https://git.georgelambert.org/rootpig - -This repository is owned by **rootpig** for Verae Inc. server maintenance, -deployment scripting, and related operations work. - -Co-contributors may appear in git history; ownership and ops credit belong to rootpig. diff --git a/README.md b/README.md index 3c76421..eeddc0e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # verae-fleet -[![standard-readme compliant](https://img.shields.io/badge/readme%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/RichardLitt/standard-readme) - Operator control plane for Verae Time × Zapier **runtime** services: - a **list** of every service and its config file @@ -48,25 +46,3 @@ NS1 overlay (no rewrite of git JSON): `FLEET_FILE=overlays/ns1/fleet.json` `FLEE Install on Docker / Proxmox / metal: https://zapier.georgelambert.org/packages/verae-ops/README.pdf Clone: `ssh://git@git.georgelambert.org:2223/marchon/verae-fleet.git` - -## Install - -```sh -git clone ssh://git@git.georgelambert.org:2223/marchon/verae-fleet.git -cd verae-fleet -``` - -## Usage - -```sh -npm install -npm start -``` - -## Contributing - -Questions: open an issue at https://git.georgelambert.org/marchon/verae-fleet/issues. Pull requests are accepted. - -## License - -UNLICENSED © George Lambert diff --git a/SERVICES.md b/SERVICES.md index 3210a41..b2f9215 100644 --- a/SERVICES.md +++ b/SERVICES.md @@ -6,7 +6,7 @@ Per-service files: [`services/`](services/). | Service | Config | min | max | keepFloor | Spawned by fleet | |---------|--------|-----|-----|-----------|------------------| | nats | `services/nats.json` | 1 | 1 | no | no (external monitor) | -| verae-edge-billing | `services/verae-edge-billing.json` | 1 | 1 | yes | yes | +| zappier-edge | `services/zappier-edge.json` | 1 | 1 | yes | yes | | middleware-http | `services/middleware-http.json` | 1 | 1 | yes | yes | | job-poller | `services/job-poller.json` | 1 | 2 | yes | yes | | webhook-deliver | `services/webhook-deliver.json` | 1 | 2 | yes | yes | diff --git a/fleet.json b/fleet.json index c4eba3a..eff7bda 100644 --- a/fleet.json +++ b/fleet.json @@ -14,7 +14,7 @@ }, "services": { "nats": { "min": 1, "max": 1, "keepFloor": false, "enabled": true, "managed": false }, - "verae-edge-billing": { "min": 1, "max": 1, "keepFloor": true, "enabled": true }, + "zappier-edge": { "min": 1, "max": 1, "keepFloor": true, "enabled": true }, "access-authz": { "min": 1, "max": 1, "keepFloor": true, "enabled": true }, "access-web": { "min": 1, "max": 1, "keepFloor": true, "enabled": true }, "access-api": { "min": 1, "max": 1, "keepFloor": true, "enabled": true }, diff --git a/overlays/ns1/fleet.json b/overlays/ns1/fleet.json index 5c0f311..3018a2d 100644 --- a/overlays/ns1/fleet.json +++ b/overlays/ns1/fleet.json @@ -14,7 +14,7 @@ }, "services": { "nats": { "min": 1, "max": 1, "keepFloor": false, "enabled": true, "managed": false }, - "verae-edge-billing": { "min": 1, "max": 1, "keepFloor": true, "enabled": true }, + "zappier-edge": { "min": 1, "max": 1, "keepFloor": true, "enabled": true }, "access-authz": { "min": 1, "max": 1, "keepFloor": true, "enabled": true }, "access-web": { "min": 1, "max": 1, "keepFloor": true, "enabled": true }, "access-api": { "min": 1, "max": 1, "keepFloor": true, "enabled": true }, diff --git a/services/accounting-export.json b/services/accounting-export.json index 6a77165..af1a15e 100644 --- a/services/accounting-export.json +++ b/services/accounting-export.json @@ -5,7 +5,7 @@ "package": "zappier-accounting-export", "role": "accounting-export", "managed": true, - "runtime": "HTTP :3013 IIF/CSV → verae-edge-billing invoices", + "runtime": "HTTP :3013 IIF/CSV → zappier-edge invoices", "health": { "type": "http", "path": "/health", "timeoutMs": 2000 }, "ports": { "healthBase": 3013 }, "spawn": { diff --git a/services/unmanaged.json b/services/unmanaged.json index ba0f3d1..df7e1bf 100644 --- a/services/unmanaged.json +++ b/services/unmanaged.json @@ -6,7 +6,7 @@ "id": "zapier-platform-app", "package": "verae-zapier", "runtime": "Zapier cloud", - "notes": "HTTPS only to verae-edge-billing. Never NATS." + "notes": "HTTPS only to zappier-edge. Never NATS." }, { "id": "verae-activate", diff --git a/services/verae-edge-billing.json b/services/zappier-edge.json similarity index 95% rename from services/verae-edge-billing.json rename to services/zappier-edge.json index 395e281..2cd1a8b 100644 --- a/services/verae-edge-billing.json +++ b/services/zappier-edge.json @@ -1,9 +1,9 @@ { - "id": "verae-edge-billing", + "id": "zappier-edge", "title": "Zappier commercial HTTPS edge", "kind": "http", "package": "zappier", - "role": "verae-edge-billing", + "role": "zappier-edge", "managed": true, "runtime": "loopback :3000 (portal, admin, Stripe; public doors are access-*)", "health": { "type": "http", "path": "/health", "timeoutMs": 4000 }, diff --git a/src/supervisor.js b/src/supervisor.js index 1f8dcd3..deae142 100644 --- a/src/supervisor.js +++ b/src/supervisor.js @@ -17,7 +17,7 @@ import { sshSpawnWorker, sshKillWorker, sshHttp, sshCheck, sshWriteIntent } from const WORKER = path.join(path.dirname(fileURLToPath(import.meta.url)), 'worker.js'); /** - * Real HTTP apps (verae-edge-billing, middleware) set `spawn` in services/*.json. + * Real HTTP apps (zappier-edge, middleware) set `spawn` in services/*.json. * Everything else is the fleet health worker. */ export function spawnLocal(root, spec, env, healthPort) { diff --git a/test/fleet.test.js b/test/fleet.test.js index 15dc625..aa717eb 100644 --- a/test/fleet.test.js +++ b/test/fleet.test.js @@ -52,7 +52,7 @@ describe('verae-fleet', () => { const ids = rows.map((r) => r.id); for (const need of [ 'nats', - 'verae-edge-billing', + 'zappier-edge', 'access-authz', 'access-web', 'access-api', diff --git a/test/rtt.test.js b/test/rtt.test.js index 8937b17..def37cf 100644 --- a/test/rtt.test.js +++ b/test/rtt.test.js @@ -33,7 +33,7 @@ describe('machine placement', () => { it('skips machines that do not allow the role', () => { const machines = [ - { id: 'edge', enabled: true, capacity: 8, roles: ['verae-edge-billing'] }, + { id: 'edge', enabled: true, capacity: 8, roles: ['zappier-edge'] }, { id: 'trees', enabled: true, capacity: 8, roles: ['tree-node'] }, ]; const pick = pickMachine(machines, [], 'tree-node', 'tree-node');