Added a service wrapper (currently a placeholder) and changed snapcraft file back to just specifying 1 service

This commit is contained in:
Tim Edwards 2019-05-09 01:54:16 +02:00
parent ddd7e6de12
commit cdf6ebc219
3 changed files with 22 additions and 23 deletions

10
snap/hooks/configure vendored Normal file
View File

@ -0,0 +1,10 @@
#!/bin/sh -e
# Obtain sleep-time value
sleep_time="$(snapctl get sleep-time)"
# Validate it
if ! expr "$sleep_time" : '^[0-9]*$' > /dev/null; then
echo "\"$sleep_time\" is not a valid sleep time" >&2
exit 1
fi

View File

@ -11,35 +11,21 @@ confinement: strict
parts: parts:
novnc: novnc:
source: https://github.com/novnc/noVNC.git #https://github.com/novnc/noVNC/archive/v$SNAPCRAFT_PROJECT_VERSION.tar.gz source: https://github.com/tkedwards/noVNC.git # https://github.com/novnc/noVNC.git #https://github.com/novnc/noVNC/archive/v$SNAPCRAFT_PROJECT_VERSION.tar.gz
plugin: dump plugin: dump
source-branch: snap_package
stage-packages: stage-packages:
- websockify - websockify
hooks:
configure:
plugs: [network, network-bind]
apps: apps:
novnc: novnc:
command: utils/launch.sh command: utils/launch.sh
plugs: [network, network-bind] plugs: [network, network-bind]
n5900: novncsvc:
command: utils/launch.sh --vnc localhost:5900 --listen 6080 command: utils/svc_wrapper.py
daemon: simple
plugs: [network, network-bind]
n5901:
command: utils/launch.sh --vnc localhost:5901 --listen 6081
daemon: simple
plugs: [network, network-bind]
n5902:
command: utils/launch.sh --vnc localhost:5902 --listen 6082
daemon: simple
plugs: [network, network-bind]
n5903:
command: utils/launch.sh --vnc localhost:5903 --listen 6083
daemon: simple
plugs: [network, network-bind]
n5904:
command: utils/launch.sh --vnc localhost:5904 --listen 6084
daemon: simple
plugs: [network, network-bind]
n5905:
command: utils/launch.sh --vnc localhost:5905 --listen 6085
daemon: simple daemon: simple
plugs: [network, network-bind] plugs: [network, network-bind]

3
utils/svc_wrapper.py Executable file
View File

@ -0,0 +1,3 @@
#!/usr/bin/env python3