Skip to content

Commit acfbb23

Browse files
committed
fix(trek): set explicit admin creds via env vars, save to ~/trek.creds
1 parent 7a2599d commit acfbb23

1 file changed

Lines changed: 11 additions & 22 deletions

File tree

install/trek-install.sh

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ mkdir -p /opt/trek/{data/logs,uploads/{files,covers,avatars,photos}}
3737
ln -sf /opt/trek/data /opt/trek/server/data
3838
ln -sf /opt/trek/uploads /opt/trek/server/uploads
3939
ENCRYPTION_KEY=$(openssl rand -hex 32)
40+
ADMIN_PASSWORD=$(openssl rand -base64 18 | tr -dc 'A-Za-z0-9' | head -c 16)
4041
cat <<EOF >/opt/trek/server/.env
4142
NODE_ENV=production
4243
PORT=3000
@@ -45,7 +46,17 @@ COOKIE_SECURE=false
4546
FORCE_HTTPS=false
4647
LOG_LEVEL=info
4748
TZ=UTC
49+
ADMIN_EMAIL=admin@trek.local
50+
ADMIN_PASSWORD=${ADMIN_PASSWORD}
4851
EOF
52+
{
53+
echo ""
54+
echo "TREK Admin Credentials"
55+
echo "Email: admin@trek.local"
56+
echo "Password: ${ADMIN_PASSWORD}"
57+
echo "(Change password after first login)"
58+
echo ""
59+
} >>~/trek.creds
4960
msg_ok "Set up Server"
5061

5162
msg_info "Creating Service"
@@ -69,28 +80,6 @@ EOF
6980
systemctl enable -q --now trek
7081
msg_ok "Created Service"
7182

72-
msg_info "Waiting for initial setup"
73-
for i in $(seq 1 15); do
74-
if journalctl -u trek --no-pager -q 2>/dev/null | grep -q "Admin Account Created"; then
75-
TREK_PW=$(journalctl -u trek --no-pager -q 2>/dev/null | grep "Password:" | tail -1 | sed 's/.*Password: *//;s/ *║.*//')
76-
TREK_EMAIL=$(journalctl -u trek --no-pager -q 2>/dev/null | grep "Email:" | tail -1 | sed 's/.*Email: *//;s/ *║.*//')
77-
break
78-
fi
79-
sleep 1
80-
done
81-
msg_ok "Initial setup complete"
82-
83-
if [[ -n "${TREK_PW:-}" ]]; then
84-
{
85-
echo ""
86-
echo "TREK Admin Credentials"
87-
echo "Email: ${TREK_EMAIL}"
88-
echo "Password: ${TREK_PW}"
89-
echo "(Change password after first login)"
90-
echo ""
91-
} >>~/trek.creds
92-
fi
93-
9483
motd_ssh
9584
customize
9685
cleanup_lxc

0 commit comments

Comments
 (0)