mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-07-09 23:40:59 +02:00
fix: auto-fix linting issues
This commit is contained in:
alexbelgium
committed by
github-actions[bot]
github-actions[bot]
parent
e5adbd266f
commit
f728166b14
@@ -3,28 +3,28 @@
|
||||
set -e
|
||||
|
||||
if bashio::config.has_value "PUID" && bashio::config.has_value "PGID"; then
|
||||
PUID="$(bashio::config "PUID")"
|
||||
PGID="$(bashio::config "PGID")"
|
||||
bashio::log.green "Setting user to $PUID:$PGID"
|
||||
id -u photoprism &>/dev/null || usermod -o -u "$PUID" photoprism || true
|
||||
id -g photoprism &>/dev/null || groupmod -o -g "$PGID" photoprism || true
|
||||
PUID="$(bashio::config "PUID")"
|
||||
PGID="$(bashio::config "PGID")"
|
||||
bashio::log.green "Setting user to $PUID:$PGID"
|
||||
id -u photoprism &>/dev/null || usermod -o -u "$PUID" photoprism || true
|
||||
id -g photoprism &>/dev/null || groupmod -o -g "$PGID" photoprism || true
|
||||
fi
|
||||
|
||||
bashio::log.info "Preparing scripts"
|
||||
echo "... creating structure"
|
||||
mkdir -p \
|
||||
/data/photoprism/originals \
|
||||
/data/photoprism/import \
|
||||
/data/photoprism/storage/config \
|
||||
/data/photoprism/backup \
|
||||
/data/photoprism/storage/cache
|
||||
/data/photoprism/originals \
|
||||
/data/photoprism/import \
|
||||
/data/photoprism/storage/config \
|
||||
/data/photoprism/backup \
|
||||
/data/photoprism/storage/cache
|
||||
|
||||
echo "... setting permissions"
|
||||
chmod -R 777 /data/photoprism
|
||||
chown -Rf photoprism:photoprism /data/photoprism
|
||||
chmod -Rf a+rwx /data/photoprism
|
||||
for line in BACKUP_PATH IMPORT_PATH ORIGINALS_PATH STORAGE_PATH; do
|
||||
mkdir -p "$line"
|
||||
chmod -R 777 "$line"
|
||||
chown -Rf photoprism:photoprism "$line"
|
||||
mkdir -p "$line"
|
||||
chmod -R 777 "$line"
|
||||
chown -Rf photoprism:photoprism "$line"
|
||||
done
|
||||
|
||||
@@ -4,33 +4,33 @@
|
||||
set -e
|
||||
|
||||
if bashio::config.has_value 'graphic_drivers'; then
|
||||
GRAPHIC_DRIVERS="$(bashio::config 'graphic_drivers')"
|
||||
bashio::log.info "Installing selected graphic drivers : $GRAPHIC_DRIVERS..."
|
||||
GRAPHIC_DRIVERS="$(bashio::config 'graphic_drivers')"
|
||||
bashio::log.info "Installing selected graphic drivers : $GRAPHIC_DRIVERS..."
|
||||
|
||||
### Download WebUI
|
||||
case "$GRAPHIC_DRIVERS" in
|
||||
### Download WebUI
|
||||
case "$GRAPHIC_DRIVERS" in
|
||||
|
||||
"mesa")
|
||||
apt-get update
|
||||
apt-get install -yqq -- *mesa* >/dev/null
|
||||
echo "... done"
|
||||
;;
|
||||
"mesa")
|
||||
apt-get update
|
||||
apt-get install -yqq -- *mesa* >/dev/null
|
||||
echo "... done"
|
||||
;;
|
||||
|
||||
"nvidia")
|
||||
apt-get update
|
||||
apt-get install -yqq -- *nvidia* >/dev/null
|
||||
echo "... done"
|
||||
;;
|
||||
"nvidia")
|
||||
apt-get update
|
||||
apt-get install -yqq -- *nvidia* >/dev/null
|
||||
echo "... done"
|
||||
;;
|
||||
|
||||
"radeon")
|
||||
apt-get update
|
||||
apt-get install -yqq -- *radeon* >/dev/null
|
||||
echo "... done"
|
||||
;;
|
||||
"radeon")
|
||||
apt-get update
|
||||
apt-get install -yqq -- *radeon* >/dev/null
|
||||
echo "... done"
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "... no drivers selected"
|
||||
;;
|
||||
*)
|
||||
echo "... no drivers selected"
|
||||
;;
|
||||
|
||||
esac
|
||||
esac
|
||||
fi
|
||||
|
||||
@@ -16,19 +16,18 @@ sed -i "s|%%interface%%|$(bashio::addon.ip_address)|g" /etc/nginx/servers/ssl.co
|
||||
|
||||
# Ssl values
|
||||
if bashio::config.true 'ssl'; then
|
||||
echo "Defining ssl configuration"
|
||||
bashio::config.require.ssl
|
||||
certfile=$(bashio::config 'certfile')
|
||||
keyfile=$(bashio::config 'keyfile')
|
||||
echo "Defining ssl configuration"
|
||||
bashio::config.require.ssl
|
||||
certfile=$(bashio::config 'certfile')
|
||||
keyfile=$(bashio::config 'keyfile')
|
||||
|
||||
#Check if files exist
|
||||
echo "... checking if referenced certificates exist"
|
||||
[ ! -f /ssl/"$certfile" ] && bashio::log.fatal "... use_own_certs is true but certificate /ssl/$certfile not found" && bashio::exit.nok
|
||||
[ ! -f /ssl/"$keyfile" ] && bashio::log.fatal "... use_own_certs is true but certificate /ssl/$keyfile not found" && bashio::exit.nok
|
||||
#Check if files exist
|
||||
echo "... checking if referenced certificates exist"
|
||||
[ ! -f /ssl/"$certfile" ] && bashio::log.fatal "... use_own_certs is true but certificate /ssl/$certfile not found" && bashio::exit.nok
|
||||
[ ! -f /ssl/"$keyfile" ] && bashio::log.fatal "... use_own_certs is true but certificate /ssl/$keyfile not found" && bashio::exit.nok
|
||||
|
||||
|
||||
sed -i "s|default_server|ssl|g" /etc/nginx/servers/ssl.conf
|
||||
sed -i "/proxy_params.conf/a ssl_certificate /ssl/$certfile;" /etc/nginx/servers/ssl.conf
|
||||
sed -i "/proxy_params.conf/a ssl_certificate_key /ssl/$keyfile;" /etc/nginx/servers/ssl.conf
|
||||
bashio::log.info "Ssl enabled, please use https for connection. UI is at https://YOURIP:$(bashio::addon.port 2342)"
|
||||
sed -i "s|default_server|ssl|g" /etc/nginx/servers/ssl.conf
|
||||
sed -i "/proxy_params.conf/a ssl_certificate /ssl/$certfile;" /etc/nginx/servers/ssl.conf
|
||||
sed -i "/proxy_params.conf/a ssl_certificate_key /ssl/$keyfile;" /etc/nginx/servers/ssl.conf
|
||||
bashio::log.info "Ssl enabled, please use https for connection. UI is at https://YOURIP:$(bashio::addon.port 2342)"
|
||||
fi
|
||||
|
||||
@@ -11,57 +11,57 @@ bashio::log.info "Defining database"
|
||||
|
||||
case $(bashio::config 'DB_TYPE') in
|
||||
|
||||
# Use sqlite
|
||||
sqlite)
|
||||
bashio::log.info "Using a local sqlite database"
|
||||
;;
|
||||
# Use sqlite
|
||||
sqlite)
|
||||
bashio::log.info "Using a local sqlite database"
|
||||
;;
|
||||
|
||||
mariadb_addon)
|
||||
bashio::log.info "Using MariaDB addon. Requirements : running MariaDB addon. Discovering values..."
|
||||
if ! bashio::services.available 'mysql'; then
|
||||
bashio::log.fatal \
|
||||
"Local database access should be provided by the MariaDB addon"
|
||||
bashio::exit.nok \
|
||||
"Please ensure it is installed and started"
|
||||
fi
|
||||
mariadb_addon)
|
||||
bashio::log.info "Using MariaDB addon. Requirements : running MariaDB addon. Discovering values..."
|
||||
if ! bashio::services.available 'mysql'; then
|
||||
bashio::log.fatal \
|
||||
"Local database access should be provided by the MariaDB addon"
|
||||
bashio::exit.nok \
|
||||
"Please ensure it is installed and started"
|
||||
fi
|
||||
|
||||
# Install mysqlclient
|
||||
pip install pymysql &>/dev/null || true
|
||||
# Install mysqlclient
|
||||
pip install pymysql &>/dev/null || true
|
||||
|
||||
# Use values
|
||||
PHOTOPRISM_DATABASE_DRIVER="mysql"
|
||||
PHOTOPRISM_DATABASE_SERVER="$(bashio::services 'mysql' 'host'):$(bashio::services 'mysql' 'port')"
|
||||
PHOTOPRISM_DATABASE_NAME="photoprism"
|
||||
PHOTOPRISM_DATABASE_USER="$(bashio::services 'mysql' 'username')"
|
||||
PHOTOPRISM_DATABASE_PASSWORD="$(bashio::services 'mysql' 'password')"
|
||||
export PHOTOPRISM_DATABASE_DRIVER && \
|
||||
bashio::log.blue "PHOTOPRISM_DATABASE_DRIVER=$PHOTOPRISM_DATABASE_DRIVER"
|
||||
export PHOTOPRISM_DATABASE_SERVER && \
|
||||
bashio::log.blue "PHOTOPRISM_DATABASE_SERVER=$PHOTOPRISM_DATABASE_SERVER"
|
||||
export PHOTOPRISM_DATABASE_NAME && \
|
||||
bashio::log.blue "PHOTOPRISM_DATABASE_NAME=$PHOTOPRISM_DATABASE_NAME"
|
||||
export PHOTOPRISM_DATABASE_USER && \
|
||||
bashio::log.blue "PHOTOPRISM_DATABASE_USER=$PHOTOPRISM_DATABASE_USER"
|
||||
export PHOTOPRISM_DATABASE_PASSWORD && \
|
||||
bashio::log.blue "PHOTOPRISM_DATABASE_PASSWORD=$PHOTOPRISM_DATABASE_PASSWORD"
|
||||
# Use values
|
||||
PHOTOPRISM_DATABASE_DRIVER="mysql"
|
||||
PHOTOPRISM_DATABASE_SERVER="$(bashio::services 'mysql' 'host'):$(bashio::services 'mysql' 'port')"
|
||||
PHOTOPRISM_DATABASE_NAME="photoprism"
|
||||
PHOTOPRISM_DATABASE_USER="$(bashio::services 'mysql' 'username')"
|
||||
PHOTOPRISM_DATABASE_PASSWORD="$(bashio::services 'mysql' 'password')"
|
||||
export PHOTOPRISM_DATABASE_DRIVER &&
|
||||
bashio::log.blue "PHOTOPRISM_DATABASE_DRIVER=$PHOTOPRISM_DATABASE_DRIVER"
|
||||
export PHOTOPRISM_DATABASE_SERVER &&
|
||||
bashio::log.blue "PHOTOPRISM_DATABASE_SERVER=$PHOTOPRISM_DATABASE_SERVER"
|
||||
export PHOTOPRISM_DATABASE_NAME &&
|
||||
bashio::log.blue "PHOTOPRISM_DATABASE_NAME=$PHOTOPRISM_DATABASE_NAME"
|
||||
export PHOTOPRISM_DATABASE_USER &&
|
||||
bashio::log.blue "PHOTOPRISM_DATABASE_USER=$PHOTOPRISM_DATABASE_USER"
|
||||
export PHOTOPRISM_DATABASE_PASSWORD &&
|
||||
bashio::log.blue "PHOTOPRISM_DATABASE_PASSWORD=$PHOTOPRISM_DATABASE_PASSWORD"
|
||||
|
||||
{
|
||||
echo "export PHOTOPRISM_DATABASE_DRIVER=\"${PHOTOPRISM_DATABASE_DRIVER}\""
|
||||
echo "export PHOTOPRISM_DATABASE_SERVER=\"${PHOTOPRISM_DATABASE_SERVER}\""
|
||||
echo "export PHOTOPRISM_DATABASE_NAME=\"${PHOTOPRISM_DATABASE_NAME}\""
|
||||
echo "export PHOTOPRISM_DATABASE_USER=\"${PHOTOPRISM_DATABASE_USER}\""
|
||||
echo "export PHOTOPRISM_DATABASE_PASSWORD=\"${PHOTOPRISM_DATABASE_PASSWORD}\""
|
||||
} >> ~/.bashrc
|
||||
{
|
||||
echo "export PHOTOPRISM_DATABASE_DRIVER=\"${PHOTOPRISM_DATABASE_DRIVER}\""
|
||||
echo "export PHOTOPRISM_DATABASE_SERVER=\"${PHOTOPRISM_DATABASE_SERVER}\""
|
||||
echo "export PHOTOPRISM_DATABASE_NAME=\"${PHOTOPRISM_DATABASE_NAME}\""
|
||||
echo "export PHOTOPRISM_DATABASE_USER=\"${PHOTOPRISM_DATABASE_USER}\""
|
||||
echo "export PHOTOPRISM_DATABASE_PASSWORD=\"${PHOTOPRISM_DATABASE_PASSWORD}\""
|
||||
} >>~/.bashrc
|
||||
|
||||
bashio::log.warning "Photoprism is using the Maria DB addon"
|
||||
bashio::log.warning "Please ensure this is included in your backups"
|
||||
bashio::log.warning "Uninstalling the MariaDB addon will remove any data"
|
||||
bashio::log.warning "Photoprism is using the Maria DB addon"
|
||||
bashio::log.warning "Please ensure this is included in your backups"
|
||||
bashio::log.warning "Uninstalling the MariaDB addon will remove any data"
|
||||
|
||||
# Create database
|
||||
mysql --skip-ssl --host="$(bashio::services 'mysql' 'host')" --port="$(bashio::services 'mysql' 'port')" --user="$PHOTOPRISM_DATABASE_USER" --password="$PHOTOPRISM_DATABASE_PASSWORD" -e"CREATE DATABASE IF NOT EXISTS $PHOTOPRISM_DATABASE_NAME;"
|
||||
# Force character set
|
||||
mysql --skip-ssl --host="$(bashio::services 'mysql' 'host')" --port="$(bashio::services 'mysql' 'port')" --user="$PHOTOPRISM_DATABASE_USER" --password="$PHOTOPRISM_DATABASE_PASSWORD" -e"ALTER DATABASE $PHOTOPRISM_DATABASE_NAME CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci;" || true
|
||||
;;
|
||||
# Create database
|
||||
mysql --skip-ssl --host="$(bashio::services 'mysql' 'host')" --port="$(bashio::services 'mysql' 'port')" --user="$PHOTOPRISM_DATABASE_USER" --password="$PHOTOPRISM_DATABASE_PASSWORD" -e"CREATE DATABASE IF NOT EXISTS $PHOTOPRISM_DATABASE_NAME;"
|
||||
# Force character set
|
||||
mysql --skip-ssl --host="$(bashio::services 'mysql' 'host')" --port="$(bashio::services 'mysql' 'port')" --user="$PHOTOPRISM_DATABASE_USER" --password="$PHOTOPRISM_DATABASE_PASSWORD" -e"ALTER DATABASE $PHOTOPRISM_DATABASE_NAME CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci;" || true
|
||||
;;
|
||||
esac
|
||||
|
||||
###########
|
||||
@@ -69,16 +69,16 @@ esac
|
||||
###########
|
||||
|
||||
if bashio::config.true "ingress_disabled"; then
|
||||
bashio::log.warning "Ingress is disabled. You'll need to connect using ip:port"
|
||||
sed -i "s|$(bashio::addon.ingress_entry)||g" /etc/nginx/servers/ssl.conf
|
||||
sed -i "s|location = /|location = /null|g" /etc/nginx/servers/ssl.conf
|
||||
# sed -i "7,10d" /etc/nginx/servers/ssl.conf
|
||||
# rm /etc/nginx/servers/ingress.conf
|
||||
bashio::log.warning "Ingress is disabled. You'll need to connect using ip:port"
|
||||
sed -i "s|$(bashio::addon.ingress_entry)||g" /etc/nginx/servers/ssl.conf
|
||||
sed -i "s|location = /|location = /null|g" /etc/nginx/servers/ssl.conf
|
||||
# sed -i "7,10d" /etc/nginx/servers/ssl.conf
|
||||
# rm /etc/nginx/servers/ingress.conf
|
||||
else
|
||||
PHOTOPRISM_SITE_URL="$(bashio::addon.ingress_entry)/"
|
||||
export PHOTOPRISM_SITE_URL
|
||||
echo "export PHOTOPRISM_SITE_URL=\"${PHOTOPRISM_SITE_URL}\"" >> ~/.bashrc
|
||||
bashio::log.warning "Ingress is enabled. To connect, you must add $PHOTOPRISM_SITE_URL to the end of your access point. Example : http://my-url:8123$PHOTOPRISM_SITE_URL"
|
||||
PHOTOPRISM_SITE_URL="$(bashio::addon.ingress_entry)/"
|
||||
export PHOTOPRISM_SITE_URL
|
||||
echo "export PHOTOPRISM_SITE_URL=\"${PHOTOPRISM_SITE_URL}\"" >>~/.bashrc
|
||||
bashio::log.warning "Ingress is enabled. To connect, you must add $PHOTOPRISM_SITE_URL to the end of your access point. Example : http://my-url:8123$PHOTOPRISM_SITE_URL"
|
||||
fi
|
||||
|
||||
##############
|
||||
@@ -98,39 +98,39 @@ export PHOTOPRISM_IMPORT_PATH
|
||||
export PHOTOPRISM_BACKUP_PATH
|
||||
|
||||
{
|
||||
echo "export PHOTOPRISM_UPLOAD_NSFW=\"${PHOTOPRISM_UPLOAD_NSFW}\""
|
||||
echo "export PHOTOPRISM_STORAGE_PATH=\"${PHOTOPRISM_STORAGE_PATH}\""
|
||||
echo "export PHOTOPRISM_ORIGINALS_PATH=\"${PHOTOPRISM_ORIGINALS_PATH}\""
|
||||
echo "export PHOTOPRISM_IMPORT_PATH=\"${PHOTOPRISM_IMPORT_PATH}\""
|
||||
echo "export PHOTOPRISM_BACKUP_PATH=\"${PHOTOPRISM_BACKUP_PATH}\""
|
||||
} >> ~/.bashrc
|
||||
echo "export PHOTOPRISM_UPLOAD_NSFW=\"${PHOTOPRISM_UPLOAD_NSFW}\""
|
||||
echo "export PHOTOPRISM_STORAGE_PATH=\"${PHOTOPRISM_STORAGE_PATH}\""
|
||||
echo "export PHOTOPRISM_ORIGINALS_PATH=\"${PHOTOPRISM_ORIGINALS_PATH}\""
|
||||
echo "export PHOTOPRISM_IMPORT_PATH=\"${PHOTOPRISM_IMPORT_PATH}\""
|
||||
echo "export PHOTOPRISM_BACKUP_PATH=\"${PHOTOPRISM_BACKUP_PATH}\""
|
||||
} >>~/.bashrc
|
||||
|
||||
# Test configs
|
||||
for variabletest in $PHOTOPRISM_STORAGE_PATH $PHOTOPRISM_ORIGINALS_PATH $PHOTOPRISM_IMPORT_PATH $PHOTOPRISM_BACKUP_PATH; do
|
||||
# Check if path exists
|
||||
if bashio::fs.directory_exists "$variabletest"; then
|
||||
true
|
||||
else
|
||||
bashio::log.info "Path $variabletest doesn't exist. Creating it now..."
|
||||
mkdir -p "$variabletest" || bashio::log.fatal "Can't create $variabletest path"
|
||||
fi
|
||||
# Check if path writable
|
||||
# shellcheck disable=SC2015
|
||||
touch "$variabletest"/aze && rm "$variabletest"/aze || bashio::log.fatal "$variabletest path is not writable"
|
||||
# Check if path exists
|
||||
if bashio::fs.directory_exists "$variabletest"; then
|
||||
true
|
||||
else
|
||||
bashio::log.info "Path $variabletest doesn't exist. Creating it now..."
|
||||
mkdir -p "$variabletest" || bashio::log.fatal "Can't create $variabletest path"
|
||||
fi
|
||||
# Check if path writable
|
||||
# shellcheck disable=SC2015
|
||||
touch "$variabletest"/aze && rm "$variabletest"/aze || bashio::log.fatal "$variabletest path is not writable"
|
||||
done
|
||||
|
||||
# Define id
|
||||
if bashio::config.has_value "PUID" && bashio::config.has_value "PGID"; then
|
||||
PUID="$(bashio::config "PUID")"
|
||||
PGID="$(bashio::config "PGID")"
|
||||
export PHOTOPRISM_UID="$PUID"
|
||||
export PHOTOPRISM_GID="$PGID"
|
||||
sed -i "1a PHOTOPRISM_UID=$PHOTOPRISM_UID" /scripts/entrypoint.sh
|
||||
sed -i "1a PHOTOPRISM_GID=$PHOTOPRISM_GID" /scripts/entrypoint.sh
|
||||
{
|
||||
echo "export PHOTOPRISM_UID=\"${PHOTOPRISM_UID}\""
|
||||
echo "export PHOTOPRISM_GID=\"${PHOTOPRISM_GID}\""
|
||||
} >> ~/.bashrc
|
||||
PUID="$(bashio::config "PUID")"
|
||||
PGID="$(bashio::config "PGID")"
|
||||
export PHOTOPRISM_UID="$PUID"
|
||||
export PHOTOPRISM_GID="$PGID"
|
||||
sed -i "1a PHOTOPRISM_UID=$PHOTOPRISM_UID" /scripts/entrypoint.sh
|
||||
sed -i "1a PHOTOPRISM_GID=$PHOTOPRISM_GID" /scripts/entrypoint.sh
|
||||
{
|
||||
echo "export PHOTOPRISM_UID=\"${PHOTOPRISM_UID}\""
|
||||
echo "export PHOTOPRISM_GID=\"${PHOTOPRISM_GID}\""
|
||||
} >>~/.bashrc
|
||||
fi
|
||||
|
||||
# Start messages
|
||||
@@ -138,7 +138,8 @@ bashio::log.info "Please wait 1 or 2 minutes to allow the server to load"
|
||||
bashio::log.info 'Default username : admin, default password: "please_change_password"'
|
||||
|
||||
# shellcheck disable=SC1091
|
||||
. /scripts/entrypoint.sh photoprism start & bashio::log.info "Starting, please wait for next green text..."
|
||||
. /scripts/entrypoint.sh photoprism start &
|
||||
bashio::log.info "Starting, please wait for next green text..."
|
||||
|
||||
bashio::net.wait_for 2341 localhost 900
|
||||
bashio::log.info "App launched"
|
||||
|
||||
Reference in New Issue
Block a user