From 5fae3d565a859cbf6cc2eaebd5d6c5e89eed7b55 Mon Sep 17 00:00:00 2001 From: ditatompel Date: Thu, 30 May 2024 12:02:11 +0700 Subject: [PATCH] chore: Rename `tools` directory to `deployment` The `tools` directory contains example ansible playbook, systemd example, and Nginx configuration example for the server. The directory name `deployment` for that stuffs much more suitable. --- Makefile | 13 +++++++++---- README.md | 6 +++--- .../ansible/deploy-prober.example.yml | 0 .../ansible/deploy-server.example.yml | 0 {tools => deployment}/ansible/inventory.example.ini | 0 .../init/xmr-nodes-prober.service | 0 .../init/xmr-nodes-prober.timer | 0 .../init/xmr-nodes-server.service | 0 {tools/resources => deployment}/nginx/vhost.conf | 0 9 files changed, 12 insertions(+), 7 deletions(-) rename {tools => deployment}/ansible/deploy-prober.example.yml (100%) rename {tools => deployment}/ansible/deploy-server.example.yml (100%) rename {tools => deployment}/ansible/inventory.example.ini (100%) rename {tools/resources => deployment}/init/xmr-nodes-prober.service (100%) rename {tools/resources => deployment}/init/xmr-nodes-prober.timer (100%) rename {tools/resources => deployment}/init/xmr-nodes-server.service (100%) rename {tools/resources => deployment}/nginx/vhost.conf (100%) diff --git a/Makefile b/Makefile index 235b288..b1600d8 100644 --- a/Makefile +++ b/Makefile @@ -1,20 +1,23 @@ -.PHONY: deploy-prober deploy-server ui client server build - BINARY_NAME = xmr-nodes +.PHONY: build build: client server +.PHONY: ui ui: go generate ./... +.PHONY: client client: CGO_ENABLED=0 GOARCH=amd64 GOOS=linux go build -ldflags="-s -w" -o bin/${BINARY_NAME}-client-linux-amd64 CGO_ENABLED=0 GOARCH=arm64 GOOS=linux go build -ldflags="-s -w" -o bin/${BINARY_NAME}-client-linux-arm64 +.PHONY: server server: ui CGO_ENABLED=0 GOARCH=amd64 GOOS=linux go build -ldflags="-s -w" -tags server -o bin/${BINARY_NAME}-server-linux-amd64 CGO_ENABLED=0 GOARCH=arm64 GOOS=linux go build -ldflags="-s -w" -tags server -o bin/${BINARY_NAME}-server-linux-arm64 +.PHONY: clean clean: go clean rm -rfv ./bin @@ -24,8 +27,10 @@ clean: # The deploy-* command doesn't build the binary file, so you need to run `make build` first. # And make sure the inventory and deploy-*.yml file is properly configured. +.PHONY: deploy-server deploy-server: - ansible-playbook -i ./tools/ansible/inventory.ini -l server ./tools/ansible/deploy-server.yml -K + ansible-playbook -i ./deployment/ansible/inventory.ini -l server ./deployment/ansible/deploy-server.yml -K +.PHONY: deploy-prober deploy-prober: - ansible-playbook -i ./tools/ansible/inventory.ini -l prober ./tools/ansible/deploy-prober.yml -K + ansible-playbook -i ./deployment/ansible/inventory.ini -l prober ./deployment/ansible/deploy-prober.yml -K diff --git a/README.md b/README.md index 1cc4fee..3d63b27 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Source code of [https://xmr.ditatompel.com](https://xmr.ditatompel.com), a websi ### Server & Prober requirements - Go >= 1.22 -- Linux Machine (AMD64 or ARM64) +- Linux Machines (AMD64 or ARM64) ### Server requirements @@ -23,7 +23,7 @@ Source code of [https://xmr.ditatompel.com](https://xmr.ditatompel.com), a websi 3. Build the binary with `make build`. 4. Run the service with `./bin/xmr-nodes-server-linux- serve`. -Systemd example: [./tools/resources/init/xmr-nodes-server.service](./tools/resources/init/xmr-nodes-server.service). +Systemd example: [./deployment/init/xmr-nodes-server.service](./deployment/init/xmr-nodes-server.service). ### For initial prober setup: @@ -32,4 +32,4 @@ Systemd example: [./tools/resources/init/xmr-nodes-server.service](./tools/resou 3. Build the binary with `make build`. 4. Run the service with `./bin/xmr-nodes-client-linux- probe`. -Systemd example: [xmr-nodes-prober.service](./tools/resources/init/xmr-nodes-prober.service) and [xmr-nodes-prober.timer](./tools/resources/init/xmr-nodes-prober.timer). +Systemd example: [xmr-nodes-prober.service](./deployment/init/xmr-nodes-prober.service) and [xmr-nodes-prober.timer](./deployment/init/xmr-nodes-prober.timer). diff --git a/tools/ansible/deploy-prober.example.yml b/deployment/ansible/deploy-prober.example.yml similarity index 100% rename from tools/ansible/deploy-prober.example.yml rename to deployment/ansible/deploy-prober.example.yml diff --git a/tools/ansible/deploy-server.example.yml b/deployment/ansible/deploy-server.example.yml similarity index 100% rename from tools/ansible/deploy-server.example.yml rename to deployment/ansible/deploy-server.example.yml diff --git a/tools/ansible/inventory.example.ini b/deployment/ansible/inventory.example.ini similarity index 100% rename from tools/ansible/inventory.example.ini rename to deployment/ansible/inventory.example.ini diff --git a/tools/resources/init/xmr-nodes-prober.service b/deployment/init/xmr-nodes-prober.service similarity index 100% rename from tools/resources/init/xmr-nodes-prober.service rename to deployment/init/xmr-nodes-prober.service diff --git a/tools/resources/init/xmr-nodes-prober.timer b/deployment/init/xmr-nodes-prober.timer similarity index 100% rename from tools/resources/init/xmr-nodes-prober.timer rename to deployment/init/xmr-nodes-prober.timer diff --git a/tools/resources/init/xmr-nodes-server.service b/deployment/init/xmr-nodes-server.service similarity index 100% rename from tools/resources/init/xmr-nodes-server.service rename to deployment/init/xmr-nodes-server.service diff --git a/tools/resources/nginx/vhost.conf b/deployment/nginx/vhost.conf similarity index 100% rename from tools/resources/nginx/vhost.conf rename to deployment/nginx/vhost.conf