Reconfigure vagrant

ansible/provision.yml

@@ -0,0 +1,16 @@
+---
+- hosts: all
+
+  vars_files:
+    - vars/all.yml
+
+  pre_tasks:
+    - name: Ensure that PHP Ondrej PPA is added
+      apt_repository: repo=ppa:ondrej/php state=present
+
+  roles:
+    - yatesr.timezone
+    - server
+    - geerlingguy.nginx
+    - nginx
+    - geerlingguy.php

ansible/requirements.yml

@@ -0,0 +1,13 @@
+---
+- src: yatesr.timezone
+  version: 1.0.0
+
+- src: geerlingguy.nginx
+  version: 1.9.6
+
+- src: geerlingguy.php
+  version: 3.4.2
+
+- src: geerlingguy.composer
+  version: 1.5.0
+

ansible/roles/nginx/handlers/main.yml

@@ -1,3 +0,0 @@
----
-- name: restart nginx
-  service: name=nginx enabled=yes state=restarted

ansible/roles/nginx/tasks/main.yml

@@ -1,33 +1,6 @@
 ---
-- name: Install Nginx
-  become: yes
-  apt: pkg=nginx state=latest
-
-- name: Create nginx congig
-  become: yes
+- name: Create nginx config
   template:
-    src: homepage.j2
-    dest: /etc/nginx/sites-available/{{ site.domain }}
-  notify: restart nginx
-
-- name: Create symlink to site
-  become: yes
-  file:
-    src: /etc/nginx/sites-available/{{ site.domain }}
-    dest: /etc/nginx/sites-enabled/{{ site.domain }}
-    state: link
-  notify: restart nginx
-
-- name: Delete default site
-  become: yes
-  file:
-    path: /etc/nginx/sites-available/default
-    state: absent
-  notify: restart nginx
-
-- name: Delete default site symlink
-  become: yes
-  file:
-    path: /etc/nginx/sites-enabled/default
-    state: absent
+    src: site.conf.j2
+    dest: /etc/nginx/sites-enabled/{{ nginx_conf_name }}
   notify: restart nginx

ansible/roles/nginx/templates/homepage.j2

@@ -1,10 +0,0 @@
-server {
-    listen 80;
-    server_name {{ site.domain }} www.{{ site.domain }};
-
-    location / {
-        root /var/www/{{ site.www_dir }}/current/web;
-        index index.html;
-        try_files $uri /index.html;
-    }
-}

ansible/roles/nginx/templates/site.conf.j2

@@ -0,0 +1,12 @@
+server {
+    listen 80;
+    server_name {{ nginx_conf_domain }} www.{{ nginx_conf_domain }};
+
+    location / {
+        root {{ nginx_conf_root }};
+        index index.html;
+        try_files $uri /index.html;
+    }
+
+    sendfile off;
+}

ansible/roles/server/tasks/main.yml

@@ -1,9 +1,9 @@
 ---
-- name: Update apt
+- name: Update apt cache
   sudo: yes
   apt: update_cache=yes
 
-- name: Install System Packages
+- name: Install system packages
   sudo: yes
   apt: pkg={{ item }} state=latest
   with_items:
@@ -11,15 +11,3 @@
     - wget
     - python-software-properties
     - git
-
-- name: Configure the timezone
-  sudo: yes
-  template: src=timezone.j2 dest=/etc/timezone
-
-- name: Configure the timezone
-  sudo: yes
-  file: src=/usr/share/zoneinfo/{{ server.timezone }} dest=/etc/localtime state=link force=yes backup=yes
-
-- name: Set default system language pack
-  shell: locale-gen {{ server.locale }}
-  sudo: yes

ansible/roles/server/templates/timezone.j2

@@ -1 +0,0 @@
-{{ server.timezone }}

ansible/setup.yml

@@ -1,12 +0,0 @@
----
-- hosts: all
-
-  become: true
-  become_method: sudo
-
-  vars_files:
-    - vars/all.yml
-
-  roles:
-    - server
-    - nginx

ansible/vars/all.yml

@@ -1,17 +1,30 @@
 ---
-server:
-  timezone: UTC
-  locale: en_US.UTF-8
+application_root: /vagrant
 
 site:
   www_dir: anwinged
   domain: anwinged.ru
+  conf_name: anwinged.conf
 
+timezone: UTC
+
+nginx_conf_name: 'anwinged.conf'
+nginx_conf_root: '{{ application_root }}/output_dev'
+nginx_conf_domain: 'anwinged'
+
+nginx_remove_default_vhost: true
+
+php_enable_webserver: false
+php_packages:
+  - php7.1
+  - php7.1-mbstring
+  - php7.1-intl
+  - php7.1-curl
+  - php7.1-xml 
 
 # Vars for ansistrano
 
-ansistrano_deploy_from: "{{ playbook_dir }}/../web"
+ansistrano_deploy_from: "{{ playbook_dir }}/../output_prod"
 ansistrano_deploy_to: "/var/www/{{ site.www_dir }}"
 ansistrano_keep_releases: 3
 ansistrano_deploy_via: copy
-