Merge branch 'master' of https://github.com/FTSRG/BME-MODES3

Author: hegyibalint

.gitattributes

@@ -1,3 +1,2 @@
 *.jar filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
-*.png filter=lfs diff=lfs merge=lfs -text

config-management/ansible/deploy-bbb.retry

@@ -0,0 +1,6 @@
+t1.modes3.intra
+t2.modes3.intra
+t3.modes3.intra
+t4.modes3.intra
+t5.modes3.intra
+t6.modes3.intra

config-management/ansible/deploy-bbb.yaml

@@ -2,4 +2,4 @@
 - hosts: bbb
   remote_user: debian
   tasks:
-  - include: deploy.yaml service_name=bbb
+  - include: utils/deploy-gradle.yaml service_name=bbb

config-management/ansible/deploy-root.yaml

@@ -2,7 +2,7 @@
 - hosts: root
   remote_user: pi
   tasks:
-  - debug: msg="Installing dashboard"
-  - include: deploy.yaml service_name=dashboard
-  - debug: msg="Installing occupancyquery"
-  - include: deploy.yaml service_name=occupancyquery
+  - include: utils/deploy-gradle.yaml service_name=dashboard
+  - include: utils/deploy-gradle.yaml service_name=occupancyquery
+  - include: utils/deploy-gradle.yaml service_name=touchboard
+  - include: utils/deploy-systemd.yaml service_name=xpressnet

config-management/ansible/files/modes3-bbb.service

@@ -1,10 +1,11 @@
 [Unit]
 Description=MoDeS3 BBB Agent
-Wants=network-online.target
+After=syslog.target network.target 
 
 [Service]
-ExecStart=/modes3/hu.bme.mit.inf.modes3.components.bbb/bin/hu.bme.mit.inf.modes3.components.bbb --id %H --addr root.modes3.intra --port 1883
+ExecStartPre=/bin/bash -c "/bin/systemctl set-environment HOSTNAME=$(hostname)"
+ExecStart=/modes3/hu.bme.mit.inf.modes3.components.bbb/bin/hu.bme.mit.inf.modes3.components.bbb --id $HOSTNAME --addr root.modes3.intra --port 1883
 Restart=always
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

config-management/ansible/files/modes3-dashboard.service

@@ -1,6 +1,6 @@
 [Unit]
 Description=MoDeS3 Dashboard Server
-Wants=network-online.target
+After=syslog.target network.target mosquitto.service
 
 [Service]
 ExecStart=/modes3/hu.bme.mit.inf.modes3.components.dashboard/bin/hu.bme.mit.inf.modes3.components.dashboard -id dashboard -address root.modes3.intra -port 1883 -config production

config-management/ansible/files/modes3-occupancyquery.service

@@ -1,9 +1,9 @@
 [Unit]
 Description=MoDeS3 Occupancy Detector Agent
-Wants=network-online.target
+After=syslog.target network.target mosquitto.service
 
 [Service]
-ExecStart=/modes3/hu.bme.mit.inf.modes3.components.occupancyquery/bin/hu.bme.mit.inf.modes3.components.occupancyquery -id occupancy -address root.modes3.intra -port 1883 -config production
+ExecStart=/modes3/hu.bme.mit.inf.modes3.components.occupancyquery/bin/hu.bme.mit.inf.modes3.components.occupancyquery -id occupancy -address root.modes3.intra -port 1883 -config production -serial /dev/ttyUSB0
 Restart=always
 
 [Install]

config-management/ansible/files/modes3-touchboard.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=MoDeS3 Touchboard
+After=syslog.target network.target mosquitto.service
+
+[Service]
+ExecStart=/modes3/hu.bme.mit.inf.modes3.components.touchboard/bin/hu.bme.mit.inf.modes3.components.touchboard -id touchboard -address root.modes3.intra -port 1883 -config production
+Restart=always
+
+[Install]
+WantedBy=multi-user.target

config-management/ansible/files/modes3-xpressnet.service

@@ -1,9 +1,9 @@
 [Unit]
 Description=MoDeS3 XpressNet Bridge Agent
-Wants=network-online.target
+After=syslog.target network.target mosquitto.service
 
 [Service]
-ExecStart=/modes3/hu.bme.mit.inf.modes3.components.xpressnetbridge/xpressnetbridge
+ExecStart=/modes3/hu.bme.mit.inf.modes3.components.xpressnet/xpressnetbridge
 Restart=always
 
 [Install]

config-management/ansible/deploy.yaml renamed to config-management/ansible/utils/deploy-gradle.yaml

@@ -1,30 +1,32 @@
 ---
-- name: Stop the service if running
+- name: Stop the {{service_name}} service
   systemd:
+    daemon_reload: yes
+    enabled: yes
     state: stopped
     name: "modes3-{{service_name}}"
   become: true
-  ignore_errors: yes
-- name: Create the root folder containing the binaries
+- name: Create the root folder containing the {{service_name}} binaries
   file: 
     path: /modes3/ 
     state: directory
     owner: root
     group: root
-    mode: 0775
+    mode: 0755
   become: true
-- name: "Deploy the service distribution"
+- name: "Deploy the {{service_name}} service distribution"
   unarchive:
     src: "{{playbook_dir}}/../../src/java/components/hu.bme.mit.inf.modes3.components.{{service_name}}/build/distributions/hu.bme.mit.inf.modes3.components.{{service_name}}.tar"
     dest: /modes3
   become: true
-- name: Copy the new systemd unit
+- name: Copy the new {{service_name}} systemd unit
   copy:
     src: "{{playbook_dir}}/files/modes3-{{service_name}}.service"
     dest: "/etc/systemd/system/modes3-{{service_name}}.service"
-    mode: 0644
+    mode: 0755
+    force: yes
   become: true
-- name: Enable and start the service
+- name: Enable and start the {{service_name}} service
   systemd:
     daemon_reload: yes
     enabled: yes