Fix immich env and escape db name
This commit is contained in:
@@ -1,8 +1,10 @@
|
|||||||
UPLOAD_LOCATION=
|
UPLOAD_LOCATION=
|
||||||
|
IMMICH_VERSION=
|
||||||
IMMICH_DB_LOCATION=
|
IMMICH_DB_LOCATION=
|
||||||
|
|
||||||
DB_USERNAME=
|
IMMICH_DB_HOSTNAME=
|
||||||
DB_PASSWORD=
|
IMMICH_POSTGRES_DB=
|
||||||
DB_DATABASE_NAME=
|
IMMICH_POSTGRES_USER=
|
||||||
|
IMMICH_POSTGRES_PASSWORD=
|
||||||
|
|
||||||
REDIS_HOSTNAME=
|
REDIS_HOSTNAME=
|
||||||
@@ -10,9 +10,9 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
DB_HOSTNAME: shared-postgres
|
DB_HOSTNAME: shared-postgres
|
||||||
DB_PORT: 5432
|
DB_PORT: 5432
|
||||||
DB_USERNAME: ${IMMICH_DB_USERNAME}
|
DB_USERNAME: ${IMMICH_POSTGRES_USER}
|
||||||
DB_PASSWORD: ${IMMICH_DB_PASSWORD}
|
DB_PASSWORD: ${IMMICH_POSTGRES_PASSWORD}
|
||||||
DB_DATABASE_NAME: ${IMMICH_DB_DATABASE_NAME}
|
DB_DATABASE_NAME: ${IMMICH_POSTGRES_DB}
|
||||||
ports:
|
ports:
|
||||||
- '2283:2283'
|
- '2283:2283'
|
||||||
depends_on:
|
depends_on:
|
||||||
|
|||||||
@@ -13,9 +13,9 @@ services:
|
|||||||
- .env
|
- .env
|
||||||
environment:
|
environment:
|
||||||
DB_HOSTNAME: ${IMMICH_DB_HOSTNAME}
|
DB_HOSTNAME: ${IMMICH_DB_HOSTNAME}
|
||||||
DB_USERNAME: ${IMMICH_DB_USERNAME}
|
DB_USERNAME: ${IMMICH_POSTGRES_USER}
|
||||||
DB_PASSWORD: ${IMMICH_DB_PASSWORD}
|
DB_PASSWORD: ${IMMICH_POSTGRES_PASSWORD}
|
||||||
DB_DATABASE_NAME: ${IMMICH_DB_DATABASE_NAME}
|
DB_DATABASE_NAME: ${IMMICH_POSTGRES_DB}
|
||||||
ports:
|
ports:
|
||||||
- '2283:2283'
|
- '2283:2283'
|
||||||
depends_on:
|
depends_on:
|
||||||
|
|||||||
@@ -16,19 +16,19 @@ create_db_and_user() {
|
|||||||
|
|
||||||
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
|
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
|
||||||
-- Create database
|
-- Create database
|
||||||
CREATE DATABASE $db_name;
|
CREATE DATABASE $($db_name);
|
||||||
|
|
||||||
-- Create user with password
|
-- Create user with password
|
||||||
CREATE USER $db_user WITH ENCRYPTED PASSWORD '$db_password';
|
CREATE USER $db_user WITH ENCRYPTED PASSWORD '$db_password';
|
||||||
|
|
||||||
-- Grant connection to the specific database only
|
-- Grant connection to the specific database only
|
||||||
GRANT CONNECT ON DATABASE $db_name TO $db_user;
|
GRANT CONNECT ON DATABASE $($db_name) TO $db_user;
|
||||||
|
|
||||||
-- Make user owner of the database
|
-- Make user owner of the database
|
||||||
ALTER DATABASE $db_name OWNER TO $db_user;
|
ALTER DATABASE $($db_name) OWNER TO $db_user;
|
||||||
|
|
||||||
-- Connect to the specific database to set schema permissions
|
-- Connect to the specific database to set schema permissions
|
||||||
\c $db_name
|
\c $($db_name)
|
||||||
|
|
||||||
-- Grant schema permissions
|
-- Grant schema permissions
|
||||||
GRANT ALL ON SCHEMA public TO $db_user;
|
GRANT ALL ON SCHEMA public TO $db_user;
|
||||||
@@ -56,7 +56,7 @@ create_db_and_user "${SPLIIT_POSTGRES_DB}" "${SPLIIT_POSTGRES_USER}" "${SPLIIT_P
|
|||||||
create_db_and_user "${SHLINK_POSTGRES_DB}" "${SHLINK_POSTGRES_USER}" "${SHLINK_POSTGRES_PASSWORD}"
|
create_db_and_user "${SHLINK_POSTGRES_DB}" "${SHLINK_POSTGRES_USER}" "${SHLINK_POSTGRES_PASSWORD}"
|
||||||
|
|
||||||
# Immich
|
# Immich
|
||||||
create_db_and_user "${IMMICH_DB_DATABASE_NAME}" "${IMMICH_DB_USERNAME}" "${IMMICH_DB_PASSWORD}"
|
create_db_and_user "${IMMICH_POSTGRES_DB}" "${IMMICH_POSTGRES_USER}" "${IMMICH_POSTGRES_PASSWORD}"
|
||||||
|
|
||||||
# Nextcloud
|
# Nextcloud
|
||||||
create_db_and_user "${NEXTCLOUD_POSTGRES_DB}" "${NEXTCLOUD_POSTGRES_USER}" "${NEXTCLOUD_POSTGRES_PASSWORD}"
|
create_db_and_user "${NEXTCLOUD_POSTGRES_DB}" "${NEXTCLOUD_POSTGRES_USER}" "${NEXTCLOUD_POSTGRES_PASSWORD}"
|
||||||
|
|||||||
Reference in New Issue
Block a user