Files
@ 2c3941817a8e
Branch filter:
Location: kallithea/init.d/celeryd-upstart.conf - annotation
2c3941817a8e
904 B
text/plain
auth: authenticate using either username or email address
Use User.get_by_username_or_email() in get_user.
In authenticate(), update username if get_user succeeds.
The point of this change is that the web login is a complex thing that
includes, apart the authentication itself, form validation and a bunch of
other things.
This change on its own makes it possible to authenticate a user using its email
address, but that on its own isn't enough for web login or git/hg auth.
Use User.get_by_username_or_email() in get_user.
In authenticate(), update username if get_user succeeds.
The point of this change is that the web login is a complex thing that
includes, apart the authentication itself, form validation and a bunch of
other things.
This change on its own makes it possible to authenticate a user using its email
address, but that on its own isn't enough for web login or git/hg auth.
99ad9d0af1a3 58df0b3ed377 58df0b3ed377 58df0b3ed377 24c0d584ba86 58df0b3ed377 58df0b3ed377 99ad9d0af1a3 99ad9d0af1a3 58df0b3ed377 58df0b3ed377 58df0b3ed377 58df0b3ed377 58df0b3ed377 58df0b3ed377 99ad9d0af1a3 58df0b3ed377 58df0b3ed377 58df0b3ed377 58df0b3ed377 58df0b3ed377 58df0b3ed377 58df0b3ed377 99ad9d0af1a3 58df0b3ed377 58df0b3ed377 58df0b3ed377 58df0b3ed377 58df0b3ed377 58df0b3ed377 58df0b3ed377 58df0b3ed377 58df0b3ed377 58df0b3ed377 | # celeryd - run the celeryd daemon as an upstart job for kallithea
# Change variables/paths as necessary and place file /etc/init/celeryd.conf
# start/stop/restart as normal upstart job (ie: $ start celeryd)
description "Celery for Kallithea Mercurial Server"
author "Matt Zuba <matt.zuba@goodwillaz.org"
start on starting kallithea
stop on stopped kallithea
respawn
umask 0022
env PIDFILE=/tmp/celeryd.pid
env APPINI=/var/hg/kallithea/production.ini
env HOME=/var/hg
env USER=hg
# To use group (if different from user), you must edit sudoers file and change
# root's entry from (ALL) to (ALL:ALL)
# env GROUP=hg
script
COMMAND="/var/hg/.virtualenvs/kallithea/bin/paster celeryd $APPINI --pidfile=$PIDFILE"
if [ -z "$GROUP" ]; then
exec sudo -u $USER $COMMAND
else
exec sudo -u $USER -g $GROUP $COMMAND
fi
end script
post-stop script
rm -f $PIDFILE
end script
|