Настроено развертывание docker
This commit is contained in:
		
							
								
								
									
										5
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										5
									
								
								Makefile
									
									
									
									
									
								
							| @@ -1,5 +1,7 @@ | |||||||
| install-roles: | install-roles: | ||||||
| 	ansible-galaxy install -r "ansible/requirements.yml" | 	ansible-galaxy install \ | ||||||
|  | 		-r "ansible/requirements.yml" \ | ||||||
|  | 		--force | ||||||
|  |  | ||||||
| rebuild-test-machine: | rebuild-test-machine: | ||||||
| 	vagrant destroy -f && vagrant up | 	vagrant destroy -f && vagrant up | ||||||
| @@ -32,6 +34,7 @@ dry-run: | |||||||
| 		ansible/configuration.yml | 		ansible/configuration.yml | ||||||
|  |  | ||||||
| configure-test: | configure-test: | ||||||
|  | 	ANSIBLE_HOST_KEY_CHECKING=False \ | ||||||
| 	ansible-playbook \ | 	ansible-playbook \ | ||||||
| 		--inventory "ansible/hosts_vagrant" \ | 		--inventory "ansible/hosts_vagrant" \ | ||||||
| 		--extra-vars 'ansible_python_interpreter=/usr/bin/python3' \ | 		--extra-vars 'ansible_python_interpreter=/usr/bin/python3' \ | ||||||
|   | |||||||
							
								
								
									
										6
									
								
								Vagrantfile
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								Vagrantfile
									
									
									
									
										vendored
									
									
								
							| @@ -1,19 +1,15 @@ | |||||||
| # -*- mode: ruby -*- | # -*- mode: ruby -*- | ||||||
| # vi: set ft=ruby : | # vi: set ft=ruby : | ||||||
|  |  | ||||||
|  |  | ||||||
| # Этот файл предназначен для запуска тестовой виртуальной машины, | # Этот файл предназначен для запуска тестовой виртуальной машины, | ||||||
| # на которой можно обкатать роли для настройки сервера. | # на которой можно обкатать роли для настройки сервера. | ||||||
|  |  | ||||||
|  |  | ||||||
| ENV["LC_ALL"] = "en_US.UTF-8" | 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| | 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" |   config.vm.network "private_network", ip: "192.168.50.10" | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,7 +1,4 @@ | |||||||
| --- | --- | ||||||
|  |  | ||||||
| # v3, nginx, docker |  | ||||||
|  |  | ||||||
| - hosts: all | - hosts: all | ||||||
|  |  | ||||||
|   vars_files: |   vars_files: | ||||||
| @@ -21,37 +18,18 @@ | |||||||
|         security_autoupdate_enabled: false |         security_autoupdate_enabled: false | ||||||
|         security_fail2ban_enabled: false |         security_fail2ban_enabled: false | ||||||
|  |  | ||||||
|     - include_role: |  | ||||||
|         name: geerlingguy.nginx |  | ||||||
|       vars: |  | ||||||
|         nginx_remove_default_vhost: true |  | ||||||
|  |  | ||||||
|     - include_role: |     - include_role: | ||||||
|         name: geerlingguy.docker |         name: geerlingguy.docker | ||||||
|       vars: |       vars: | ||||||
|         docker_users: '{{ apps | map(attribute="username") | list }}' |         docker_users: '{{ apps | map(attribute="username") | list }}' | ||||||
|  |  | ||||||
|     - include_role: |     # - include_role: | ||||||
|         name: docker-app |     #     name: docker-app | ||||||
|       private: yes |     #   private: yes | ||||||
|       vars: |     #   vars: | ||||||
|         username: '{{ app_item.username }}' |     #     username: '{{ app_item.username }}' | ||||||
|         ssh_keys: '{{ app_item.ssh_keys | default([]) }}' |     #     ssh_keys: '{{ app_item.ssh_keys | default([]) }}' | ||||||
|         env: '{{ app_item.env | default({}) }}' |     #     env: '{{ app_item.env | default({}) }}' | ||||||
|       with_items: '{{ apps }}' |     #   with_items: '{{ apps }}' | ||||||
|       loop_control: |     #   loop_control: | ||||||
|         loop_var: app_item |     #     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 |  | ||||||
|   | |||||||
| @@ -1,25 +1,9 @@ | |||||||
| --- | --- | ||||||
| - src: yatesr.timezone | - src: yatesr.timezone | ||||||
|   version: 1.0.0 |   version: 1.1.0 | ||||||
|  |  | ||||||
| - src: geerlingguy.security | - src: geerlingguy.security | ||||||
|   version: 1.7.0 |   version: 1.8.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 |  | ||||||
|  |  | ||||||
| - src: geerlingguy.docker | - src: geerlingguy.docker | ||||||
|   version: 2.5.1 |   version: 2.5.2 | ||||||
|  |  | ||||||
| - name: thefinn93.ansible-letsencrypt |  | ||||||
|   src: https://github.com/thefinn93/ansible-letsencrypt |  | ||||||
|   version: origin/master |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user