From a3eb6d7e24f6dad7db02a59262b6456232a2e6f7 Mon Sep 17 00:00:00 2001 From: VC Date: Fri, 11 Jul 2025 15:56:28 +0200 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=A7=AA:=20dc1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- inventory/host_vars/dc1.yml | 4 ++++ roles/nginx/templates/vhosts/kck.test.mateu.be.conf.j2 | 8 ++++++++ roles/nginx/templates/vhosts/vlt.test.mateu.be.conf.j2 | 8 ++++++++ 3 files changed, 20 insertions(+) create mode 100644 inventory/host_vars/dc1.yml create mode 100644 roles/nginx/templates/vhosts/kck.test.mateu.be.conf.j2 create mode 100644 roles/nginx/templates/vhosts/vlt.test.mateu.be.conf.j2 diff --git a/inventory/host_vars/dc1.yml b/inventory/host_vars/dc1.yml new file mode 100644 index 0000000..7fa6f4a --- /dev/null +++ b/inventory/host_vars/dc1.yml @@ -0,0 +1,4 @@ +--- +web_hostname: + - host: kck.test.mateu.be + - host: vlt.test.mateu.be diff --git a/roles/nginx/templates/vhosts/kck.test.mateu.be.conf.j2 b/roles/nginx/templates/vhosts/kck.test.mateu.be.conf.j2 new file mode 100644 index 0000000..7c55fe4 --- /dev/null +++ b/roles/nginx/templates/vhosts/kck.test.mateu.be.conf.j2 @@ -0,0 +1,8 @@ +server { +{% include './templates/header.conf.j2' %} + + location / { + proxy_pass http://localhost:8080; + } +} + diff --git a/roles/nginx/templates/vhosts/vlt.test.mateu.be.conf.j2 b/roles/nginx/templates/vhosts/vlt.test.mateu.be.conf.j2 new file mode 100644 index 0000000..1cf6530 --- /dev/null +++ b/roles/nginx/templates/vhosts/vlt.test.mateu.be.conf.j2 @@ -0,0 +1,8 @@ +server { +{% include './templates/header.conf.j2' %} + + location / { + proxy_pass http://localhost:8200; + } +} + -- 2.39.5 From 2bbe29b7b0f7fac470020e80fa33e3ae0fa6994c Mon Sep 17 00:00:00 2001 From: VC Date: Wed, 16 Jul 2025 15:02:21 +0200 Subject: [PATCH 2/3] =?UTF-8?q?=E2=99=BB=EF=B8=8F:=20separate=20act=5Frunn?= =?UTF-8?q?er=20from=20docker?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- playbooks/docker.yml | 6 ++++++ playbooks/gitea.yml | 1 - playbooks/site.yml | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 playbooks/docker.yml diff --git a/playbooks/docker.yml b/playbooks/docker.yml new file mode 100644 index 0000000..8af91d1 --- /dev/null +++ b/playbooks/docker.yml @@ -0,0 +1,6 @@ +--- + +- name: Install docker + hosts: dockerservers + roles: + - docker diff --git a/playbooks/gitea.yml b/playbooks/gitea.yml index c07d812..a8eab10 100644 --- a/playbooks/gitea.yml +++ b/playbooks/gitea.yml @@ -10,5 +10,4 @@ hosts: actrunnerservers diff: true roles: - - docker - act_runner diff --git a/playbooks/site.yml b/playbooks/site.yml index 80f8a5b..b42240e 100644 --- a/playbooks/site.yml +++ b/playbooks/site.yml @@ -54,6 +54,8 @@ import_playbook: peertube.yml - name: Run elasticsearch playbook import_playbook: elasticsearch.yml +- name: Run docker playbook + import_playbook: docker.yml - name: Run gitea playbook import_playbook: gitea.yml - name: Run vaultwarden playbook -- 2.39.5 From 826a10deac6892a710d8473336b4a437ea4dbf25 Mon Sep 17 00:00:00 2001 From: VC Date: Wed, 16 Jul 2025 15:11:27 +0200 Subject: [PATCH 3/3] =?UTF-8?q?=E2=99=BB=EF=B8=8F:=20make=20munin=5Fclient?= =?UTF-8?q?=20independant=20from=20server=20configuration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- roles/munin_client/templates/munin-node.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/munin_client/templates/munin-node.conf.j2 b/roles/munin_client/templates/munin-node.conf.j2 index d677a8a..036cd55 100644 --- a/roles/munin_client/templates/munin-node.conf.j2 +++ b/roles/munin_client/templates/munin-node.conf.j2 @@ -41,7 +41,7 @@ host_name {{ ansible_host }} # network notation unless the perl module Net::CIDR is installed. You # may repeat the allow line as many times as you'd like -allow ^{{ hostvars['munin']['ansible_default_ipv4']['address'].split('.')|join('\.') }} +allow ^{{ hostvars['munin']['proxmox_net0']['ip'] | ansible.utils.ipaddr('address') | split('.') |join('\.') }} allow ^127\.0\.0\.1$ allow ^::1$ -- 2.39.5