diff --git a/.gitmodules b/.gitmodules index 0ecaada..04cea97 100644 --- a/.gitmodules +++ b/.gitmodules @@ -23,3 +23,9 @@ [submodule "roles.extern/prepare-dnf5"] path = roles.extern/prepare-dnf5 url = https://git.velt.biz/svelt/role.prepare-dnf5.git +[submodule "roles.webcluster"] + path = roles.webcluster + url = https://git.velt.biz/Ansible/roles.webcluster.git +[submodule "roles.extern/selfsignedcert"] + path = roles.extern/selfsignedcert + url = https://git.velt.biz/Ansible/selfsignedcert.git diff --git a/11/ansible.cfg b/11/ansible.cfg new file mode 100644 index 0000000..a05b5f9 --- /dev/null +++ b/11/ansible.cfg @@ -0,0 +1,37 @@ +[defaults] + +# Inventory +inventory = ./hosts.ini + +# Roles paths +roles_path = ./roles:./roles.extern:./roles.webcluster:/etc/ansible/roles + +# Interpreter Discovery - Ohne Warnings +interpreter_python = auto_silent + +# SSH +remote_user = root +#host_key_checking = False + +# Retry files +retry_files_enabled = yes +retry_files_save_path = ./.cache/Retry/ + +# Log files +#log_path = ./log/ansible.log + +# Fact caching +gathering = smart +fact_caching_timeout = 86400 +fact_caching = yaml +fact_caching_connection = ./.cache/facts/ + +# Farben ausschalten +#nocolor = 1 + +[colors] +# Für dunklen Hintergrund in der Console +verbose = bright blue +debug = bright gray +error = bright red + diff --git a/11/webcluster-cert.yml b/11/webcluster-cert.yml new file mode 100644 index 0000000..1229f94 --- /dev/null +++ b/11/webcluster-cert.yml @@ -0,0 +1,5 @@ +--- + +- hosts: localhost + roles: + - role: selfsignedcert diff --git a/11/webcluster-db.yml b/11/webcluster-db.yml new file mode 120000 index 0000000..31c820d --- /dev/null +++ b/11/webcluster-db.yml @@ -0,0 +1 @@ +../roles.webcluster/webcluster-db.yml \ No newline at end of file diff --git a/11/webcluster-lb.yml b/11/webcluster-lb.yml new file mode 120000 index 0000000..9b24fe8 --- /dev/null +++ b/11/webcluster-lb.yml @@ -0,0 +1 @@ +../roles.webcluster/webcluster-lb.yml \ No newline at end of file diff --git a/11/webcluster-site.yml b/11/webcluster-site.yml new file mode 120000 index 0000000..b3c4b9e --- /dev/null +++ b/11/webcluster-site.yml @@ -0,0 +1 @@ +../roles.webcluster/webcluster-site.yml \ No newline at end of file diff --git a/11/webcluster-worker.yml b/11/webcluster-worker.yml new file mode 120000 index 0000000..79851f2 --- /dev/null +++ b/11/webcluster-worker.yml @@ -0,0 +1 @@ +../roles.webcluster/webcluster-worker.yml \ No newline at end of file diff --git a/ansible.cfg b/ansible.cfg index dbc53ba..31fbd81 120000 --- a/ansible.cfg +++ b/ansible.cfg @@ -1 +1 @@ -07/ansible.cfg \ No newline at end of file +11/ansible.cfg \ No newline at end of file diff --git a/helper/11_gitmodules.sh b/helper/11_gitmodules.sh new file mode 100755 index 0000000..08ab601 --- /dev/null +++ b/helper/11_gitmodules.sh @@ -0,0 +1,12 @@ +#!/bin/bash -ex + +mkdir -p roles.extern + +git submodule add https://git.velt.biz/Ansible/roles.webcluster.git roles.webcluster +git submodule add https://git.velt.biz/Ansible/selfsignedcert.git roles.extern/selfsignedcert + +cd roles.webcluster +git submodule init +git submodule update +cd .. + diff --git a/host_vars/tn00-debian12.yml b/host_vars/tn00-debian12.yml new file mode 100644 index 0000000..2423f3d --- /dev/null +++ b/host_vars/tn00-debian12.yml @@ -0,0 +1,2 @@ +--- +worker_phpversion: 8.2 diff --git a/hosts.ini b/hosts.ini index 0feef17..7bfbb97 100644 --- a/hosts.ini +++ b/hosts.ini @@ -70,4 +70,29 @@ voidlinux [zypper:children] opensuse +############################################################ + +[lb] +tn00-alpine3k +tn00-alpine3l + +[lb:vars] +ansible_ssh_transfer_method=piped + +[worker] +tn00-ubu2404a +tn00-ubu2404b +tn00-ubu2404c +tn00-ubu2404d + +tn00-debian12 + +[db] +tn00-ubu2404a +tn00-ubu2404b + +[webcluster:children] +lb +worker +db diff --git a/roles.extern/selfsignedcert b/roles.extern/selfsignedcert new file mode 160000 index 0000000..52ae5ce --- /dev/null +++ b/roles.extern/selfsignedcert @@ -0,0 +1 @@ +Subproject commit 52ae5ce3bb1f9918651c09d68da8a14c0e75eba9 diff --git a/roles.webcluster b/roles.webcluster new file mode 160000 index 0000000..36ce0d1 --- /dev/null +++ b/roles.webcluster @@ -0,0 +1 @@ +Subproject commit 36ce0d1f9ff1a012320d80c1835f787ac151773b