merge develop into main #29

Merged

apathy merged 85 commits from develop into main 2026-04-19 18:23:26 +00:00

Conversation 1 Commits 85 Files changed 330 +7825 -1

cuqmbr commented 2026-04-19 18:10:05 +00:00

Owner

Copy link

No description provided.

cuqmbr added 83 commits 2026-04-19 18:10:05 +00:00

add ansible role with molecule test for installing docker on Ubuntu 24.04 using deb packages 0fa7d92820

add actions workflow to run linting and tests on "docker_engine_package" ansible role 762a6313a8

Merge pull request 'feature-289-docker-engine-role' (#1) from feature-289 into develop ... 5e553d7179

Reviewed-on: #1
Reviewed-by: Gigga Nigga <spot@noreply.localhost>

convert role path into an environment variable in "docker-engine-package" actions workflow 5058714b40

cleanup "docker_engine_package" role formatting and add basic verify molecule playbook 465ef1c60e

add ansible role with molecule test for installing MCSManager Daemon on Ubuntu 24.04 using docker image 458ef5bee0

add actions workflow to run linting and tests on "mcsmanager_daemon_docker" ansible role e3519fbfa1

add ansible role with molecule test for installing MCSManager Web on Ubuntu 24.04 using docker container fac0a413a1

add actions workflow to run linting and tests on "mcsmanager_web_docker" ansible role 644cc650fb

Merge pull request 'feature-287-mcsmanager-web-role' (#4) from feature-287 into develop ... 82222ba070

Reviewed-on: #4

Мы проделали очень большую работу, я горжусь этим! +15 соц. рейтинга

Merge pull request 'feature-286-mcsmanager-daemon-role' (#3) from feature-286 into develop ... 3b25566d1e

Reviewed-on: #3
Reviewed-by: apathy <zloiyudin@gmail.com>
Делаем слияние! +15 соц. рейтинга

add ansible role for requesting and updating TLS certificates from LetsEncrypt using certbot on Ubuntu 24.04 using docker container ... 186b0fe033

performs verification with http challenge, standalone web server on port 80

testing requires deployment on marchine with public ip and domain binding thus no molecule tests were created

add actions workflow to run linting on "certbot_docker" ansible role 098c0b59f2

add functional and ordering dependency to docker in MCSManager Daemon and Web systemd services 1c3072b4df

Merge pull request 'feature-298-certbot-role' (#5) from feature-298 into develop ... 70157422ca

Reviewed-on: #5
Reviewed-by: Gigga Nigga <spot@noreply.localhost>

add custom docker bridge network to route intercontainer traffic ... 4b3bb951f4

this is a prerequisite for proxying traffic with nginx to avoid accessing the host network from inside the container

add ansible role with molecule test for installing nginx on Ubuntu 24.04 using docker container d8278fc723

add actions workflow to run linting and tests on "nginx_docker" ansible role 91b87ba361

Merge pull request 'feature-288-nginx-role' (#6) from feature-288 into develop ... 1e9286c3da

Reviewed-on: #6
Reviewed-by: Gigga Nigga <spot@noreply.localhost>

add ansible role for downloading and installing Bebrashield static website on Ubuntu 24.04 8faff70ea4

add actions workflow to run linting and tests on "website_static" ansible role 92cb9ca2aa

add molecule scenario to install website and serve it with ngixn 96094996b8

fix variable names as required by "var-naming[no-role-prefix]" ansible-lint rule ... e8ab7e8822

https://docs.ansible.com/projects/lint/rules/var-naming

add Actions workflow to lint all ansible files 23fc0ab407

Merge pull request 'feature-299-static-website' (#7) from feature-299 into develop ... 3feaf77d5c

Reviewed-on: #7
Reviewed-by: Panzerhund <panzerhund@noreply.localhost>

add ansible role with molecule tests for installing and configuring Prometheus Server on Ubuntu 24.04 with docker container a6b9a605f1

add actions workflow to run linting and tests on "prometheus_server_docker" ansible role d30423c66e

add ansible role with molecule tests for installing Prometheus Blackbox Exporter on Ubuntu 24.04 using docker image 3c465f9148

add actions workflow to run linting and tests on "prometheus_blackbox_exporter_docker" ansible role 24d5704d46

add ansible role with molecule tests for installing Prometheus cAdvisor Exporter on Ubuntu 24.04 using docker image 51f7f939fc

add actions workflow to run linting and tests on "prometheus_cadvisor_exporter_docker" ansible role ff26155705

add ansible role with molecule test for installing Grafana Loki on Ubuntu 24.04 using docker container 80effd5123

add actions workflow to run linting and tests on "grafana_loki_docker" ansible role d966462191

add ansible role with molecule test for installing Grafana Server on Ubuntu 24.04 using docker container 3174694888

add actions workflow to run linting and tests on "grafana_server_docker" ansible role 978ba2c2b1

add ansible-lint requirements file to fix "global.yml" Actions workflow ... 9623950a56

https://git.cuqmbr.xyz/bebrashield/infra/actions/runs/35/jobs/0/attempt/1#jobstep-5-1

add ansible role with molecule test for installing Fluent Bit on Ubuntu 24.04 using docker container 48f1ab54ee

add actions workflow to run linting and tests on "fluentbit_docker" ansible role 84baeae6de

Merge pull request 'feature-296-fluentbit-role' (#13) from feature-296 into develop ... 2c13631639

Reviewed-on: #13
Reviewed-by: Panzerhund <panzerhund@noreply.localhost>

add ansible role with molecule test for installing Prometheus Alertmanager on Ubuntu 24.04 using docker container f83c5b45d6

add actions workflow to run linting and tests on "prometheus_alertmanager_docker" ansible role 12a040fb72

add ansible role with molecule test for installing Prometheus Node Exporter on Ubuntu 24.04 using docker container 3b1ee8beaa

add actions workflow to run linting and tests on "prometheus_node_exporter_docker" ansible role f6a8942104

Merge pull request 'feature-291-node-exporter-role' (#15) from feature-291 into develop ... f004ac1d5a

Reviewed-on: #15
Reviewed-by: Panzerhund <panzerhund@noreply.localhost>

Merge pull request 'feature-309-prometheus-alertmanager-role' (#14) from feature-309 into develop ... 747d0c052f

Reviewed-on: #14
Reviewed-by: Panzerhund <panzerhund@noreply.localhost>

Merge pull request 'feature-295-grafana-loki-role' (#12) from feature-295 into develop ... ebc5551e75

Reviewed-on: #12
Reviewed-by: Panzerhund <panzerhund@noreply.localhost>

Merge pull request 'feature-294-grafana-server-role' (#11) from feature-294 into develop ... 8a83be41d3

Reviewed-on: #11
Reviewed-by: Panzerhund <panzerhund@noreply.localhost>

Merge pull request 'feature-292-blackbox-exporter-role' (#9) from feature-292 into develop ... 212c51a5f1

Reviewed-on: #9
Reviewed-by: Panzerhund <panzerhund@noreply.localhost>

Merge pull request 'feature-293-cadvisor-exporter-role' (#10) from feature-293 into develop ... 9c2b09cc3f

Reviewed-on: #10
Reviewed-by: Panzerhund <panzerhund@noreply.localhost>

Merge pull request 'feature-290-prometheus-server-role' (#8) from feature-290 into develop ... 0fd29c4cdc

Reviewed-on: #8
Reviewed-by: Panzerhund <panzerhund@noreply.localhost>

make "mcsmanager_web_docker" and "mcsmanager_web_docker" ansible roles configuration structure more similar to other roles dc15d28f73

add instance configuration functionality to "mcsm_daemon_docker" ansible role 5f8d1d61bb

add 15 seconds delay to "mcsmanager_daemon_docker" default molecule verify playbook ... c7c47e1340

this should prevent molecule test failing due to slow container start

https://git.cuqmbr.xyz/bebrashield/infra/actions/runs/61/jobs/1/attempt/5#jobstep-4-327

Merge pull request 'feature-307-mcsmanager-instance-role' (#16) from feature-307 into develop ... c1bc3ff099

Reviewed-on: #16
Reviewed-by: Panzerhund <panzerhund@noreply.localhost>

remote attaching container to "local-docker" bridge network by default in "prometheus_server_docker" ansible role ... 0907f017c6

this allows slecting the network by specifying it in "docker_run_args" configuration variable

add 60-second delay to "mcsmanager_web_docker" default molecule verify playbook ... 2c4e364d64

this should prevent molecule test failing due to slow container start

make ansible roles configuration more simillar to each other ... 7b2702e0b9

- only sane default are left in "settings_default" variables, specific configurations are moved to "converge" playbook

- make top level "settings_defaults" dictionary parameters order the same

- quote string variables with single quotes

change new line characters from CLRF to LF

add missing dependency in "website_static" ansible role Actions molecule test fbd323a4ef

add ansible role with molecule test for configuring nftables on Ubuntu 24.04 and Actions workflow to run linting and test 2b0d4c95e2

Merge pull request 'feature-297-nftables-role' (#17) from feature-297 into develop ... fe157d352e

Reviewed-on: #17
Reviewed-by: apathy <zloiyudin@gmail.com>

add ansible role with molecule test for initializing the instance for work with ansible on Ubuntu 24.04 and Actions workflow to run linting and test df78c752ea

Merge pull request 'feature-319-initialization-role' (#18) from feature-319 into develop ... 6250771bc0

Reviewed-on: #18
Reviewed-by: apathy <zloiyudin@gmail.com>

rewrite instance configuration provisioning logic ... 9fde601e08

this allows to specify only instances you want to create or change without
changing settings of other instances

useful for use in CD pipelines on individual game servers

add molecule scenarios that demonstrate how roles integrate with each other a85ea4c45b

Merge pull request 'feature-308-ansible-roles-integration-scenarios' (#19) from feature-308 into develop ... d148845b72

Reviewed-on: #19
Reviewed-by: apathy <zloiyudin@gmail.com>

change dependency installation from using pip to apt package manager in "docker_engine_package" ansible role 42726ee141

add "no_log" statements in "initialization" ansible role 7258f9a5c8

add ansible deployment inventories and playbooks ddcd40a87e

Merge pull request 'feature-310-ansible-deployment-playbooks' (#20) from feature-310 into develop ... d578091c8b

Reviewed-on: #20
Reviewed-by: apathy <zloiyudin@gmail.com>

update ansible vault-encrypted variables cfe46100db

change nginx docker container static files volume in ansible infrastructure playbook variables 793725f879

Merge pull request 'bug-329-404-on-website-update' (#22) from bug-329 into develop ... 76d80f291e

Reviewed-on: #22
Reviewed-by: apathy <zloiyudin@gmail.com>

add ansible infrastructure continuous integration actions workflow 45d9c2de79

change MCSManager instances cwd in ansible extra variables 644199c136

Merge pull request 'feature-321-continuous-deployment-workflow' (#23) from feature-321 into main ... 567a3952b7

Reviewed-on: #23
Reviewed-by: apathy <zloiyudin@gmail.com>

Merge pull request 'bug-331-server-containers-cwd-correction' (#24) from bug-331 into main ... a70ccaf320

Reviewed-on: #24
Reviewed-by: apathy <zloiyudin@gmail.com>

add develop branch to push triggers in ansible cd workflow de0e4db26f

Merge pull request 'bug-332-cd-fix' (#25) from bug-332 into develop ... 45fbf15e53

Reviewed-on: #25
Reviewed-by: он манал <bismarckbivrest@noreply.localhost>
Reviewed-by: apathy <zloiyudin@gmail.com>

make instance resource limits empty to allow automatic management by docker daemon 730fab5265

Merge pull request 'bug-344-fix-invalid-resource-limits' (#26) from bug-344 into develop ... 1c79645f94

Reviewed-on: #26
Reviewed-by: он манал <bismarckbivrest@noreply.localhost>

add bluemap nginx vhost in ansible configuration a313ab5005

fix: change all "develop" references to "main" in main ansible environment configuration file ee5e1a48b6

Merge pull request 'feature-346-minecraft-survival-map-nginx-config' (#28) from feature-346 into develop ... 808a9d414d

Reviewed-on: #28
Reviewed-by: он манал <bismarckbivrest@noreply.localhost>

cuqmbr changed title from merge develop into main to WIP: merge develop into main 2026-04-19 18:10:08 +00:00

cuqmbr changed title from WIP: merge develop into main to merge develop into main 2026-04-19 18:13:21 +00:00

cuqmbr changed title from merge develop into main to WIP: merge develop into main 2026-04-19 18:13:36 +00:00

apathy added 2 commits 2026-04-19 18:14:28 +00:00

add ansible role with molecule test for mariadb docker container installation and configuration on Ubuntu 24.04 and Actions workflow to run linting and test 078d4b489c

Merge pull request 'feature-333-mariadb-ansible-role' (#27) from feature-333 into develop ... 593d233498

Reviewed-on: #27
Reviewed-by: apathy <zloiyudin@gmail.com>

cuqmbr changed title from WIP: merge develop into main to merge develop into main 2026-04-19 18:22:47 +00:00

apathy approved these changes 2026-04-19 18:23:21 +00:00

apathy merged commit 1ed16206de into main 2026-04-19 18:23:26 +00:00

apathy referenced this pull request from a commit 2026-04-19 18:23:26 +00:00

Merge pull request 'merge develop into main' (#29) from develop into main

Sign in to join this conversation.

Reviewers

No reviewers

apathy

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

2 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

bebrashield/infra!29

No description provided.