From 50caf2d76231f00a3097c63c054c43939e341ce6 Mon Sep 17 00:00:00 2001 From: Bas Meijer Date: Mon, 11 Nov 2024 11:13:05 +0100 Subject: [PATCH 1/3] Local could use private Yum --- inventory/local/group_vars/semaphore.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/inventory/local/group_vars/semaphore.yml b/inventory/local/group_vars/semaphore.yml index 0bf5e3f..5087f2e 100644 --- a/inventory/local/group_vars/semaphore.yml +++ b/inventory/local/group_vars/semaphore.yml @@ -1,2 +1,5 @@ --- +# Use our own Yum repository with geerlingguy.docker +# docker_add_repo: false + semaphore_web_root: 'https://controller' From 85a04a8d2377b03d19b2c4fddbfb7a654c78c47e Mon Sep 17 00:00:00 2001 From: Bas Meijer Date: Mon, 11 Nov 2024 17:54:40 +0100 Subject: [PATCH 2/3] Use Nginx from distro --- inventory/dev/group_vars/semaphore.yml | 2 +- inventory/local/group_vars/semaphore.yml | 2 +- inventory/test/group_vars/semaphore.yml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/inventory/dev/group_vars/semaphore.yml b/inventory/dev/group_vars/semaphore.yml index 2276e35..26af54e 100644 --- a/inventory/dev/group_vars/semaphore.yml +++ b/inventory/dev/group_vars/semaphore.yml @@ -1,8 +1,8 @@ --- semaphore_web_root: 'https://controller' - controller_repository_name: "example-repo" controller_repository_git_url: "https://github.comi/bbaassssiiee/controller.git" controller_repository_git_branch: "main" +nginx_add_repo: false ssh_passphrase: "SomethingYouNeedToUse" diff --git a/inventory/local/group_vars/semaphore.yml b/inventory/local/group_vars/semaphore.yml index 5087f2e..046c37a 100644 --- a/inventory/local/group_vars/semaphore.yml +++ b/inventory/local/group_vars/semaphore.yml @@ -1,5 +1,5 @@ --- # Use our own Yum repository with geerlingguy.docker # docker_add_repo: false - +nginx_add_repo: false semaphore_web_root: 'https://controller' diff --git a/inventory/test/group_vars/semaphore.yml b/inventory/test/group_vars/semaphore.yml index 0bf5e3f..cba861c 100644 --- a/inventory/test/group_vars/semaphore.yml +++ b/inventory/test/group_vars/semaphore.yml @@ -1,2 +1,3 @@ --- semaphore_web_root: 'https://controller' +nginx_add_repo: false From 1b9e16b7ea3c9719fa97f23da153774e7ba23524 Mon Sep 17 00:00:00 2001 From: Bas Meijer Date: Mon, 11 Nov 2024 17:57:49 +0100 Subject: [PATCH 3/3] EL8 has postgres 15 in AppStream --- inventory/dev/group_vars/database.yml | 1 + inventory/local/group_vars/database.yml | 1 + inventory/test/group_vars/database.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/inventory/dev/group_vars/database.yml b/inventory/dev/group_vars/database.yml index 031cdd6..07ab13b 100644 --- a/inventory/dev/group_vars/database.yml +++ b/inventory/dev/group_vars/database.yml @@ -1,5 +1,6 @@ --- postgres_enabled: true +postgres_version: 15 # Postgresql users and databases/schemas database: postgres: diff --git a/inventory/local/group_vars/database.yml b/inventory/local/group_vars/database.yml index 031cdd6..07ab13b 100644 --- a/inventory/local/group_vars/database.yml +++ b/inventory/local/group_vars/database.yml @@ -1,5 +1,6 @@ --- postgres_enabled: true +postgres_version: 15 # Postgresql users and databases/schemas database: postgres: diff --git a/inventory/test/group_vars/database.yml b/inventory/test/group_vars/database.yml index 031cdd6..07ab13b 100644 --- a/inventory/test/group_vars/database.yml +++ b/inventory/test/group_vars/database.yml @@ -1,5 +1,6 @@ --- postgres_enabled: true +postgres_version: 15 # Postgresql users and databases/schemas database: postgres: