Skip to content

Instantly share code, notes, and snippets.

@NicoHood
Last active November 20, 2018 16:13
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save NicoHood/fb1a14cc2ee844b130252a5a7f7b2af0 to your computer and use it in GitHub Desktop.
Save NicoHood/fb1a14cc2ee844b130252a5a7f7b2af0 to your computer and use it in GitHub Desktop.
hass.diff
diff --git a/PKGBUILD b/PKGBUILD
index 521e2fc..01279d0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=home-assistant
pkgdesc='Open-source home automation platform running on Python 3'
pkgver=0.82.1
-pkgrel=1
+pkgrel=2
url="https://home-assistant.io/"
license=('APACHE')
arch=('any')
@@ -47,10 +47,10 @@ source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/a
"home-assistant-tmpfile.conf"
"hass.install")
sha512sums=('2ad5685220489e8cc56b675129d5544753b6225525ac224df1be4574ec6f7e124481569c22a612211c2fa6f64228a2a3f9cf92adf956ea08580258cf208070cd'
- 'fe96bd3df3ba666fd9f127c466d1dd1dd7314db2e57826a2b319c8a0bfad7aedeac398e748f93c6ecd9c2247ebbae196b8b0e7263b8681e2b7aeab6a8bfeab80'
+ '331ef583770deab3bf4b133f117fe0b733afcbc008e990bd4f4a8742450de75fd87232396a08127e45442ca68e70d403e3cea7499108e1e0b0cc8ee684417f46'
'100665ac35370c3ccec65d73521568de21cebf9e46af364124778861c94e338e32ad9abb675d3917f97d351dd7867e3ab2e80c26616330ae7cf0d9dc3f13369b'
- '8babcf544c97ec5ad785014f0b0d5dca556a2f5157dadcbe83d49d4669b74f6349e274810ec9a028fcec208c6c8fbbe6b3899d2933b56163b9e506570879a3ad'
- '65edbf1e544322deb6b5b8e1197e54c5cb8b25e3dad7b4b882ca4d41d3240b3f049c2e928f083e261d14aa5e54ca0b228f128796a07f151cd01cc867acfdb305')
+ 'a3d5cb8db0bd3e335f3ade4f1afbdc513b21d0cea2d3397aad5e2bdf0a7b54f1d576ff547c593ad395b72085920d03404fbec4bb179a45f0685dc2f070a81015'
+ '63d0a7c56d793abdade226179bac874c83bc642125ca85f3f513eefb0675033f7ef6436075fb6ae04acb38db882077ec540441fb1b06706f0c2a31d12f912a16')
#validpgpkeys=('') # TODO https://github.com/home-assistant/home-assistant/issues/9487
install=hass.install
@@ -58,7 +58,7 @@ prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
# TODO remove in future versions https://github.com/home-assistant/home-assistant/issues/9525
replace '==' '>=' setup.py
-
+
echo Patching for home-assistant/home-assistant#11906
sed -i 's/from yarl import unquote/from yarl import URL/' homeassistant/components/http/static.py
sed -i "s/unquote(request.match_info\['filename'\])/URL(request.match_info['filename'], encoded=True).path/" homeassistant/components/http/static.py
diff --git a/hass.install b/hass.install
index de6381d..0559a1c 100644
--- a/hass.install
+++ b/hass.install
@@ -16,4 +16,10 @@ post_upgrade() {
echo " purge_interval: 0"
echo ""
fi
+
+ if [ "$(vercmp $2 '0.82.1-2')" -lt 0 ]; then
+ echo ""
+ echo "Notice: Home Assistant config now defaults to /etc/hass. Please move all configuration from /var/lib/hass to the new config directory."
+ echo ""
+ fi
}
diff --git a/home-assistant-tmpfile.conf b/home-assistant-tmpfile.conf
index e19561a..be6fa65 100644
--- a/home-assistant-tmpfile.conf
+++ b/home-assistant-tmpfile.conf
@@ -1 +1,2 @@
-d /var/lib/hass 0755 hass hass -
+d /var/lib/hass 0700 hass hass -
+d /etc/hass 0700 hass hass -
diff --git a/home-assistant.service b/home-assistant.service
index af591b9..d70c4d7 100644
--- a/home-assistant.service
+++ b/home-assistant.service
@@ -7,7 +7,7 @@ Restart=on-failure
User=hass
Group=hass
-ExecStart=/usr/bin/hass --config /var/lib/hass/ --log-rotate-days 1
+ExecStart=/usr/bin/hass --config /etc/hass/ --log-rotate-days 1
RestartForceExitStatus=100
[Install]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment