diff --git a/Makefile b/Makefile index cc2a2cf..43e208f 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,7 @@ install-roles: - ansible-galaxy install -r "ansible/requirements.yml" + ansible-galaxy install \ + -r "ansible/requirements.yml" \ + --force rebuild-test-machine: vagrant destroy -f && vagrant up @@ -32,6 +34,7 @@ dry-run: ansible/configuration.yml configure-test: + ANSIBLE_HOST_KEY_CHECKING=False \ ansible-playbook \ --inventory "ansible/hosts_vagrant" \ --extra-vars 'ansible_python_interpreter=/usr/bin/python3' \ diff --git a/Vagrantfile b/Vagrantfile index 3c939f7..2b74d49 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,19 +1,15 @@ # -*- mode: ruby -*- # vi: set ft=ruby : - # Этот файл предназначен для запуска тестовой виртуальной машины, # на которой можно обкатать роли для настройки сервера. ENV["LC_ALL"] = "en_US.UTF-8" -# For installing ansible_local from pip on guest -Vagrant.require_version ">= 1.8.3" - Vagrant.configure("2") do |config| - config.vm.box = "ubuntu/xenial64" + config.vm.box = "ubuntu/bionic64" config.vm.network "private_network", ip: "192.168.50.10" diff --git a/ansible/amber.yml b/ansible/amber.yml index 7fc103f..e6ad6bb 100644 --- a/ansible/amber.yml +++ b/ansible/amber.yml @@ -1,7 +1,4 @@ --- - -# v3, nginx, docker - - hosts: all vars_files: @@ -21,37 +18,18 @@ security_autoupdate_enabled: false security_fail2ban_enabled: false - - include_role: - name: geerlingguy.nginx - vars: - nginx_remove_default_vhost: true - - include_role: name: geerlingguy.docker vars: docker_users: '{{ apps | map(attribute="username") | list }}' - - include_role: - name: docker-app - private: yes - vars: - username: '{{ app_item.username }}' - ssh_keys: '{{ app_item.ssh_keys | default([]) }}' - env: '{{ app_item.env | default({}) }}' - with_items: '{{ apps }}' - loop_control: - loop_var: app_item - - - include_role: - name: nginx-proxy - private: yes - vars: - nginx_proxy_name: '{{ fr_item.name }}' - nginx_proxy_template: '{{ fr_item.template }}' - nginx_proxy_params: '{{ fr_item.params | default({}) }}' - nginx_ssl_type: '{{ fr_item.ssl_type }}' - nginx_ssl_email: '{{ fr_item.ssl_email }}' - nginx_ssl_domains: '{{ fr_item.ssl_domains }}' - with_items: '{{ frontends }}' - loop_control: - loop_var: fr_item + # - include_role: + # name: docker-app + # private: yes + # vars: + # username: '{{ app_item.username }}' + # ssh_keys: '{{ app_item.ssh_keys | default([]) }}' + # env: '{{ app_item.env | default({}) }}' + # with_items: '{{ apps }}' + # loop_control: + # loop_var: app_item diff --git a/ansible/requirements.yml b/ansible/requirements.yml index 0dd768d..4b504a0 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -1,25 +1,9 @@ --- - src: yatesr.timezone - version: 1.0.0 + version: 1.1.0 - src: geerlingguy.security - version: 1.7.0 - -- src: geerlingguy.nginx - version: 2.6.0 - -- src: geerlingguy.php-versions - version: 2.1.2 - -- src: geerlingguy.php - version: 3.6.0 - -- src: geerlingguy.mysql - version: 2.9.0 + version: 1.8.0 - src: geerlingguy.docker - version: 2.5.1 - -- name: thefinn93.ansible-letsencrypt - src: https://github.com/thefinn93/ansible-letsencrypt - version: origin/master + version: 2.5.2