chore: version bump and small fixes

lamassu · Sep 4, 2024 · 3ed7616 · 3ed7616
1 parent bcff8c6
commit 3ed7616
Show file tree

Hide file tree

Showing 18 changed files with 11 additions and 102 deletions.
diff --git a/deploy/codebase/lamassu-machine-manager.js b/deploy/codebase/lamassu-machine-manager.js
@@ -72,6 +72,7 @@ function updateSupervisor (cb) {
           async.apply(command, `cp ${supervisorPath}/* /etc/supervisor/conf.d/`),
           async.apply(command, `sed -i 's|^user=.*\$|user=${osuser}|;' /etc/supervisor/conf.d/lamassu-browser.conf || true`),
           async.apply(command, 'supervisorctl update'),
+          async.apply(command, 'supervisorctl restart all'),
         ], (err) => {
           if (err) throw err;
           cb()

diff --git a/hardware/codebase/upboard/grandola/device_config.json b/hardware/codebase/upboard/grandola/device_config.json
diff --git a/hardware/system/upboard/aveiro/supervisor/conf.d/lamassu-browser.conf b/hardware/system/upboard/aveiro/supervisor/conf.d/lamassu-browser.conf
@@ -1,7 +1,7 @@
 [program:lamassu-browser]
-command=/home/lamassu/chrome-linux/chrome --kiosk --incognito --disable-pinch /opt/lamassu-machine/ui/start.html
+command=/usr/bin/chromium --kiosk --incognito --disable-pinch /opt/lamassu-machine/ui/start.html
 environment=DISPLAY=":0"
-user=lamassu
+user=machine
 autostart=true
 autorestart=true
 stderr_logfile=/var/log/supervisor/lamassu-browser.err.log

diff --git a/hardware/system/upboard/gaia/supervisor/conf.d/lamassu-browser.conf b/hardware/system/upboard/gaia/supervisor/conf.d/lamassu-browser.conf
@@ -1,7 +1,7 @@
 [program:lamassu-browser]
-command=/home/lamassu/chrome-linux/chrome --kiosk --incognito --disable-pinch /opt/lamassu-machine/ui/start.html
+command=/usr/bin/chromium --kiosk --incognito --disable-pinch /opt/lamassu-machine/ui/start.html
 environment=DISPLAY=":0"
-user=lamassu
+user=machine
 autostart=true
 autorestart=true
 stderr_logfile=/var/log/supervisor/lamassu-browser.err.log

diff --git a/hardware/system/upboard/grandola/calibrate-screen.sh b/hardware/system/upboard/grandola/calibrate-screen.sh
diff --git a/hardware/system/upboard/grandola/supervisor/conf.d/lamassu-browser.conf b/hardware/system/upboard/grandola/supervisor/conf.d/lamassu-browser.conf
diff --git a/hardware/system/upboard/grandola/supervisor/conf.d/lamassu-machine.conf b/hardware/system/upboard/grandola/supervisor/conf.d/lamassu-machine.conf
diff --git a/hardware/system/upboard/grandola/supervisor/conf.d/lamassu-updater.conf b/hardware/system/upboard/grandola/supervisor/conf.d/lamassu-updater.conf
diff --git a/hardware/system/upboard/grandola/supervisor/conf.d/lamassu-watchdog.conf b/hardware/system/upboard/grandola/supervisor/conf.d/lamassu-watchdog.conf
diff --git a/hardware/system/upboard/grandola/udev/99-grandola.rules b/hardware/system/upboard/grandola/udev/99-grandola.rules
diff --git a/hardware/system/upboard/grandola/udev/99-i2c.rules b/hardware/system/upboard/grandola/udev/99-i2c.rules
diff --git a/hardware/system/upboard/grandola/udev/99-leds.rules b/hardware/system/upboard/grandola/udev/99-leds.rules
diff --git a/hardware/system/upboard/grandola/udev/99-spi.rules b/hardware/system/upboard/grandola/udev/99-spi.rules
diff --git a/hardware/system/upboard/grandola/udev/99-ttyAMA0.rules b/hardware/system/upboard/grandola/udev/99-ttyAMA0.rules
diff --git a/hardware/system/upboard/sintra/supervisor/conf.d/lamassu-browser.conf b/hardware/system/upboard/sintra/supervisor/conf.d/lamassu-browser.conf
@@ -1,7 +1,7 @@
 [program:lamassu-browser]
-command=/home/lamassu/chrome-linux/chrome --kiosk --incognito --disable-pinch /opt/lamassu-machine/ui/start.html
+command=/usr/bin/chromium --kiosk --incognito --disable-pinch /opt/lamassu-machine/ui/start.html
 environment=DISPLAY=":0"
-user=lamassu
+user=machine
 autostart=true
 autorestart=true
 stderr_logfile=/var/log/supervisor/lamassu-browser.err.log

diff --git a/hardware/system/upboard/tejo/supervisor/conf.d/lamassu-browser.conf b/hardware/system/upboard/tejo/supervisor/conf.d/lamassu-browser.conf
@@ -1,7 +1,7 @@
 [program:lamassu-browser]
-command=/home/lamassu/chrome-linux/chrome --kiosk --incognito --disable-pinch /opt/lamassu-machine/ui/start.html
+command=/usr/bin/chromium --kiosk --incognito --disable-pinch /opt/lamassu-machine/ui/start.html
 environment=DISPLAY=":0"
-user=lamassu
+user=machine
 autostart=true
 autorestart=true
 stderr_logfile=/var/log/supervisor/lamassu-browser.err.log

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "lamassu-machine",
   "license": "./LICENSE",
-  "version": "10.0.0-rc.21",
+  "version": "10.0.0",
   "dependencies": {
     "@apollo/client": "3.7.15",
     "@haensl/subset-sum": "^3.0.5",