From 75fc17c9009f5448d9421c03dab558ad7b6c2406 Mon Sep 17 00:00:00 2001 From: Bert-Jan Fikse Date: Wed, 20 Aug 2025 11:35:09 +0200 Subject: [PATCH] chore: add basic site and Makefile targets --- Makefile | 8 ++++- collections/.gitkeep | 0 inventories/prod/group_vars/all_servers.yml | 2 ++ .../group_vars/reverseproxy_servers_dmz.yml | 6 ++++ inventories/prod/hosts.ini | 3 +- playbooks/site.yml | 30 +++++++++++++++++++ 6 files changed, 46 insertions(+), 3 deletions(-) delete mode 100644 collections/.gitkeep create mode 100644 inventories/prod/group_vars/all_servers.yml create mode 100644 inventories/prod/group_vars/reverseproxy_servers_dmz.yml diff --git a/Makefile b/Makefile index 7b4ca3e..66ba5e1 100644 --- a/Makefile +++ b/Makefile @@ -1,2 +1,8 @@ install: - ansible-galaxy collection install -r requirements.yml -p collections \ No newline at end of file + ansible-galaxy collection install -r requirements.yml -p collections + +run-site: + ansible-playbook -i inventories/prod/hosts.ini playbooks/site.yml + +run-site-dev: + ansible-playbook -i inventories/dev/hosts.ini playbooks/site.yml \ No newline at end of file diff --git a/collections/.gitkeep b/collections/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/inventories/prod/group_vars/all_servers.yml b/inventories/prod/group_vars/all_servers.yml new file mode 100644 index 0000000..49f540a --- /dev/null +++ b/inventories/prod/group_vars/all_servers.yml @@ -0,0 +1,2 @@ +docker_compose_base_dir: /srv/test-compose/ +docker_volume_base_dir: /srv/test-volume/ \ No newline at end of file diff --git a/inventories/prod/group_vars/reverseproxy_servers_dmz.yml b/inventories/prod/group_vars/reverseproxy_servers_dmz.yml new file mode 100644 index 0000000..9d94b54 --- /dev/null +++ b/inventories/prod/group_vars/reverseproxy_servers_dmz.yml @@ -0,0 +1,6 @@ +--- +# DMZ reverse proxy - no local services, only proxies to backend services +services: [] + +use_static_services: true +use_docker_provider: false \ No newline at end of file diff --git a/inventories/prod/hosts.ini b/inventories/prod/hosts.ini index a09549b..ed53f07 100644 --- a/inventories/prod/hosts.ini +++ b/inventories/prod/hosts.ini @@ -3,7 +3,7 @@ 192.168.100.72 ansible_port=2222 192.168.100.73 -[dmz] +[reverseproxy_servers_dmz] 172.16.9.88 [forgejo_servers] @@ -13,6 +13,5 @@ 192.168.100.73 [reverseproxy_servers] -172.16.9.88 192.168.100.72 ansible_port=2222 192.168.100.73 \ No newline at end of file diff --git a/playbooks/site.yml b/playbooks/site.yml index e69de29..f41d037 100644 --- a/playbooks/site.yml +++ b/playbooks/site.yml @@ -0,0 +1,30 @@ +--- +- name: Apply base configuration to all servers + hosts: all_servers + become: yes + roles: + - digitalboard.core.base + +- name: Configure reverse proxy on servers + hosts: reverseproxy_servers + become: yes + roles: + - digitalboard.core.reverseproxy + +- name: Configure Forgejo servers + hosts: forgejo_servers + become: yes + roles: + - digitalboard.core.reverseproxy + +- name: Configure Nextcloud servers + hosts: nextcloud_servers + become: yes + roles: + - digitalboard.core.reverseproxy + +- name: Configure reverse proxy on DMZ servers + hosts: reverseproxy_servers_dmz + become: yes + roles: + - digitalboard.core.reverseproxy