From 7de1897b3208d8b9738e8d12943e05ec6a4fb26c Mon Sep 17 00:00:00 2001
From: shmyga <shmyga.z@gmail.com>
Date: Tue, 8 Oct 2019 17:52:16 +0300
Subject: [PATCH] [build] android keystore

---
 ansible/prod/inventory.yml            |  1 +
 ansible/roles/build/defaults/main.yml |  2 ++
 ansible/roles/build/tasks/main.yml    |  6 +++---
 config.example.json                   | 10 +++++-----
 config.shmyga.ru.json                 |  9 ---------
 gulpfile.js                           |  1 +
 package.json                          |  4 ++--
 7 files changed, 14 insertions(+), 19 deletions(-)
 create mode 100644 ansible/roles/build/defaults/main.yml
 delete mode 100644 config.shmyga.ru.json

diff --git a/ansible/prod/inventory.yml b/ansible/prod/inventory.yml
index 788a14d..f5bc6fe 100644
--- a/ansible/prod/inventory.yml
+++ b/ansible/prod/inventory.yml
@@ -2,3 +2,4 @@ all:
   hosts: shmyga.ru
   vars:
     service_host: 172.31.1.100
+    config_src: "/home/holop/tankz/config.json"
diff --git a/ansible/roles/build/defaults/main.yml b/ansible/roles/build/defaults/main.yml
new file mode 100644
index 0000000..e711e90
--- /dev/null
+++ b/ansible/roles/build/defaults/main.yml
@@ -0,0 +1,2 @@
+config_src: "{{ deploy_release_dir }}/config.{{ inventory_hostname }}.json"
+config_dest: "{{ deploy_release_dir }}/config.json"
diff --git a/ansible/roles/build/tasks/main.yml b/ansible/roles/build/tasks/main.yml
index ab426cc..de88acc 100644
--- a/ansible/roles/build/tasks/main.yml
+++ b/ansible/roles/build/tasks/main.yml
@@ -1,11 +1,11 @@
 ---
 - name: "Copy config"
   copy:
-    src: "{{ deploy_release_dir }}/config.{{ inventory_hostname }}.json"
-    dest: "{{ deploy_release_dir }}/config.json"
+    src: "{{ config_src }}"
+    dest: "{{ config_dest }}"
     remote_src: true
 
 - name: "Gulp build"
-  command: "/usr/local/lib/npm/bin/gulp default --host shmyga.ru"
+  command: "{{ deploy_release_dir }}/node_modules/.bin/gulp default --host shmyga.ru"
   args:
     chdir: "{{ deploy_release_dir }}"
diff --git a/config.example.json b/config.example.json
index a9bcd6b..ec816dc 100755
--- a/config.example.json
+++ b/config.example.json
@@ -2,9 +2,9 @@
     "SdkDir": "C:\\sdk",
     "PublishDir": "",
     "PublishUrl": "https://shmyga.ru/repo/tankz",
-    "SSH": {
-        "PrivateKey": null,
-        "Passphrase": null
-    },
-    "Develop": false
+    "Develop": false,
+    "Key": {
+        "store": "keystore.jks",
+        "pass": null
+    }
 }
diff --git a/config.shmyga.ru.json b/config.shmyga.ru.json
deleted file mode 100644
index 7037124..0000000
--- a/config.shmyga.ru.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "SdkDir": "/home/holop/sdk",
-    "PublishDir": "/opt/repo/tankz",
-    "PublishUrl": "https://shmyga.ru/repo/tankz",
-    "SSH": {
-        "PrivateKey": null,
-        "Passphrase": null
-    }
-}
diff --git a/gulpfile.js b/gulpfile.js
index 56e0d1c..495fccf 100755
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -36,6 +36,7 @@ const config = new Project.Config({
         company: 'MegaLoMania',
         version: packageInfo.version + (Config.Develop ? '-SNAPSHOT' : ''),
     },
+    key: Config.Key,
     libs: packageInfo.haxeDependencies,
     sources: [
         'src/common/haxe',
diff --git a/package.json b/package.json
index 19fe958..8e28731 100755
--- a/package.json
+++ b/package.json
@@ -1,13 +1,13 @@
 {
     "name": "tankz",
-    "version": "0.17.4",
+    "version": "0.17.5",
     "private": true,
     "devDependencies": {
         "dateformat": "^3.0.3",
         "gulp": "^4.0.0",
         "gulp-add": "0.0.2",
         "gulp-clean": "^0.4.0",
-        "gulp-haxetool": "0.1.0",
+        "gulp-haxetool": "0.1.1",
         "yargs": "^13.2.4"
     },
     "haxeDependencies": {