From 813f32d310381e22b60b5465b56717dd21b277b7 Mon Sep 17 00:00:00 2001 From: Johannes Zellner Date: Mon, 26 Feb 2024 14:38:06 +0100 Subject: [PATCH] Remove ldap to openid migration code --- start.sh | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/start.sh b/start.sh index b3989ea..eeb9522 100755 --- a/start.sh +++ b/start.sh @@ -4,14 +4,6 @@ set -eu -o pipefail mkdir -p /run/gitea/tmp/uploads /run/sshd /run/gitea/sessions -migrate_ldap_users_to_oidc() { - set -eu - - echo "==> migrate LDAP to OIDC" - mysql -u"${CLOUDRON_MYSQL_USERNAME}" -p"${CLOUDRON_MYSQL_PASSWORD}" -h mysql --database="${CLOUDRON_MYSQL_DATABASE}" -N -B -e \ - "UPDATE user u, (select id from login_source WHERE name='cloudron' and type='6') ls SET u.login_type=6, u.login_source=ls.id WHERE u.login_type=2 AND u.login_source=1" -} - setup_oidc_source() { set -eu @@ -20,7 +12,6 @@ setup_oidc_source() { now=$(date +%s) mysql -u"${CLOUDRON_MYSQL_USERNAME}" -p"${CLOUDRON_MYSQL_PASSWORD}" -h mysql --database="${CLOUDRON_MYSQL_DATABASE}" -e \ "REPLACE INTO login_source (id, type, name, is_active, cfg, created_unix, updated_unix) VALUES (1,6,'cloudron', 1,'{\"Provider\":\"openidConnect\",\"ClientID\":\"${CLOUDRON_OIDC_CLIENT_ID}\",\"ClientSecret\":\"${CLOUDRON_OIDC_CLIENT_SECRET}\",\"OpenIDConnectAutoDiscoveryURL\":\"${CLOUDRON_OIDC_ISSUER}/.well-known/openid-configuration\",\"CustomURLMapping\":null,\"IconURL\":\"\",\"Scopes\":[\"openid email profile\"],\"RequiredClaimName\":\"\",\"RequiredClaimValue\":\"\",\"GroupClaimName\":\"\",\"AdminGroup\":\"\",\"GroupTeamMap\":\"\",\"GroupTeamMapRemoval\":false,\"RestrictedGroup\":\"\"}','${now}','${now}')" - } setup_root_user() { @@ -47,7 +38,6 @@ setup_auth() { if [[ -n "${CLOUDRON_OIDC_ISSUER:-}" ]]; then setup_oidc_source - migrate_ldap_users_to_oidc fi user_count=$(mysql -u"${CLOUDRON_MYSQL_USERNAME}" -p"${CLOUDRON_MYSQL_PASSWORD}" -h mysql --database="${CLOUDRON_MYSQL_DATABASE}" -N -B -e "SELECT count(*) FROM user")