From 90b25e600bb2ecac23341cc8c1dbaa437f7afea1 Mon Sep 17 00:00:00 2001
From: jmsgrogan <james@jmsgrogan.com>
Date: Fri, 29 Mar 2024 12:49:42 +0000
Subject: [PATCH] Clean structure and update readme to reflect use of python.

---
 README.md                                     | 19 ++++++++++++++-----
 .../scripts/nginx/basic_serverblock.txt       |  0
 .../scripts/nginx/setup_basic_nginx.sh        |  0
 .../scripts/setup_machine.sh                  |  0
 test/requirements.txt                         |  3 ++-
 5 files changed, 16 insertions(+), 6 deletions(-)
 rename basic_serverblock.txt => infra/scripts/nginx/basic_serverblock.txt (100%)
 rename setup_basic_nginx.sh => infra/scripts/nginx/setup_basic_nginx.sh (100%)
 rename setup_machine.sh => infra/scripts/setup_machine.sh (100%)

diff --git a/README.md b/README.md
index 05ebea2..a5a7660 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,23 @@
-This repo is a collection of ad-hoc scripts and snippets for setting up and administering a small cloud server. They are just a stepping stone toward for formal automation.
+This repo has some scripts that I use for managing machines and containers.
 
-# Machine setup
+# Samples
+
+## Set up a machine with a named non-root user and some secure ssh config.
 
 ```sh
-./setup_machine.sh
+python3 src/machine_setup.py
 ```
 
-# Set up basic nginx server
+# Running Tests
 
 ```sh
-./setup_basic_nginx.sh
+python3 -m venv --prompt machine_admin .venv
+source .venv/bin/activate
+pip install -r test/requirements.txt
+pytest
 ```
 
+# Copyright
+
+The contents of this repo are Copyright James Grogan 2024. Software is licensed under the AGPL. See the included LICENSE file for details.
+
diff --git a/basic_serverblock.txt b/infra/scripts/nginx/basic_serverblock.txt
similarity index 100%
rename from basic_serverblock.txt
rename to infra/scripts/nginx/basic_serverblock.txt
diff --git a/setup_basic_nginx.sh b/infra/scripts/nginx/setup_basic_nginx.sh
similarity index 100%
rename from setup_basic_nginx.sh
rename to infra/scripts/nginx/setup_basic_nginx.sh
diff --git a/setup_machine.sh b/infra/scripts/setup_machine.sh
similarity index 100%
rename from setup_machine.sh
rename to infra/scripts/setup_machine.sh
diff --git a/test/requirements.txt b/test/requirements.txt
index 55b033e..2b0f393 100644
--- a/test/requirements.txt
+++ b/test/requirements.txt
@@ -1 +1,2 @@
-pytest
\ No newline at end of file
+pytest
+.pytest_cache
\ No newline at end of file