From 7a57f22967f189da4b0ae490a2a8d2dcd81a70fa Mon Sep 17 00:00:00 2001
From: shmyga <shmyga.z@gmail.com>
Date: Mon, 26 Mar 2018 17:03:21 +0300
Subject: [PATCH] [ansible] added

---
 .gitignore                                    |  3 +-
 ansible/ansible.cfg                           |  2 +
 ansible/dev/inventory.yml                     |  2 +
 ansible/prod/inventory.yml                    |  2 +
 ansible/roles/user/keys/shmyga.pub            |  1 +
 ansible/roles/user/tasks/main.yml             | 40 +++++++++++++++++++
 ansible/roles/user/vars/main.yml              |  1 +
 ansible/user.yml                              |  4 ++
 .../haxe/ru/m/connect/WebSocketTools.hx       |  4 +-
 9 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 ansible/ansible.cfg
 create mode 100644 ansible/dev/inventory.yml
 create mode 100644 ansible/prod/inventory.yml
 create mode 100644 ansible/roles/user/keys/shmyga.pub
 create mode 100644 ansible/roles/user/tasks/main.yml
 create mode 100644 ansible/roles/user/vars/main.yml
 create mode 100644 ansible/user.yml

diff --git a/.gitignore b/.gitignore
index 5c83c12..0a45a98 100755
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,5 @@ out/
 config.json
 package-lock.json
 /node_modules
-/log
\ No newline at end of file
+/log
+/ansible/*.retry
\ No newline at end of file
diff --git a/ansible/ansible.cfg b/ansible/ansible.cfg
new file mode 100644
index 0000000..be1e477
--- /dev/null
+++ b/ansible/ansible.cfg
@@ -0,0 +1,2 @@
+[defaults]
+hash_behaviour = merge
diff --git a/ansible/dev/inventory.yml b/ansible/dev/inventory.yml
new file mode 100644
index 0000000..47e4ee3
--- /dev/null
+++ b/ansible/dev/inventory.yml
@@ -0,0 +1,2 @@
+all:
+  hosts: localhost
diff --git a/ansible/prod/inventory.yml b/ansible/prod/inventory.yml
new file mode 100644
index 0000000..51ba5b9
--- /dev/null
+++ b/ansible/prod/inventory.yml
@@ -0,0 +1,2 @@
+all:
+  hosts: shmyga.ru
diff --git a/ansible/roles/user/keys/shmyga.pub b/ansible/roles/user/keys/shmyga.pub
new file mode 100644
index 0000000..de37670
--- /dev/null
+++ b/ansible/roles/user/keys/shmyga.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCot1zSeqj7Tj5/7aNMzXAuXQPPxudYFV9z6M03dPijh2bXyHDcXk53xUO8XY5R4GyLhvAn98axbPM++urKY8BXuQqAG36soI7iZJ/KcPY1EKDwVBeZneFC/wMc8HMT0hj9+uHcGAMtmklIgPPkawzLxbEh6oAY4H8Vvz08qyco6suYB5NjkpFwVMf9Xa2Fj8rTodKpPRDBh/Xk+5bh11RKL6b9WcwuwpKU8zl2qZiqNfjr0H+sKEk7ohcYvzSCltLdKJcoKbiCcnrnBJT5/JpGWeAbA2MMmvmt/dJrHykd1CbmXW2DuG4tIlwMb5xU739PoKCePctK1retb8TrWOLT shmyga@shmyga-desktop
diff --git a/ansible/roles/user/tasks/main.yml b/ansible/roles/user/tasks/main.yml
new file mode 100644
index 0000000..7c509d0
--- /dev/null
+++ b/ansible/roles/user/tasks/main.yml
@@ -0,0 +1,40 @@
+# barin
+- name: Make barin group
+  group:
+    name: barin
+    state: present
+
+- name: Make barin user
+  user:
+    name: barin
+    group: barin
+    password: '$6$mbw5KZWwtrRUy$eFcMNTW.QzG1Em45r5hZf/qri4hKAHImozWuW4/pYnDK.tOrVKrXTKYfRDtYEFRgCgVVg0zuPvyq/xn0KiKlz0'
+    groups: www-data,sudo,adm
+
+- name: Set up authorized_keys for the barin user
+  authorized_key:
+    user: barin
+    key: '{{ item }}'
+  with_file:
+  - keys/shmyga.pub
+
+
+# holop
+- name: Make holop group
+  group:
+    name: holop
+    state: present
+
+- name: Make holop user
+  user:
+    name: holop
+    group: holop
+    password: '$6$B/7g0xlcXFCIHk$hzSjb8KLll7YrTsp3z640sxNixNAkLpm6UUdZgWPh0Ffy7Ue18AiXTzkDdGTaTH6Woz4kvgVDSggnKGTU6u03.'
+    groups: www-data
+
+- name: Set up authorized_keys for the holop user
+  authorized_key:
+    user: holop
+    key: '{{ item }}'
+  with_file:
+  - keys/shmyga.pub
\ No newline at end of file
diff --git a/ansible/roles/user/vars/main.yml b/ansible/roles/user/vars/main.yml
new file mode 100644
index 0000000..c23ca56
--- /dev/null
+++ b/ansible/roles/user/vars/main.yml
@@ -0,0 +1 @@
+ansible_become: yes
\ No newline at end of file
diff --git a/ansible/user.yml b/ansible/user.yml
new file mode 100644
index 0000000..5542483
--- /dev/null
+++ b/ansible/user.yml
@@ -0,0 +1,4 @@
+- hosts: all
+  gather_facts: no
+  roles:
+    - user
diff --git a/src/common/haxe/ru/m/connect/WebSocketTools.hx b/src/common/haxe/ru/m/connect/WebSocketTools.hx
index 8fca031..88c303f 100644
--- a/src/common/haxe/ru/m/connect/WebSocketTools.hx
+++ b/src/common/haxe/ru/m/connect/WebSocketTools.hx
@@ -18,10 +18,8 @@ class WebSocketTools {
 
     public static function string2packet<P:Message>(data:String, packetClass:Class<P>):P {
         var bytes = Base64.decodeBase64(data);
-        var family = bytes.get(0);
-        var id = bytes.get(1);
         var packet:P = Type.createInstance(packetClass, []);
-        packet.mergeFrom(bytes.sub(2, bytes.length - 2));
+        packet.mergeFrom(bytes);
         return packet;
     }
 }
\ No newline at end of file