diff --git a/appstore/topiam-ce/2.0.0/.env b/appstore/topiam-ce/2.0.0/.env index 8ff766f4..0e736ebd 100644 --- a/appstore/topiam-ce/2.0.0/.env +++ b/appstore/topiam-ce/2.0.0/.env @@ -10,12 +10,6 @@ TOPIAM_CE_ROOT_PATH=/home/topiam # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=1898 -# 管理员 用户名 [必填] -ADMIN_USERNAME=admin - -# 管理员 密码 [必填] -topiam.cn=topiam.cn - # 数据库 主机 [必填] DB_HOST=127.0.0.1 diff --git a/appstore/topiam-ce/2.0.0/data.yml b/appstore/topiam-ce/2.0.0/data.yml index 1439fbf7..af45c5a5 100644 --- a/appstore/topiam-ce/2.0.0/data.yml +++ b/appstore/topiam-ce/2.0.0/data.yml @@ -47,23 +47,6 @@ additionalProperties: required: true rule: paramPort type: number - - default: "admin" - edit: true - key: admin - envKey: ADMIN_USERNAME - labelZh: 管理员 用户名 - labelEn: Admin Username - required: true - rule: paramCommon - type: text - - default: "topiam.cn" - edit: true - key: ADMIN_PASSWORD - envKey: topiam.cn - labelZh: 管理员 密码 - labelEn: Admin Password - required: true - type: password - default: "127.0.0.1" edit: true envKey: DB_HOST diff --git a/appstore/topiam-ce/2.0.0/docker-compose.yml b/appstore/topiam-ce/2.0.0/docker-compose.yml index 9333fa50..b3e3eeb3 100644 --- a/appstore/topiam-ce/2.0.0/docker-compose.yml +++ b/appstore/topiam-ce/2.0.0/docker-compose.yml @@ -8,7 +8,6 @@ services: - ./envs/global.env - .env environment: - - INITIAL_PASSWORD_VALUE=ADMIN_PASSWORD - spring.datasource.url=jdbc:mysql://${DB_HOST}:${DB_PORT}/${DB_NAME}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true - spring.datasource.username=${DB_USER} - spring.datasource.password=${DB_USER_PASSWORD} @@ -25,5 +24,4 @@ services: - ${PANEL_APP_PORT_HTTP}:1898 restart: always volumes: - - ${TOPIAM_CE_ROOT_PATH}/conf:/opt/topiam/conf - ${TOPIAM_CE_ROOT_PATH}/logs:/opt/topiam/logs diff --git a/appstore/topiam-ce/2.0.0/scripts/init.sh b/appstore/topiam-ce/2.0.0/scripts/init.sh index 07fb8c3f..935d95e4 100644 --- a/appstore/topiam-ce/2.0.0/scripts/init.sh +++ b/appstore/topiam-ce/2.0.0/scripts/init.sh @@ -10,6 +10,11 @@ if [ -f .env ]; then echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + # setup-2 create directories + mkdir -p "$TOPIAM_CE_ROOT_PATH" + mkdir -p "$TOPIAM_CE_ROOT_PATH/logs" + chmod -R 777 "$TOPIAM_CE_ROOT_PATH" + echo "Check Finish." else diff --git a/dockge/topiam-ce/.env b/dockge/topiam-ce/.env index 8ff766f4..0e736ebd 100644 --- a/dockge/topiam-ce/.env +++ b/dockge/topiam-ce/.env @@ -10,12 +10,6 @@ TOPIAM_CE_ROOT_PATH=/home/topiam # WebUI 端口 [必填] PANEL_APP_PORT_HTTP=1898 -# 管理员 用户名 [必填] -ADMIN_USERNAME=admin - -# 管理员 密码 [必填] -topiam.cn=topiam.cn - # 数据库 主机 [必填] DB_HOST=127.0.0.1 diff --git a/dockge/topiam-ce/docker-compose.yml b/dockge/topiam-ce/docker-compose.yml index 9333fa50..b3e3eeb3 100644 --- a/dockge/topiam-ce/docker-compose.yml +++ b/dockge/topiam-ce/docker-compose.yml @@ -8,7 +8,6 @@ services: - ./envs/global.env - .env environment: - - INITIAL_PASSWORD_VALUE=ADMIN_PASSWORD - spring.datasource.url=jdbc:mysql://${DB_HOST}:${DB_PORT}/${DB_NAME}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true - spring.datasource.username=${DB_USER} - spring.datasource.password=${DB_USER_PASSWORD} @@ -25,5 +24,4 @@ services: - ${PANEL_APP_PORT_HTTP}:1898 restart: always volumes: - - ${TOPIAM_CE_ROOT_PATH}/conf:/opt/topiam/conf - ${TOPIAM_CE_ROOT_PATH}/logs:/opt/topiam/logs