Skip to content
Snippets Groups Projects
Verified Commit 236ad91a authored by Jan Alexander Steffens (heftig)'s avatar Jan Alexander Steffens (heftig)
Browse files

roles/quassel: Fixes to work with a password-protected DB

parent 4235782f
No related branches found
No related tags found
No related merge requests found
......@@ -4,9 +4,8 @@ Requisite=postgresql.service
After=postgresql.service
[Service]
User=quassel
Group=quassel
User=postgres
Type=oneshot
ExecStart=/usr/bin/psql -c "DELETE FROM backlog WHERE time < NOW() - INTERVAL '1 months';"
ExecStart=/usr/bin/psql -c "CLUSTER backlog USING backlog_bufferid_idx;"
ExecStart=/usr/bin/psql -c "VACUUM FULL ANALYZE backlog;"
ExecStart=/usr/bin/psql -d quassel -c "DELETE FROM backlog WHERE time < NOW() - INTERVAL '1 months';"
ExecStart=/usr/bin/psql -d quassel -c "CLUSTER backlog USING backlog_bufferid_idx;"
ExecStart=/usr/bin/psql -d quassel -c "VACUUM FULL ANALYZE backlog;"
......@@ -40,17 +40,16 @@ if [[ $pw != $REPLY ]]; then
echo >&2 "Passwords don't match."
exit 1
fi
sha1=(`printf %s "$pw" | sha1sum`)
if psql -c "INSERT INTO quasseluser (username, password) VALUES ('$SUDO_USER', '${sha1[0]}')" &>/dev/null; then
echo >&2 "Added user '$SUDO_USER'."
if printf '%s\n' $pw $pw | quasselcore --configdir=/var/lib/quassel --change-userpass $SUDO_USER &>/dev/null; then
echo >&2 "Updated password for user '$SUDO_USER'."
exit 0
fi
if psql -c "UPDATE quasseluser SET password = '${sha1[0]}' WHERE username = '$SUDO_USER'" &>/dev/null; then
echo >&2 "Updated password for user '$SUDO_USER'."
if printf '%s\n' $SUDO_USER $pw $pw | quasselcore --configdir=/var/lib/quassel --add-user &>/dev/null; then
echo >&2 "Added user '$SUDO_USER'."
exit 0
fi
echo >&2 "SQL error."
echo >&2 "Quassel error."
exit 1
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment