diff --git a/ansible/roles/service/tasks/main.yml b/ansible/roles/service/tasks/main.yml new file mode 100644 index 0000000..96d832d --- /dev/null +++ b/ansible/roles/service/tasks/main.yml @@ -0,0 +1,5 @@ +- name: install tankz systemd unit file + template: src=template/tankz.j2 dest=/etc/systemd/system/tankz.service + +- name: start tankz + systemd: state=started name=tankz daemon_reload=yes \ No newline at end of file diff --git a/ansible/roles/service/template/tankz.j2 b/ansible/roles/service/template/tankz.j2 new file mode 100644 index 0000000..37dddcb --- /dev/null +++ b/ansible/roles/service/template/tankz.j2 @@ -0,0 +1,16 @@ +[Unit] +Description=Tank'z game server + +[Service] +Type=simple +PIDFile=/var/run/tankz.pid +WorkingDirectory=/home/holop/repo/tankz/current/target +User=www-data +Group=www-data +ExecStart=/usr/bin/neko /home/holop/repo/tankz/current/target/tankz.n +TimeoutSec=300 +Restart=always + + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/ansible/roles/service/vars/main.yml b/ansible/roles/service/vars/main.yml new file mode 100644 index 0000000..57b4f52 --- /dev/null +++ b/ansible/roles/service/vars/main.yml @@ -0,0 +1,3 @@ +ansible_become: yes +ansible_user: barin +ansible_become_pass: 1234!QAZ \ No newline at end of file diff --git a/ansible/setup.yml b/ansible/setup.yml new file mode 100644 index 0000000..cfde54e --- /dev/null +++ b/ansible/setup.yml @@ -0,0 +1,3 @@ +- hosts: all + roles: + - service diff --git a/config/deploy/develop.rb b/config/deploy/dev.rb similarity index 90% rename from config/deploy/develop.rb rename to config/deploy/dev.rb index e885918..f14e688 100644 --- a/config/deploy/develop.rb +++ b/config/deploy/dev.rb @@ -2,7 +2,7 @@ role :app, %w{localhost} role :web, %w{localhost} role :db, %w{localhost} -set :user, ENV['USER'] +#set :user, ENV['USER'] user = fetch(:user) server 'localhost', ssh_options: { port: 22, user: user, forward_agent: true } diff --git a/config/deploy/production.rb b/config/deploy/prod.rb similarity index 100% rename from config/deploy/production.rb rename to config/deploy/prod.rb diff --git a/src/common/haxe/ru/m/connect/js/JsConnection.hx b/src/common/haxe/ru/m/connect/js/JsConnection.hx index db3edab..63012a6 100644 --- a/src/common/haxe/ru/m/connect/js/JsConnection.hx +++ b/src/common/haxe/ru/m/connect/js/JsConnection.hx @@ -30,7 +30,7 @@ class JsConnection extends BaseConnection { } private function buildSocket(host:String, port:Int):WebSocket { - return untyped __js__("new WebSocket('ws://'+host+':'+port);"); + return untyped __js__('new WebSocket("ws://${host}:${port}");'); } override public function connect():Promise> {