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

Support custom prefix (/usr) and sysconfdir (/etc) (#27)

Browse source 
* use separate variable to specify Docker config location

* use templates and always adjust paths

This prepares for further customization of file locations.

* allow to customize prefix and sysconfdir

Follow GNU directory variable names and allow to specify PREFIX (by
default /usr) and sysconfdir (by default /etc). This allows to install
hassio scripts and service to alternative locations.
This commit is contained in:
Stefan Agner 2019-07-26 20:52:30 +02:00 committed by Pascal Vizeli
parent 9d9cfa098c
commit cbae7bc68a
6 changed files with 51 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
README.md
View file

@ -32,9 +32,11 @@ curl -sL https://raw.githubusercontent.com/home-assistant/hassio-installer/maste
### Command line arguments ### Command line arguments
| argument | default | description | | argument | default | description |
|--------------------|-------------------|--------------------------------------------------------| |--------------------|----------------------|--------------------------------------------------------|
| -m \| --machine | | On a special platform they need set a machine type use | | -m \| --machine | | On a special platform they need set a machine type use |
| -d \| --data-share | /usr/share/hassio | data folder for hass.io installation | | -d \| --data-share | $PREFIX/share/hassio | data folder for hass.io installation |
| -p \| --prefix | /usr | Binary prefix for hass.io installation |
| -s \| --sysconfdir | /etc | Configuration directory for hass.io installation |
you can set these parameters by appending ` -- <parameter> <value>` like: you can set these parameters by appending ` -- <parameter> <value>` like:

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})"

4
files/hassio-apparmor.service
View file

@ -1,12 +1,12 @@
[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
RemainAfterExit=true RemainAfterExit=true
ExecStart=/usr/sbin/hassio-apparmor ExecStart=%%HASSIO_APPARMOR_BINARY%%
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

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})"

11
files/hassio-supervisor.service
View file

@ -1,15 +1,16 @@
[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 ExecStartPre=-%%DOCKER_BINARY%% stop hassio_supervisor
ExecStop=-/usr/bin/docker stop hassio_supervisor ExecStart=%%HASSIO_BINARY%%
ExecStop=-%%DOCKER_BINARY%% stop hassio_supervisor
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

63
hassio_install.sh
View file

@ -2,12 +2,10 @@
set -e set -e
ARCH=$(uname -m) ARCH=$(uname -m)
PREFIX="" 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
CONFIG=/etc/hassio.json
URL_VERSION="https://version.home-assistant.io/stable.json" URL_VERSION="https://version.home-assistant.io/stable.json"
URL_BIN_HASSIO="https://raw.githubusercontent.com/home-assistant/hassio-installer/master/files/hassio-supervisor" URL_BIN_HASSIO="https://raw.githubusercontent.com/home-assistant/hassio-installer/master/files/hassio-supervisor"
URL_BIN_APPARMOR="https://raw.githubusercontent.com/home-assistant/hassio-installer/master/files/hassio-apparmor" URL_BIN_APPARMOR="https://raw.githubusercontent.com/home-assistant/hassio-installer/master/files/hassio-apparmor"
@ -27,15 +25,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
PREFIX=/root/snap/docker/current 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
@ -50,6 +47,14 @@ while [[ $# -gt 0 ]]; do
DATA_SHARE=$2 DATA_SHARE=$2
shift shift
;; ;;
-p|--prefix)
PREFIX=$2
shift
;;
-s|--sysconfdir)
SYSCONFDIR=$2
shift
;;
*) *)
echo "[Error] Unrecognized option $1" echo "[Error] Unrecognized option $1"
exit 1 exit 1
@ -58,6 +63,11 @@ while [[ $# -gt 0 ]]; do
shift shift
done done
PREFIX=${PREFIX:-/usr}
SYSCONFDIR=${SYSCONFDIR:-/etc}
DATA_SHARE=${DATA_SHARE:-$PREFIX/share/hassio}
CONFIG=$SYSCONFDIR/hassio.json
# Generate hardware options # Generate hardware options
case $ARCH in case $ARCH in
"i386" | "i686") "i386" | "i686")
@ -116,7 +126,7 @@ HASSIO_VERSION=$(curl -s $URL_VERSION | jq -e -r '.supervisor')
## ##
# Write config # Write config
cat > $CONFIG <<- EOF cat > "$CONFIG" <<- EOF
{ {
"supervisor": "${HASSIO_DOCKER}", "supervisor": "${HASSIO_DOCKER}",
"homeassistant": "${HOMEASSISTANT_DOCKER}", "homeassistant": "${HOMEASSISTANT_DOCKER}",
@ -127,10 +137,10 @@ EOF
## ##
# Check DNS settings # Check DNS settings
DOCKER_VERSION="$(docker --version | grep -Po "\d{2}\.\d{2}\.\d")" DOCKER_VERSION="$(docker --version | grep -Po "\d{2}\.\d{2}\.\d")"
if version_gt "18.09.0" "${DOCKER_VERSION}" && [ ! -e "$PREFIX/etc/docker/daemon.json" ]; then if version_gt "18.09.0" "${DOCKER_VERSION}" && [ ! -e "$DOCKER_DAEMON_CONFIG" ]; then
echo "[Warning] Create DNS settings for Docker to avoid systemd bug!" echo "[Warning] Create DNS settings for Docker to avoid systemd bug!"
mkdir -p $PREFIX/etc/docker mkdir -p "$(dirname ${DOCKER_DAEMON_CONFIG})"
echo '{"dns": ["8.8.8.8", "8.8.4.4"]}' > $PREFIX/etc/docker/daemon.json echo '{"dns": ["8.8.8.8", "8.8.4.4"]}' > $DOCKER_DAEMON_CONFIG
echo "[Info] Restart Docker and wait 30 seconds" echo "[Info] Restart Docker and wait 30 seconds"
systemctl restart $DOCKER_SERVICE && sleep 30 systemctl restart $DOCKER_SERVICE && sleep 30
@ -145,16 +155,16 @@ docker tag "$HASSIO_DOCKER:$HASSIO_VERSION" "$HASSIO_DOCKER:latest" > /dev/null
## ##
# Install Hass.io Supervisor # Install Hass.io Supervisor
echo "[Info] Install supervisor startup scripts" echo "[Info] Install supervisor startup scripts"
curl -sL ${URL_BIN_HASSIO} > /usr/sbin/hassio-supervisor curl -sL ${URL_BIN_HASSIO} > "${PREFIX}"/sbin/hassio-supervisor
curl -sL ${URL_SERVICE_HASSIO} > /etc/systemd/system/hassio-supervisor.service curl -sL ${URL_SERVICE_HASSIO} > "${SYSCONFDIR}"/systemd/system/hassio-supervisor.service
#adjust paths for snap sed -i "s,%%HASSIO_CONFIG%%,${CONFIG},g" "${PREFIX}"/sbin/hassio-supervisor
if [ "$SNAP" = "true" ]; then sed -i -e "s,%%DOCKER_BINARY%%,${DOCKER_BINARY},g" \
adjust_snap /usr/sbin/hassio-supervisor -e "s,%%DOCKER_SERVICE%%,${DOCKER_SERVICE},g" \
adjust_snap /etc/systemd/system/hassio-supervisor.service -e "s,%%HASSIO_BINARY%%,${PREFIX}/sbin/hassio-supervisor,g" \
fi "${SYSCONFDIR}"/systemd/system/hassio-supervisor.service
chmod a+x /usr/sbin/hassio-supervisor chmod a+x "${PREFIX}"/sbin/hassio-supervisor
systemctl enable hassio-supervisor.service systemctl enable hassio-supervisor.service
# #
@ -162,17 +172,16 @@ systemctl enable hassio-supervisor.service
if command -v apparmor_parser > /dev/null 2>&1; then if command -v apparmor_parser > /dev/null 2>&1; then
echo "[Info] Install AppArmor scripts" echo "[Info] Install AppArmor scripts"
mkdir -p "${DATA_SHARE}"/apparmor mkdir -p "${DATA_SHARE}"/apparmor
curl -sL ${URL_BIN_APPARMOR} > /usr/sbin/hassio-apparmor curl -sL ${URL_BIN_APPARMOR} > "${PREFIX}"/sbin/hassio-apparmor
curl -sL ${URL_SERVICE_APPARMOR} > /etc/systemd/system/hassio-apparmor.service curl -sL ${URL_SERVICE_APPARMOR} > "${SYSCONFDIR}"/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" "${PREFIX}"/sbin/hassio-apparmor
if [ "$SNAP" = "true" ]; then sed -i -e "s,%%DOCKER_SERVICE%%,${DOCKER_SERVICE},g" \
adjust_snap /usr/sbin/hassio-apparmor -e "s,%%HASSIO_APPARMOR_BINARY%%,${PREFIX}/sbin/hassio-apparmor,g" \
adjust_snap /etc/systemd/system/hassio-apparmor.service "${SYSCONFDIR}"/systemd/system/hassio-apparmor.service
fi
chmod a+x /usr/sbin/hassio-apparmor chmod a+x "${PREFIX}"/sbin/hassio-apparmor
systemctl enable hassio-apparmor.service systemctl enable hassio-apparmor.service
systemctl start hassio-apparmor.service systemctl start hassio-apparmor.service
fi fi