[ansible] update roles

ansible/ansible.cfg

@@ -1,7 +1,7 @@
 [defaults]
 hash_behaviour = merge
 host_key_checking = False
-callback_whitelist = profile_tasks
+#callback_whitelist = profile_tasks
 display_skipped_hosts = False
 
 [ssh_connection]

ansible/deploy.yml

@@ -1,12 +1,14 @@
+---
 - hosts: all
   vars:
-    ansible_user: holop
+    ansible_user: "{{ deploy_user }}"
-    deploy_project: tankz
-    deploy_repo_url: git@bitbucket.org:infernalgames/tankz.git
-    deploy_repo_version: ansible
-    deploy_npm: yes
-    deploy_config: yes
-    deploy_gulp: yes
-    deploy_service: yes
   roles:
     - ansible-deploy
+    - build
+  post_tasks:
+    - include_role:
+        name: ansible-deploy
+        tasks_from: complete.yml
+    - include_role:
+        name: service
+        tasks_from: restart.yml

ansible/group_vars/all.yml

@@ -1,3 +1,15 @@
-project_name: "tankz"
+---
-project_smartname: "Tank'z"
+project_name: tankz
-project_dir: "/home/holop/{{ project_name }}"
+project_user: holop
+
+deploy_user: "{{ project_user }}"
+deploy_project: "{{ project_name }}"
+deploy_repo_url: "git@bitbucket.org:infernalgames/{{ project_name }}.git"
+deploy_repo_version: ansible
+deploy_npm: yes
+
+service_name: "{{ project_name }}"
+service_work_dir: "{{ deploy_current_dir }}/target"
+service_command: "/usr/bin/neko {{ deploy_current_dir }}/target/{{ project_name }}.n {{ service_host }}"
+service_user: www-data
+service_control_user: "{{ project_user }}"

ansible/requirements.yml

@@ -1,5 +1,7 @@
 ---
-- src: git@bitbucket.org:shmyga/ansible-deploy.git
+- name: ansible-deploy
-  name: ansible-deploy
+  src: git@bitbucket.org:shmyga/ansible-deploy.git
   version: master
   scm: git
+
+- name: geerlingguy.nodejs

ansible/roles/build/tasks/main.yml

@@ -0,0 +1,11 @@
+---
+- name: "Copy config"
+  copy:
+    src: "{{ deploy_release_dir }}/config.{{ inventory_hostname }}.json"
+    dest: "{{ deploy_release_dir }}/config.json"
+    remote_src: true
+
+- name: "Gulp build"
+  command: "/usr/local/bin/gulp default"
+  args:
+    chdir: "{{ deploy_release_dir }}"

ansible/roles/service/defaults/main.yml

@@ -0,0 +1,6 @@
+service_name: null
+service_description: "{{ service_name }} service"
+service_work_dir: null
+service_command: null
+service_user: null
+service_control_user: null

ansible/roles/service/tasks/main.yml

@@ -1,3 +1,4 @@
+---
 - name: "Install {{ service_name }} systemd unit file"
   template:
     src: "template/service.j2"

ansible/roles/service/tasks/restart.yml

@@ -0,0 +1,11 @@
+---
+# - name: "Restart {{ service_name }} service"
+#   systemd:
+#     enabled: yes
+#     state: restarted
+#     name: "{{ service_name }}"
+
+- name: "Restart {{ service_name }} service"
+  command: "sudo /bin/systemctl restart {{ service_name }}"
+  args:
+    warn: no

ansible/roles/setup/defaults/main.yml

@@ -1 +0,0 @@
-service_host: localhost

ansible/roles/setup/tasks/apt.yml

@@ -1,10 +1,3 @@
-- name: Install the package "Neko"
+- name: "Install neko package"
   apt:
-    name: 'neko'
+    name: neko
-
-- name: Install the package "Node"
-  apt:
-    name: '{{ item }}'
-  with_items:
-    - nodejs
-    - npm

ansible/roles/setup/tasks/main.yml

@@ -1,6 +1,2 @@
 - import_tasks: apt.yml
   when: ansible_distribution|lower == 'ubuntu'
-
-- import_tasks: npm.yml
-
-- import_tasks: service.yml

ansible/roles/setup/tasks/npm.yml

@@ -1,4 +0,0 @@
-- name: Install "gulp-cli" node.js package globally.
-  npm:
-    name: gulp-cli
-    global: yes

ansible/roles/setup/vars/main.yml

@@ -1,10 +0,0 @@
-ansible_become: yes
-ansible_user: barin
-ansible_become_pass: 1234!QAZ
-
-service_name: "{{ project_name }}"
-service_description: "{{ project_smartname }} server"
-service_work_dir: "{{ project_dir }}/current/target"
-service_command: "/usr/bin/neko {{ project_dir }}/current/target/{{ project_name }}.n {{ service_host }}"
-service_user: www-data
-service_control_user: holop

ansible/service.yml

@@ -0,0 +1,8 @@
+---
+- hosts: all
+  vars:
+    ansible_user: "{{ deploy_user }}"
+  tasks:
+    - include_role:
+        name: service
+        tasks_from: restart.yml

ansible/setup.yml

@@ -1,3 +1,16 @@
-- hosts: all
+---
+- hosts:
+    - all
+  pre_tasks:
+    - include_role:
+        name: ansible-deploy
+        tasks_from: facts.yml
   roles:
+    - geerlingguy.nodejs
     - setup
+    - service
+  vars:
+    nodejs_version: 9.x
+    nodejs_npm_global_packages: [gulp-cli]
+  vars_files:
+    - vars/barin.yml

ansible/vars/barin.yml

@@ -0,0 +1,4 @@
+---
+ansible_user: barin
+ansible_become_pass: 1234!QAZ
+ansible_become: yes