Cleanup leftovers from micro_casbin, other cleanups in config.

parent e08b9f68
......@@ -23,7 +23,6 @@ templates:
${PWD}/bin/generate-template.py -c ${CONFIG} postgres/docker-entrypoint-initdb.d/init-minadmin_auth-db.sh.jinja > ${DOCKER_OUT_DIR}/postgres/docker-entrypoint-initdb.d/init-minadmin-db.sh
${PWD}/bin/generate-template.py -c ${CONFIG} postgres/docker-entrypoint-initdb.d/init-hydra-db.sh.jinja > ${DOCKER_OUT_DIR}/postgres/docker-entrypoint-initdb.d/init-hydra-db.sh
${PWD}/bin/generate-template.py -c ${CONFIG} postgres/docker-entrypoint-initdb.d/init-casbin-db.sh.jinja > ${DOCKER_OUT_DIR}/postgres/docker-entrypoint-initdb.d/init-casbin-db.sh
if [ ! -e ${DOCKER_OUT_DIR}/traefik/config/admins.htpasswd ]; then \
htpasswd -bBc ${DOCKER_OUT_DIR}/traefik/config/admins.htpasswd `${PWD}/bin/get-config-value.py -c ${CONFIG} traefik.email` `${PWD}/bin/get-config-value.py -c ${CONFIG} traefik.password`; \
......
......@@ -14,14 +14,6 @@ minadmin:
# OpenID Connect Settings
oidc:
etc_hosts:
# Enable this only if you your ip of traefik resolves to 127.0.0.1
use_hack: True
# Internal IP of issuer_url - traefik.ipv4_address below
ip: 192.168.48.203
# FQDN to overwrite in etc_hosts
fqdn: auth.local.minadmin.io
display_name: minAdmin
logo_url: https://local.minadmin.io/static/img/logo.svg
issuer_url: https://local.minadmin.io/auth/o
......@@ -66,12 +58,6 @@ postgresd:
minadmin_auth:
user: minadmin_auth
password: Jr73tC980msQDd6qxkABVLFIIdS4NE
dex:
user: dex
password: jPTyd4R8heHsvIB5vOjbRidH5dmVet
casbin:
user: casbin
password: W6hOVnYHyMEMp1M17UF3OdJ5G51zzc
hydra:
user: hydra
password: 3uaB8a3bp6XCdn4fuJ0k3Ovl1qkSf8
......@@ -98,7 +84,6 @@ minadmin_auth_srv_xorm:
minadmin_auth:
enable: True
host: auth
template:
disable_cache: "true"
......
......@@ -217,10 +217,6 @@ services:
command:
serve all --dangerous-force-http
environment:
{% if minadmin.oidc.etc_hosts.use_hack %}
- MINADMIN_ETC_HOSTS_FQDN={{ minadmin.oidc.etc_hosts.fqdn }}
- MINADMIN_ETC_HOSTS_IP={{ minadmin.oidc.etc_hosts.ip }}
{% endif %}
- SERVICE_NAME=hydra
- SERVICE_4445_CHECK_HTTP=/health/ready
- SERVICE_4445_CHECK_INTERVAL=15s
......
#!/bin/bash
set -e
{% set dbname = 'casbin' %}
{% set db = postgresd.dbs[dbname] -%}
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
CREATE USER {{ db.user }} WITH PASSWORD '{{ db.password }}';
CREATE DATABASE {{ dbname }};
GRANT ALL PRIVILEGES ON DATABASE {{ dbname }} TO {{ db.user }};
EOSQL
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment