From 6a30902a630a67534d2055cae9d096f409ed4286 Mon Sep 17 00:00:00 2001 From: marcel-dempers Date: Fri, 28 Oct 2022 08:48:06 +1100 Subject: [PATCH] restructure and folder rename --- .gitignore | 8 ++++---- .../{postgres => postgresql}/1-introduction/README.md | 2 +- .../1-introduction/docker-compose.yaml | 0 .../{postgres => postgresql}/2-configuration/README.md | 2 +- .../2-configuration/config/pg_hba.conf | 0 .../2-configuration/config/pg_ident.conf | 0 .../2-configuration/config/postgresql.conf | 0 .../{postgres => postgresql}/3-replication/README.md | 6 +++--- .../3-replication/postgres-1/config/pg_hba.conf | 0 .../3-replication/postgres-1/config/pg_ident.conf | 0 .../3-replication/postgres-1/config/postgresql.conf | 0 .../3-replication/postgres-2/config/pg_hba.conf | 0 .../3-replication/postgres-2/config/pg_ident.conf | 0 .../3-replication/postgres-2/config/postgresql.conf | 0 .../4-clustering => postgresql/4-kubernetes}/README.md | 0 storage/databases/{postgres => postgresql}/README.md | 2 +- 16 files changed, 10 insertions(+), 10 deletions(-) rename storage/databases/{postgres => postgresql}/1-introduction/README.md (95%) rename storage/databases/{postgres => postgresql}/1-introduction/docker-compose.yaml (100%) rename storage/databases/{postgres => postgresql}/2-configuration/README.md (96%) rename storage/databases/{postgres => postgresql}/2-configuration/config/pg_hba.conf (100%) rename storage/databases/{postgres => postgresql}/2-configuration/config/pg_ident.conf (100%) rename storage/databases/{postgres => postgresql}/2-configuration/config/postgresql.conf (100%) rename storage/databases/{postgres => postgresql}/3-replication/README.md (97%) rename storage/databases/{postgres => postgresql}/3-replication/postgres-1/config/pg_hba.conf (100%) rename storage/databases/{postgres => postgresql}/3-replication/postgres-1/config/pg_ident.conf (100%) rename storage/databases/{postgres => postgresql}/3-replication/postgres-1/config/postgresql.conf (100%) rename storage/databases/{postgres => postgresql}/3-replication/postgres-2/config/pg_hba.conf (100%) rename storage/databases/{postgres => postgresql}/3-replication/postgres-2/config/pg_ident.conf (100%) rename storage/databases/{postgres => postgresql}/3-replication/postgres-2/config/postgresql.conf (100%) rename storage/databases/{postgres/4-clustering => postgresql/4-kubernetes}/README.md (100%) rename storage/databases/{postgres => postgresql}/README.md (94%) diff --git a/.gitignore b/.gitignore index 8204433..45c6b0b 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,7 @@ kubernetes/portainer/business/volume* #ignore postgres data for sample and database tutorials pgdata -storage/databases/postgres/docker/backup/ -storage/databases/postgres/docker/archive/ -storage/databases/postgres/3-replication/postgres-1/archive/* -storage/databases/postgres/3-replication/postgres-2/archive/* +storage/databases/postgresql/docker/backup/ +storage/databases/postgresql/docker/archive/ +storage/databases/postgresql/3-replication/postgres-1/archive/* +storage/databases/postgresql/3-replication/postgres-2/archive/* diff --git a/storage/databases/postgres/1-introduction/README.md b/storage/databases/postgresql/1-introduction/README.md similarity index 95% rename from storage/databases/postgres/1-introduction/README.md rename to storage/databases/postgresql/1-introduction/README.md index 2f6e708..cb11bce 100644 --- a/storage/databases/postgres/1-introduction/README.md +++ b/storage/databases/postgresql/1-introduction/README.md @@ -15,7 +15,7 @@ PostgreSQL [Docker Image](https://hub.docker.com/_/postgres) ## Run a simple PostgreSQL database (compose) ``` -cd storage/databases/postgres/1-introduction +cd storage/databases/postgresql/1-introduction docker compose up ``` diff --git a/storage/databases/postgres/1-introduction/docker-compose.yaml b/storage/databases/postgresql/1-introduction/docker-compose.yaml similarity index 100% rename from storage/databases/postgres/1-introduction/docker-compose.yaml rename to storage/databases/postgresql/1-introduction/docker-compose.yaml diff --git a/storage/databases/postgres/2-configuration/README.md b/storage/databases/postgresql/2-configuration/README.md similarity index 96% rename from storage/databases/postgres/2-configuration/README.md rename to storage/databases/postgresql/2-configuration/README.md index 0569fa3..566a451 100644 --- a/storage/databases/postgres/2-configuration/README.md +++ b/storage/databases/postgresql/2-configuration/README.md @@ -11,7 +11,7 @@ Let's start where we left off, and review our simple PostgreSQL database: ## Run a simple PostgreSQL database (docker) ``` -cd storage/databases/postgres/2-configuration +cd storage/databases/postgresql/2-configuration docker run -it --rm --name postgres ` -e POSTGRES_PASSWORD=admin123 ` -v ${PWD}/pgdata:/var/lib/postgresql/data ` diff --git a/storage/databases/postgres/2-configuration/config/pg_hba.conf b/storage/databases/postgresql/2-configuration/config/pg_hba.conf similarity index 100% rename from storage/databases/postgres/2-configuration/config/pg_hba.conf rename to storage/databases/postgresql/2-configuration/config/pg_hba.conf diff --git a/storage/databases/postgres/2-configuration/config/pg_ident.conf b/storage/databases/postgresql/2-configuration/config/pg_ident.conf similarity index 100% rename from storage/databases/postgres/2-configuration/config/pg_ident.conf rename to storage/databases/postgresql/2-configuration/config/pg_ident.conf diff --git a/storage/databases/postgres/2-configuration/config/postgresql.conf b/storage/databases/postgresql/2-configuration/config/postgresql.conf similarity index 100% rename from storage/databases/postgres/2-configuration/config/postgresql.conf rename to storage/databases/postgresql/2-configuration/config/postgresql.conf diff --git a/storage/databases/postgres/3-replication/README.md b/storage/databases/postgresql/3-replication/README.md similarity index 97% rename from storage/databases/postgres/3-replication/README.md rename to storage/databases/postgresql/3-replication/README.md index b650fe2..c472875 100644 --- a/storage/databases/postgres/3-replication/README.md +++ b/storage/databases/postgresql/3-replication/README.md @@ -26,7 +26,7 @@ docker network create postgres Start with instance 1: ``` -cd storage/databases/postgres/3-replication +cd storage/databases/postgresql/3-replication docker run -it --rm --name postgres-1 ` --net postgres ` @@ -90,7 +90,7 @@ The utility is in the PostgreSQL docker image, so let's run it without running a Note that we also mount our blank data directory as we will make a new backup in there: ``` -cd storage/databases/postgres/3-replication +cd storage/databases/postgresql/3-replication docker run -it --rm ` --net postgres ` @@ -109,7 +109,7 @@ Now we should see PostgreSQL data ready for our second instance in `${PWD}/postg ## Start standby instance ``` -cd storage/databases/postgres/3-replication +cd storage/databases/postgresql/3-replication docker run -it --rm --name postgres-2 ` --net postgres ` diff --git a/storage/databases/postgres/3-replication/postgres-1/config/pg_hba.conf b/storage/databases/postgresql/3-replication/postgres-1/config/pg_hba.conf similarity index 100% rename from storage/databases/postgres/3-replication/postgres-1/config/pg_hba.conf rename to storage/databases/postgresql/3-replication/postgres-1/config/pg_hba.conf diff --git a/storage/databases/postgres/3-replication/postgres-1/config/pg_ident.conf b/storage/databases/postgresql/3-replication/postgres-1/config/pg_ident.conf similarity index 100% rename from storage/databases/postgres/3-replication/postgres-1/config/pg_ident.conf rename to storage/databases/postgresql/3-replication/postgres-1/config/pg_ident.conf diff --git a/storage/databases/postgres/3-replication/postgres-1/config/postgresql.conf b/storage/databases/postgresql/3-replication/postgres-1/config/postgresql.conf similarity index 100% rename from storage/databases/postgres/3-replication/postgres-1/config/postgresql.conf rename to storage/databases/postgresql/3-replication/postgres-1/config/postgresql.conf diff --git a/storage/databases/postgres/3-replication/postgres-2/config/pg_hba.conf b/storage/databases/postgresql/3-replication/postgres-2/config/pg_hba.conf similarity index 100% rename from storage/databases/postgres/3-replication/postgres-2/config/pg_hba.conf rename to storage/databases/postgresql/3-replication/postgres-2/config/pg_hba.conf diff --git a/storage/databases/postgres/3-replication/postgres-2/config/pg_ident.conf b/storage/databases/postgresql/3-replication/postgres-2/config/pg_ident.conf similarity index 100% rename from storage/databases/postgres/3-replication/postgres-2/config/pg_ident.conf rename to storage/databases/postgresql/3-replication/postgres-2/config/pg_ident.conf diff --git a/storage/databases/postgres/3-replication/postgres-2/config/postgresql.conf b/storage/databases/postgresql/3-replication/postgres-2/config/postgresql.conf similarity index 100% rename from storage/databases/postgres/3-replication/postgres-2/config/postgresql.conf rename to storage/databases/postgresql/3-replication/postgres-2/config/postgresql.conf diff --git a/storage/databases/postgres/4-clustering/README.md b/storage/databases/postgresql/4-kubernetes/README.md similarity index 100% rename from storage/databases/postgres/4-clustering/README.md rename to storage/databases/postgresql/4-kubernetes/README.md diff --git a/storage/databases/postgres/README.md b/storage/databases/postgresql/README.md similarity index 94% rename from storage/databases/postgres/README.md rename to storage/databases/postgresql/README.md index 0f9d03c..b8f1259 100644 --- a/storage/databases/postgres/README.md +++ b/storage/databases/postgresql/README.md @@ -9,7 +9,7 @@ wal_keep_size or by configuring a replication slot for the standby ``` -cd storage\databases\postgres\docker +cd storage/databases/postgresqlql/docker docker network create postgres docker run -d --rm --name postgres-1 `