Skip to content
Snippets Groups Projects
Commit cc0185f6 authored by Bert Palm's avatar Bert Palm :bug:
Browse files

add s3map db to store bucket to database mapping; pass it via S3MAP_DB_URL

parent ada3e9f9
No related branches found
No related tags found
1 merge request!113add s3map db to store bucket to database mapping
Pipeline #297115 failed
......@@ -141,4 +141,10 @@ SCHED_HOST=http://basic-demo-scheduler:5000
#SCHED_MQTT_PASSWORD=$MQTT_PASSWORD
#SCHED_JOB_LOG_LEVEL=DEBUG
#SCHED_SLURM_USER=
#SCHED_SLURM_JWT_TOKEN=
\ No newline at end of file
#SCHED_SLURM_JWT_TOKEN=
S3MAP_POSTGRES_HOST=database
S3MAP_POSTGRES_PORT=5432
S3MAP_POSTGRES_USER=s3map
S3MAP_POSTGRES_PASSWORD=secret
S3MAP_POSTGRES_DB=postgres
#!/bin/bash
set -e
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
CREATE ROLE $S3MAP_POSTGRES_USER WITH LOGIN PASSWORD '$S3MAP_POSTGRES_PASS';
GRANT $S3MAP_POSTGRES_USER TO postgres;
CREATE SCHEMA IF NOT EXISTS $S3MAP_POSTGRES_USER AUTHORIZATION $S3MAP_POSTGRES_USER;
SET search_path TO $S3MAP_POSTGRES_USER;
GRANT CONNECT ON DATABASE postgres TO $S3MAP_POSTGRES_USER;
ALTER ROLE $S3MAP_POSTGRES_USER SET search_path to $S3MAP_POSTGRES_USER;
GRANT USAGE ON SCHEMA $S3MAP_POSTGRES_USER TO $S3MAP_POSTGRES_USER;
GRANT ALL ON SCHEMA $S3MAP_POSTGRES_USER TO $S3MAP_POSTGRES_USER;
CREATE TABLE "mapping" (
"id" bigserial NOT NULL PRIMARY KEY,
"bucket" varchar(256) NOT NULL UNIQUE,
"thing_uuid" uuid NOT NULL,
"thing_name" varchar(256) NOT NULL,
"db_url" varchar(256) NOT NULL,
"db_user" varchar(256) NOT NULL,
"db_pass" varchar(256) NOT NULL
);
GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA $S3MAP_POSTGRES_USER TO $S3MAP_POSTGRES_USER;
GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA $S3MAP_POSTGRES_USER TO $S3MAP_POSTGRES_USER;
EOSQL
......@@ -34,6 +34,10 @@ services:
Please define a mqtt auth database user!}"
MQTT_AUTH_POSTGRES_PASS: "${MQTT_AUTH_POSTGRES_PASS:?\
Please define a mqtt auth database password!}"
S3MAP_POSTGRES_USER: "${S3MAP_POSTGRES_USER:?\
Please define a s3-map database user!}"
S3MAP_POSTGRES_PASS: "${S3MAP_POSTGRES_PASS:?\
Please define a s3-map database password!}"
FRONTEND_POSTGRES_USER: "${FRONTEND_POSTGRES_USER:?\
Please define a frontend database user!}"
FRONTEND_POSTGRES_PASS: "${FRONTEND_POSTGRES_PASS:?\
......@@ -68,6 +72,7 @@ services:
- "./data/postgres/sms_cv_db/sms_cv_foreign_tables.sql:/docker-entrypoint-initdb.d/07_sms_cv_foreign_tables.sql"
- "./mosquitto/mosquitto-go-auth.sh:/docker-entrypoint-initdb.d/mosquitto-go-auth.sh:ro"
- "./frontend/frontend-database.sh:/docker-entrypoint-initdb.d/frontend-database.sh:ro"
- "./dispatcher/s3_to_db.sh:/docker-entrypoint-initdb.d/s3_to_db.sh:ro"
- "./data/postgres/data:/var/lib/postgresql/data"
- "./data/postgres/postgres-force-ssl.sh:\
/docker-entrypoint-initdb.d/postgres-force-ssl.sh"
......@@ -166,6 +171,11 @@ services:
MINIO_URL: "${MINIO_HOST:-minio:9000}"
MINIO_ACCESS_KEY: "${MINIO_ROOT_USER:?Please define an minio root user!}"
MINIO_SECURE_KEY: "${MINIO_ROOT_PASSWORD:?Please define an minio root user password!}"
S3MAP_DB_URL: "postgresql://\
${S3MAP_POSTGRES_USER:?Please define an postgres user!}:\
${S3MAP_POSTGRES_PASS:?Please define an postgres password!}@\
${S3MAP_POSTGRES_HOST:-database}/\
${S3MAP_POSTGRES_DATABASE:-postgres}"
command:
- "run-create-thing-on-minio-action-service"
......@@ -231,6 +241,11 @@ services:
MINIO_URL: "${MINIO_HOST:-minio:9000}"
MINIO_ACCESS_KEY: "${MINIO_ROOT_USER:?Please define an minio root user!}"
MINIO_SECURE_KEY: "${MINIO_ROOT_PASSWORD:?Please define an minio root user password!}"
S3MAP_DB_URL: "postgresql://\
${S3MAP_POSTGRES_USER:?Please define an postgres user!}:\
${S3MAP_POSTGRES_PASS:?Please define an postgres password!}@\
${S3MAP_POSTGRES_HOST:-database}/\
${S3MAP_POSTGRES_DATABASE:-postgres}"
SCHEDULER: "${SCHEDULER:-BasicScheduler}"
SCHED_HOST: "${SCHED_HOST:-http://basic-demo-scheduler:5000}"
SCHED_MQTT_BROKER: "${SCHED_MQTT_BROKER:-None}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment