diff --git a/Makefile b/Makefile index 3cc87eb..0c105fb 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,3 @@ -install-roles: - ansible-galaxy install \ - -r "ansible/requirements.yml" \ - --force - -rebuild-test-machine: - vagrant destroy -f && vagrant up - PLAYBOOK := ansible/configuration.yml STAGE := vagrant @@ -25,6 +17,16 @@ else TAGS_ARGS := endif +# Tasks + +install-roles: + ansible-galaxy install \ + --role-file "ansible/requirements.yml" \ + --force + +rebuild-test-machine: + vagrant destroy -f && vagrant up + edit-vars: EDITOR=micro \ ansible-vault edit ansible/vars/vars.yml diff --git a/README.md b/README.md index 128c269..23880b4 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,14 @@ Настройки виртуального сервера для домашних проектов. +## Требования + +- Ansible + +## Установка + + $ ansible-galaxy install --role-file ansible/requirements.yml + ## Структура - Приложению создается свой пользователь. diff --git a/ansible/configuration.yml b/ansible/configuration.yml index 9549ba2..48339c1 100644 --- a/ansible/configuration.yml +++ b/ansible/configuration.yml @@ -1,10 +1,11 @@ --- - hosts: all vars: - notes_port: 41080 - dayoff_port: 41081 - homepage_port: 41082 - netdata_port: 41083 + base_port: 41080 + notes_port: "{{ base_port + 1 }}" + dayoff_port: "{{ base_port + 2 }}" + homepage_port: "{{ base_port + 3 }}" + netdata_port: "{{ base_port + 4 }}" vars_files: - vars/vars.yml @@ -65,7 +66,7 @@ - import_role: name: netdata vars: - netdata_version: 'v1.36.0' + netdata_version: 'v1.38.1' netdata_exposed_port: '{{ netdata_port }}' tags: - monitoring diff --git a/ansible/requirements.yml b/ansible/requirements.yml index f5c0032..c5f5311 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -6,7 +6,7 @@ version: 2.2.0 - src: geerlingguy.docker - version: 5.0.0 + version: 6.1.0 - src: caddy_ansible.caddy_ansible - version: v3.1.0 + version: v3.2.0