community-scripts/ProxmoxVED
5
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Minor fixes following code review

Browse Source
This commit is contained in:
Rémi Bédard-Couture 2026-02-07 08:19:03 -05:00
parent ba23b7dcf9
commit abaca28624
2 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ct/zitadel.sh
View File

@ -30,7 +30,8 @@ function update_script() {
if check_for_gh_release "zitadel" "zitadel/zitadel"; then if check_for_gh_release "zitadel" "zitadel/zitadel"; then
msg_info "Stopping Service" msg_info "Stopping Service"
systemctl stop zitadel-api zitadel-login systemctl stop zitadel-api
systemctl stop zitadel-login
msg_ok "Stopped Service" msg_ok "Stopped Service"
msg_info "Updating Zitadel" msg_info "Updating Zitadel"
@ -45,7 +46,9 @@ function update_script() {
msg_ok "Updated Zitadel" msg_ok "Updated Zitadel"
msg_info "Starting Service" msg_info "Starting Service"
systemctl start zitadel systemctl start zitadel-api
sleep 5
systemctl start zitadel-login
msg_ok "Started Service" msg_ok "Started Service"
msg_ok "Updated successfully!" msg_ok "Updated successfully!"
fi fi

28
install/zitadel-install.sh
View File

@ -30,10 +30,6 @@ LOGIN_PORT="3000"
# Detect server IP address # Detect server IP address
SERVER_IP=$(hostname -I | awk '{print $1}') SERVER_IP=$(hostname -I | awk '{print $1}')
msg_info "Installing Dependencies (Patience)"
$STD apt install -y ca-certificates
msg_ok "Installed Dependecies"
# Create zitadel user # Create zitadel user
msg_info "Creating zitadel system user" msg_info "Creating zitadel system user"
groupadd --system "${ZITADEL_GROUP}" groupadd --system "${ZITADEL_GROUP}"
@ -59,7 +55,9 @@ msg_ok "Configured PostgreSQL"
msg_info "Installing Zitadel" msg_info "Installing Zitadel"
cd "${ZITADEL_DIR}" cd "${ZITADEL_DIR}"
mkdir -p ${CONFIG_DIR} mkdir -p ${CONFIG_DIR}
echo "${MASTERKEY}" > ${CONFIG_DIR}/.masterkey echo -n "${MASTERKEY}" > ${CONFIG_DIR}/.masterkey
chmod 600 "${CONFIG_DIR}/.masterkey"
chown "${ZITADEL_USER}:${ZITADEL_GROUP}" "${CONFIG_DIR}/.masterkey"
# Update config.yaml for network access # Update config.yaml for network access
cat > "${CONFIG_DIR}/config.yaml" <<EOF cat > "${CONFIG_DIR}/config.yaml" <<EOF
@ -127,10 +125,10 @@ EOF
chown "${ZITADEL_USER}:${ZITADEL_GROUP}" "${CONFIG_DIR}/config.yaml" chown "${ZITADEL_USER}:${ZITADEL_GROUP}" "${CONFIG_DIR}/config.yaml"
# Initialize database as zitadel user (no masterkey needed for init) # Initialize database as zitadel user (no masterkey needed for init)
$STD ./zitadel init --config ${CONFIG_DIR}/config.yaml $STD sudo -u ${ZITADEL_USER} ./zitadel init --config ${CONFIG_DIR}/config.yaml
# Run setup phase as zitadel user (with masterkey and steps) # Run setup phase as zitadel user (with masterkey and steps)
$STD ./zitadel setup --config ${CONFIG_DIR}/config.yaml --steps ${CONFIG_DIR}/config.yaml --masterkey "${MASTERKEY}" $STD sudo -u ${ZITADEL_USER} ./zitadel setup --config ${CONFIG_DIR}/config.yaml --steps ${CONFIG_DIR}/config.yaml --masterkey "${MASTERKEY}"
#Read client token #Read client token
CLIENT_PAT=$(cat ${ZITADEL_DIR}/login-client.pat) CLIENT_PAT=$(cat ${ZITADEL_DIR}/login-client.pat)
@ -145,9 +143,6 @@ ZITADEL_SERVICE_USER_TOKEN=${CLIENT_PAT}
EOF EOF
chown "${ZITADEL_USER}:${ZITADEL_GROUP}" "${CONFIG_DIR}/login.env" chown "${ZITADEL_USER}:${ZITADEL_GROUP}" "${CONFIG_DIR}/login.env"
# Update package.json to bind to 0.0.0.0 instead of 127.0.0.1
#sed -i 's/"prod": "cd \.\/\.next\/standalone && HOSTNAME=127\.0\.0\.1/"prod": "cd .\/\.next\/standalone \&\& HOSTNAME=0.0.0.0/g' "${LOGIN_DIR}/apps/login/package.json"
# Create api.env file # Create api.env file
cat > "${CONFIG_DIR}/api.env" <<EOF cat > "${CONFIG_DIR}/api.env" <<EOF
ZITADEL_MASTERKEY=${MASTERKEY} ZITADEL_MASTERKEY=${MASTERKEY}
@ -183,7 +178,7 @@ Group=${ZITADEL_GROUP}
WorkingDirectory=${ZITADEL_DIR} WorkingDirectory=${ZITADEL_DIR}
EnvironmentFile=${CONFIG_DIR}/api.env EnvironmentFile=${CONFIG_DIR}/api.env
Environment="PATH=/usr/local/bin:/usr/local/go/bin:/usr/bin:/bin" Environment="PATH=/usr/local/bin:/usr/local/go/bin:/usr/bin:/bin"
ExecStart=${ZITADEL_DIR}/zitadel start --config ${CONFIG_DIR}/config.yaml --masterkey \${ZITADEL_MASTERKEY} ExecStart=${ZITADEL_DIR}/zitadel start --config ${CONFIG_DIR}/config.yaml --masterkeyFile ${CONFIG_DIR}/.masterkey
Restart=always Restart=always
RestartSec=10 RestartSec=10
@ -214,14 +209,11 @@ RestartSec=10
WantedBy=multi-user.target WantedBy=multi-user.target
EOF EOF
# Reload systemd
systemctl daemon-reload
# Enable and start API service # Enable and start API service
systemctl enable -q --now zitadel-api.service systemctl enable -q --now zitadel-api.service
# Wait for API to start # Wait for API to start
sleep 10 sleep 5
# Enable and start Login service # Enable and start Login service
systemctl enable -q --now zitadel-login.service systemctl enable -q --now zitadel-login.service
@ -313,9 +305,9 @@ msg_ok "Saved Credentials"
msg_info "Create zitadel-rerun.sh" msg_info "Create zitadel-rerun.sh"
cat <<EOF >~/zitadel-rerun.sh cat <<EOF >~/zitadel-rerun.sh
systemctl stop zitadel systemctl stop zitadel-api zitadel-login
timeout --kill-after=5s 15s zitadel setup --masterkeyFile ${CONFIG_DIR}/.masterkey --config ${CONFIG_DIR}/config.yaml" timeout --kill-after=5s 15s /opt/zitadel/zitadel setup --masterkeyFile ${CONFIG_DIR}/.masterkey --config ${CONFIG_DIR}/config.yaml
systemctl restart zitadel systemctl restart zitadel-api zitadel-login
EOF EOF
msg_ok "Bash script for rerunning Zitadel after changing Zitadel config.yaml" msg_ok "Bash script for rerunning Zitadel after changing Zitadel config.yaml"