calculate
/
container-overlay
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

homeassistant: исправления ошибок

Browse Source
master 97
Alexander Tratsevskiy 1 year ago
parent 7708d5ba8d
commit 876ea5eee7
5 changed files with 60 additions and 50 deletions
Show Stats Download Patch File Download Diff File

10
scripts/homeassistant/step/1-install.sh
Unescape View File

@ -30,8 +30,8 @@ configure() {
chown -R homeassistant: $home_dir chown -R homeassistant: $home_dir
fi fi
touch $log_dir/homeassistant.log touch ${log_dir}/homeassistant.log
chown homeassistant: $log_dir/homeassistant.log chown homeassistant: ${log_dir}/homeassistant.log
if [[ $live_ver != $last_ver ]]; then if [[ $live_ver != $last_ver ]]; then
if [[ $live_ver == '' ]]; then if [[ $live_ver == '' ]]; then
@ -51,15 +51,15 @@ configure() {
eend eend
ebegin 'Install all Python dependencies' ebegin 'Install all Python dependencies'
python -m pip install wheel &>>$log_dir/homeassistant.log python -m pip install wheel &>>${log_dir}/homeassistant.log
eend eend
ebegin 'Install Home Assistant $last_ver' ebegin 'Install Home Assistant $last_ver'
pip install homeassistant==$last_ver &>>$log_dir/homeassistant.log pip install homeassistant==$last_ver &>>${log_dir}/homeassistant.log
eend eend
ebegin 'Install PostgreSQL dependencies' ebegin 'Install PostgreSQL dependencies'
pip install psycopg2 &>>$log_dir/homeassistant.log pip install psycopg2 &>>${log_dir}/homeassistant.log
eend eend
rm -f $live_dir rm -f $live_dir

16
scripts/homeassistant/step/2-postgresql.sh
Unescape View File

@ -1,8 +1,6 @@
# #
# Функция configure() настраивает PostgreSQL # Функция configure() настраивает PostgreSQL
# #
# Параметры:
# $1 = check - пропуск настройки
configure() { configure() {
if [[ -n "$(ls -A /var/lib/postgresql)" ]]; then if [[ -n "$(ls -A /var/lib/postgresql)" ]]; then
return return
@ -11,26 +9,26 @@ configure() {
echo 'Setting up PostgreSQL' echo 'Setting up PostgreSQL'
pg_ver=$(ls /etc/init.d/postgresql-*); pg_ver=${pg_ver##*-} pg_ver=$(ls /etc/init.d/postgresql-*); pg_ver=${pg_ver##*-}
ebegin "Configuring PostgreSQL $pg_ver" ebegin "Configuring PostgreSQL ${pg_ver}"
emerge --config postgresql &>>$log_dir/postgresql.log emerge --config postgresql &>>${log_dir}/postgresql.log
eend eend
ebegin 'Starting PostgreSQL' ebegin 'Starting PostgreSQL'
rc-service postgresql-$pg_ver start >>$log_dir/postgresql.log rc-service postgresql-${pg_ver} start >>${log_dir}/postgresql.log
eend eend
ebegin 'Database creation' ebegin 'Database creation'
psql -U postgres -c "ALTER USER postgres WITH PASSWORD '${ini[postgresql.postgres_password]}'" >>$log_dir/postgresql.log psql -U postgres -c "ALTER USER postgres WITH PASSWORD '${ini[postgresql.postgres_password]}'" >>${log_dir}/postgresql.log
createuser -U postgres ${ini[postgresql.homeassistant_user]} createuser -U postgres ${ini[postgresql.homeassistant_user]}
createdb -U postgres ${ini[postgresql.homeassistant_database]} -O ${ini[postgresql.homeassistant_user]} createdb -U postgres ${ini[postgresql.homeassistant_database]} -O ${ini[postgresql.homeassistant_user]}
psql -U postgres -c "ALTER USER ${ini[postgresql.homeassistant_user]} WITH PASSWORD '${ini[postgresql.homeassistant_password]}'" >>$log_dir/postgresql.log psql -U postgres -c "ALTER USER ${ini[postgresql.homeassistant_user]} WITH PASSWORD '${ini[postgresql.homeassistant_password]}'" >>${log_dir}/postgresql.log
eend eend
ebegin 'Updating permissions' ebegin 'Updating permissions'
cl-core-setup -n postgresql -f >>$log_dir/postgresql.log cl-core-setup -n postgresql -f >>${log_dir}/postgresql.log
eend eend
ebegin 'Restart the server' ebegin 'Restart the server'
rc-service postgresql-$pg_ver restart >>$log_dir/postgresql.log rc-service postgresql-${pg_ver} restart >>${log_dir}/postgresql.log
eend eend
} }

34
scripts/homeassistant/step/3-zigbee2mqtt.sh
Unescape View File

@ -15,6 +15,7 @@ configure() {
local work_dir="$home_dir/versions/zigbee2mqtt-$last_ver" local work_dir="$home_dir/versions/zigbee2mqtt-$last_ver"
local live_dir="$home_dir/zigbee2mqtt-live" local live_dir="$home_dir/zigbee2mqtt-live"
local live_ver="$(get_live_ver $live_dir)" local live_ver="$(get_live_ver $live_dir)"
local conf_dir="/var/calculate/zigbee2mqtt"
# проверим на наличие устройства # проверим на наличие устройства
if [[ ${ini[zigbee2mqtt.dev]:-} == "" ]]; then if [[ ${ini[zigbee2mqtt.dev]:-} == "" ]]; then
@ -32,13 +33,18 @@ configure() {
fi fi
if [[ ! -e $home_dir ]]; then if [[ ! -e $home_dir ]]; then
mkdir -p $home_dir mkdir -p $home_dir/versions
chmod 700 $home_dir/versions chmod 700 $home_dir
chown -R zigbee2mqtt: $home_dir chown -R zigbee2mqtt: $home_dir
fi fi
if [[ ! -e $conf_dir ]]; then
mkdir -p $conf_dir
chmod 700 $conf_dir
chown -R zigbee2mqtt: $conf_dir
fi
touch $log_dir/zigbee2mqtt.log touch ${log_dir}/zigbee2mqtt.log
chown zigbee2mqtt: $log_dir/zigbee2mqtt.log chown zigbee2mqtt: ${log_dir}/zigbee2mqtt.log
if [[ $live_ver != $last_ver ]]; then if [[ $live_ver != $last_ver ]]; then
if [[ $live_ver == '' ]]; then if [[ $live_ver == '' ]]; then
@ -64,11 +70,11 @@ configure() {
eend eend
# вынесем настройки # вынесем настройки
if [[ -z "$(ls -A /var/calculate/zigbee2mqtt)" ]]; then if [[ -z "$(ls -A $conf_dir)" ]]; then
mv versions/zigbee2mqtt-${last_ver}/data/* /var/calculate/zigbee2mqtt mv versions/zigbee2mqtt-${last_ver}/data/* ${conf_dir}
fi fi
rm -rf versions/zigbee2mqtt-${last_ver}/data rm -rf versions/zigbee2mqtt-${last_ver}/data
ln -s /var/calculate/zigbee2mqtt versions/zigbee2mqtt-${last_ver}/data ln -s ${conf_dir} versions/zigbee2mqtt-${last_ver}/data
ebegin 'Create a virtualenv' ebegin 'Create a virtualenv'
python -m venv zigbee2mqtt-live/.venv python -m venv zigbee2mqtt-live/.venv
@ -79,20 +85,20 @@ configure() {
eend eend
ebegin 'Upgrade pip, wheel and setuptools' ebegin 'Upgrade pip, wheel and setuptools'
pip install --upgrade pip wheel setuptools &>>$log_dir/zigbee2mqtt.log pip install --upgrade pip wheel setuptools &>>${log_dir}/zigbee2mqtt.log
eend eend
ebegin 'Install Node environment' ebegin 'Install Node environment'
pip install nodeenv &>>$log_dir/zigbee2mqtt.log pip install nodeenv &>>${log_dir}/zigbee2mqtt.log
eend eend
ebegin 'Init Node environment ${ini[zigbee2mqtt.nodeenv]}' ebegin 'Init Node environment ${ini[zigbee2mqtt.nodeenv]}'
nodeenv -p -n ${ini[zigbee2mqtt.nodeenv]} &>>$log_dir/zigbee2mqtt.log nodeenv -p -n ${ini[zigbee2mqtt.nodeenv]} &>>${log_dir}/zigbee2mqtt.log
eend eend
einfo 'Install dependencies' einfo 'Install dependencies'
cd zigbee2mqtt-live cd zigbee2mqtt-live
npm ci &>>$log_dir/zigbee2mqtt.log npm ci &>>${log_dir}/zigbee2mqtt.log
cd cd
EOF EOF
)" )"
@ -101,8 +107,8 @@ configure() {
eval $__result=zigbee2mqtt # демон который следует перезагрузить eval $__result=zigbee2mqtt # демон который следует перезагрузить
else else
ebegin 'Setup zigbee2mqtt' ebegin 'Setup zigbee2mqtt'
mv /var/calculate/zigbee2mqtt/configuration.yaml /var/calculate/zigbee2mqtt/configuration.yaml.old mv ${conf_dir}/configuration.yaml ${conf_dir}/configuration.yaml.old
cat > /var/calculate/zigbee2mqtt/configuration.yaml << EOF cat > ${conf_dir}/configuration.yaml << EOF
# Home Assistant integration (MQTT discovery) # Home Assistant integration (MQTT discovery)
homeassistant: true homeassistant: true
@ -127,7 +133,7 @@ frontend:
port: 8080 port: 8080
host: 127.0.0.1 host: 127.0.0.1
EOF EOF
chown zigbee2mqtt: /var/calculate/zigbee2mqtt/configuration.yaml chown zigbee2mqtt: ${conf_dir}/configuration.yaml
eend eend
fi fi
fi fi

22
scripts/homeassistant/step/4-hass-configurator.sh
Unescape View File

@ -14,6 +14,7 @@ configure() {
local work_dir="$home_dir/versions/hass-configurator-$last_ver" local work_dir="$home_dir/versions/hass-configurator-$last_ver"
local live_dir="$home_dir/hass-configurator-live" local live_dir="$home_dir/hass-configurator-live"
local live_ver="$(get_live_ver $live_dir)" local live_ver="$(get_live_ver $live_dir)"
local conf_dir="/var/calculate/hass-configurator"
if [[ $action == 'check' ]]; then if [[ $action == 'check' ]]; then
if [[ $live_ver == $last_ver ]]; then if [[ $live_ver == $last_ver ]]; then
@ -26,7 +27,7 @@ configure() {
fi fi
# выйдем если все настроено # выйдем если все настроено
if [[ -e /var/calculate/hass-configurator/settings.conf ]]; then if [[ -e $conf_dir/settings.conf ]]; then
return return
fi fi
@ -35,9 +36,14 @@ configure() {
chmod 700 $home_dir chmod 700 $home_dir
chown -R hass-configurator: $home_dir chown -R hass-configurator: $home_dir
fi fi
if [[ ! -e $conf_dir ]]; then
mkdir -p $conf_dir
chmod 700 $conf_dir
chown -R hass-configurator: $conf_dir
fi
touch $log_dir/hass-configurator.log touch ${log_dir}/hass-configurator.log
chown hass-configurator: $log_dir/hass-configurator.log chown hass-configurator: ${log_dir}/hass-configurator.log
if [[ $live_ver != $last_ver ]]; then if [[ $live_ver != $last_ver ]]; then
if [[ $live_ver == '' ]]; then if [[ $live_ver == '' ]]; then
@ -52,7 +58,7 @@ configure() {
ebegin Download hass-configurator ${last_ver} ebegin Download hass-configurator ${last_ver}
wget https://github.com/danielperna84/hass-configurator/archive/refs/tags/${last_ver}.zip \ wget https://github.com/danielperna84/hass-configurator/archive/refs/tags/${last_ver}.zip \
-O hass-configurator-${last_ver}.zip &>>$log_dir/hass-configurator.log -O hass-configurator-${last_ver}.zip &>>${log_dir}/hass-configurator.log
eend eend
ebegin 'Extract the archive' ebegin 'Extract the archive'
@ -70,11 +76,11 @@ configure() {
eend eend
ebegin 'Upgrade pip and wheel' ebegin 'Upgrade pip and wheel'
pip install --upgrade pip wheel &>>$log_dir/hass-configurator.log pip install --upgrade pip wheel &>>${log_dir}/hass-configurator.log
eend eend
ebegin 'Install HASS Configurator' ebegin 'Install HASS Configurator'
pip install hass-configurator &>>$log_dir/hass-configurator.log pip install hass-configurator &>>${log_dir}/hass-configurator.log
eend eend
EOF EOF
)" )"
@ -84,7 +90,7 @@ configure() {
eval $__result=hass-assistant # демон который следует перезагрузить eval $__result=hass-assistant # демон который следует перезагрузить
else else
ebegin 'Setup HASS Configurator' ebegin 'Setup HASS Configurator'
cat > /var/calculate/hass-configurator/settings.conf << EOF cat > $conf_dir/settings.conf << EOF
{ {
"LISTENIP": "127.0.0.1", "LISTENIP": "127.0.0.1",
"PORT": 3218, "PORT": 3218,
@ -112,7 +118,7 @@ configure() {
"NOTIFY_SERVICE": "persistent_notification.create" "NOTIFY_SERVICE": "persistent_notification.create"
} }
EOF EOF
chown hass-configurator: /var/calculate/hass-configurator/settings.conf chown hass-configurator: $conf_dir/settings.conf
eend eend
fi fi
} }

28
scripts/homeassistant/step/5-config.sh
Unescape View File

@ -2,29 +2,29 @@
# Функция configure() настраивает Home Assistant # Функция configure() настраивает Home Assistant
# #
configure() { configure() {
# выйдем если все настроено
grep -q ^http: /var/calculate/homeassistant/configuration.yaml &>/dev/null && return || true
local home_dir=/var/calculate/www/homeassistant local home_dir=/var/calculate/www/homeassistant
local live_dir="$home_dir/homeassistant-live" local live_dir="${home_dir}/homeassistant-live"
local config_dir="/var/calculate/homeassistant" local conf_dir="/var/calculate/homeassistant"
if [[ ! -e $config_dir ]]; then # выйдем если все настроено
mkdir -p $config_dir grep -q ^http: ${conf_dir}/configuration.yaml &>/dev/null && return || true
chmod 700 $config_dir
chown homeassistant: $config_dir if [[ ! -e $conf_dir ]]; then
mkdir -p $conf_dir
chmod 700 $conf_dir
chown homeassistant: $conf_dir
fi fi
touch $log_dir/config.log touch ${log_dir}/config.log
chown homeassistant: $log_dir/config.log chown homeassistant: ${log_dir}/config.log
su - homeassistant -s /bin/bash -c "$(cat <<- EOF su - homeassistant -s /bin/bash -c "$(cat <<- EOF
set -ueo pipefail set -ueo pipefail
export PATH="/lib/rc/bin:$PATH" export PATH="/lib/rc/bin:$PATH"
source $live_dir/bin/activate source ${live_dir}/bin/activate
hass --config /var/calculate/homeassistant &>>$log_dir/config.log & hass --config ${conf_dir} &>>${log_dir}/config.log &
id_hass=\$! id_hass=\$!
echo echo
@ -38,7 +38,7 @@ configure() {
EOF EOF
)" )"
cat >> /var/calculate/homeassistant/configuration.yaml << EOF cat >> ${conf_dir}/configuration.yaml << EOF
http: http:
server_host: 127.0.0.1 server_host: 127.0.0.1

Write Preview
Loading…
Cancel
Save