Fabio/hassio-supervised-installer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

use templates and always adjust paths

Browse source 
This prepares for further customization of file locations.
This commit is contained in:
Stefan Agner 2019-07-19 23:03:13 +02:00
parent 429bb2c999
commit b7fa6c0030
5 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
files/hassio-apparmor
View file

@ -2,7 +2,7 @@
set -e set -e
# Load configs # Load configs
CONFIG_FILE=/etc/hassio.json CONFIG_FILE=%%HASSIO_CONFIG%%
# Read configs # Read configs
DATA="$(jq --raw-output '.data // "/usr/share/hassio"' ${CONFIG_FILE})" DATA="$(jq --raw-output '.data // "/usr/share/hassio"' ${CONFIG_FILE})"

2
files/hassio-apparmor.service
View file

@ -1,7 +1,7 @@
[Unit] [Unit]
Description=Hass.io AppArmor Description=Hass.io AppArmor
Wants=hassio-supervisor.service Wants=hassio-supervisor.service
Before=docker.service hassio-supervisor.service Before=%%DOCKER_SERVICE%% hassio-supervisor.service
[Service] [Service]
Type=oneshot Type=oneshot

2
files/hassio-supervisor
View file

@ -2,7 +2,7 @@
set -e set -e
# Load configs # Load configs
CONFIG_FILE=/etc/hassio.json CONFIG_FILE=%%HASSIO_CONFIG%%
SUPERVISOR="$(jq --raw-output '.supervisor' ${CONFIG_FILE})" SUPERVISOR="$(jq --raw-output '.supervisor' ${CONFIG_FILE})"
HOMEASSISTANT="$(jq --raw-output '.homeassistant' ${CONFIG_FILE})" HOMEASSISTANT="$(jq --raw-output '.homeassistant' ${CONFIG_FILE})"

8
files/hassio-supervisor.service
View file

@ -1,15 +1,15 @@
[Unit] [Unit]
Description=Hass.io supervisor Description=Hass.io supervisor
Requires=docker.service Requires=%%DOCKER_SERVICE%%
After=docker.service dbus.socket After=%%DOCKER_SERVICE%% dbus.socket
[Service] [Service]
Type=simple Type=simple
Restart=always Restart=always
RestartSec=5s RestartSec=5s
ExecStartPre=-/usr/bin/docker stop hassio_supervisor ExecStartPre=-%%DOCKER_BINARY%% stop hassio_supervisor
ExecStart=/usr/sbin/hassio-supervisor ExecStart=/usr/sbin/hassio-supervisor
ExecStop=-/usr/bin/docker stop hassio_supervisor ExecStop=-%%DOCKER_BINARY%% stop hassio_supervisor
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

19
hassio_install.sh
View file

@ -3,7 +3,7 @@ set -e
ARCH=$(uname -m) ARCH=$(uname -m)
DOCKER_DAEMON_CONFIG=/etc/docker/daemon.json DOCKER_DAEMON_CONFIG=/etc/docker/daemon.json
SNAP=false DOCKER_BINARY=/usr/bin/docker
DOCKER_REPO=homeassistant DOCKER_REPO=homeassistant
DOCKER_SERVICE=docker.service DOCKER_SERVICE=docker.service
DATA_SHARE=/usr/share/hassio DATA_SHARE=/usr/share/hassio
@ -27,15 +27,14 @@ command -v nmcli > /dev/null 2>&1 || echo "[Warning] No NetworkManager support o
#detect if running on snapped docker #detect if running on snapped docker
if snap list docker >/dev/null 2>&1; then if snap list docker >/dev/null 2>&1; then
SNAP=true
DOCKER_DAEMON_CONFIG=/root/snap/docker/current/etc/docker/daemon.json DOCKER_DAEMON_CONFIG=/root/snap/docker/current/etc/docker/daemon.json
DOCKER_BINARY=/snap/bin/docker
DATA_SHARE=/root/snap/docker/common/hassio DATA_SHARE=/root/snap/docker/common/hassio
CONFIG=$DATA_SHARE/hassio.json CONFIG=$DATA_SHARE/hassio.json
DOCKER_SERVICE="snap.docker.dockerd.service" DOCKER_SERVICE="snap.docker.dockerd.service"
fi fi
function version_gt() { test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1"; } function version_gt() { test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1"; }
function adjust_snap() { sed "s,/usr/bin/docker,/snap/bin/docker,; s,docker.service,$DOCKER_SERVICE,; s,/etc/hassio.json,$CONFIG," -i "$1"; }
# Parse command line parameters # Parse command line parameters
while [[ $# -gt 0 ]]; do while [[ $# -gt 0 ]]; do
@ -148,11 +147,8 @@ echo "[Info] Install supervisor startup scripts"
curl -sL ${URL_BIN_HASSIO} > /usr/sbin/hassio-supervisor curl -sL ${URL_BIN_HASSIO} > /usr/sbin/hassio-supervisor
curl -sL ${URL_SERVICE_HASSIO} > /etc/systemd/system/hassio-supervisor.service curl -sL ${URL_SERVICE_HASSIO} > /etc/systemd/system/hassio-supervisor.service
#adjust paths for snap sed -i "s,%%HASSIO_CONFIG%%,${CONFIG},g" /usr/sbin/hassio-supervisor
if [ "$SNAP" = "true" ]; then sed -i "s,%%DOCKER_BINARY%%,${DOCKER_BINARY},g; s,%%DOCKER_SERVICE%%,${DOCKER_SERVICE},g" /etc/systemd/system/hassio-supervisor.service
adjust_snap /usr/sbin/hassio-supervisor
adjust_snap /etc/systemd/system/hassio-supervisor.service
fi
chmod a+x /usr/sbin/hassio-supervisor chmod a+x /usr/sbin/hassio-supervisor
systemctl enable hassio-supervisor.service systemctl enable hassio-supervisor.service
@ -166,11 +162,8 @@ if command -v apparmor_parser > /dev/null 2>&1; then
curl -sL ${URL_SERVICE_APPARMOR} > /etc/systemd/system/hassio-apparmor.service curl -sL ${URL_SERVICE_APPARMOR} > /etc/systemd/system/hassio-apparmor.service
curl -sL ${URL_APPARMOR_PROFILE} > "${DATA_SHARE}"/apparmor/hassio-supervisor curl -sL ${URL_APPARMOR_PROFILE} > "${DATA_SHARE}"/apparmor/hassio-supervisor
#adjust paths for snap sed -i "s,%%HASSIO_CONFIG%%,${CONFIG},g" /usr/sbin/hassio-apparmor
if [ "$SNAP" = "true" ]; then sed -i "s,%%DOCKER_SERVICE%%,${DOCKER_SERVICE},g" /etc/systemd/system/hassio-apparmor.service
adjust_snap /usr/sbin/hassio-apparmor
adjust_snap /etc/systemd/system/hassio-apparmor.service
fi
chmod a+x /usr/sbin/hassio-apparmor chmod a+x /usr/sbin/hassio-apparmor
systemctl enable hassio-apparmor.service systemctl enable hassio-apparmor.service