/trunk/debian/prayer.postinst |
---|
21,12 → 21,14 |
configure) |
adduser --quiet --system --no-create-home --home /var/run/prayer prayer |
dpkg-statoverride --list /var/run/prayer >/dev/null 2>&1 \ |
|| dpkg-statoverride --update --add prayer root 2750 /var/run/prayer |
dpkg-statoverride --list /var/log/prayer >/dev/null 2>&1 \ |
|| dpkg-statoverride --update --add prayer adm 2750 /var/log/prayer |
if dpkg --compare-versions "$2" lt "1.2.2.1-7" && |
dpkg-statoverride --list /var/run/prayer >/dev/null 2>&1; then |
dpkg-statoverride --remove /var/run/prayer |
fi |
# Add prayer user to the ssl-cert group on upgrades or fresh installs |
if dpkg --compare-versions "$2" lt "1.2.2.1-1"; then |
if getent group ssl-cert >/dev/null; then |
/trunk/debian/prayer.postrm |
---|
31,9 → 31,6 |
if dpkg-statoverride --list /var/log/prayer >/dev/null 2>&1; then |
dpkg-statoverride --remove /var/log/prayer |
fi |
if dpkg-statoverride --list /var/run/prayer >/dev/null 2>&1; then |
dpkg-statoverride --remove /var/run/prayer |
fi |
if [ -x /usr/sbin/deluser ]; then |
deluser --system --quiet prayer || true |
fi |
/trunk/debian/prayer.default |
---|
7,5 → 7,11 |
# Change to one to enable prayer after editing /etc/prayer/prayer.cf |
ENABLED=0 |
# Options. You probably won't need any. |
# Default values for var_prefix (also used for pid_dir) and |
# prayer_user. These are set from the command line to make sure that |
# prayer uses the expected values. |
#VAR_PREFIX="/var/run/prayer" |
#PRAYER_USER="prayer" |
# Additional ptions. You probably won't need any. |
DAEMON_OPTS="" |
/trunk/debian/changelog |
---|
11,6 → 11,16 |
-- Magnus Holmgren <holmgren@debian.org> Sun, 06 Jul 2008 00:53:37 +0200 |
prayer (1.2.2.1-7) unstable; urgency=high |
* Since /var/run can be a tmpfs filesystem, don't ship /var/run/prayer |
as part of the package but create it in the init script (LP: 304071). |
Also, var_prefix, pid_dir and prayer_user will by default be overriden |
from the command line to make sure that they get the values expected by |
the init script. |
-- Magnus Holmgren <holmgren@debian.org> Fri, 31 Oct 2008 18:31:28 +0100 |
prayer (1.2.2.1-6) unstable; urgency=low |
* prayer.init: Correctly check for the presence of the executables. |
/trunk/debian/patches/unlimit_login_username.patch |
---|
5,7 → 5,7 |
if (user) |
html_quote_string(b, user); |
- bputs(b, "\" size=\"8\" maxlength=\"8\" />"); |
+ bputs(b, "\" size=\"8\" />"); |
+ bputs(b, "\" size=\"16\" />"); |
bputs(b, "</td>" CRLF); |
bputs(b, "</tr>" CRLF); |
/trunk/debian/prayer.dirs |
---|
1,4 → 1,3 |
var/run/prayer |
var/log/prayer |
etc/prayer/templates/xhtml_transitional |
etc/prayer/templates/xhtml_strict |
/trunk/debian/prayer.init |
---|
15,8 → 15,8 |
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin |
FRONTEND_DAEMON=/usr/sbin/prayer |
SESSION_DAEMON=/usr/sbin/prayer-session |
FRONTEND_PIDFILE=/var/run/prayer/prayer.pid |
SESSION_PIDFILE=/var/run/prayer/prayer-session.pid |
VAR_PREFIX=/var/run/prayer |
PRAYER_USER=prayer |
DESC="webmail server" |
test -x $FRONTEND_DAEMON -a -x $SESSION_DAEMON || exit 0 |
30,6 → 30,9 |
. /etc/default/prayer |
fi |
FRONTEND_PIDFILE="$VAR_PREFIX/prayer.pid" |
SESSION_PIDFILE="$VAR_PREFIX/prayer-session.pid" |
set +e |
start() { |
40,8 → 43,11 |
fi |
log_daemon_msg "Starting $DESC" "prayer" |
start-stop-daemon --start --pidfile $FRONTEND_PIDFILE \ |
--exec $FRONTEND_DAEMON -- $DAEMON_OPTS |
start-stop-daemon --start --pidfile "$FRONTEND_PIDFILE" \ |
--exec "$FRONTEND_DAEMON" \ |
-- $DAEMON_OPTS --config-option "prayer_user=$PRAYER_USER" \ |
--config-option "var_prefix=$VAR_PREFIX" \ |
--config-option "pid_dir=$VAR_PREFIX" |
log_end_msg $? |
} |
48,12 → 54,12 |
stop() { |
log_daemon_msg "Stopping $DESC" |
if [ -f "$SESSION_PIDFILE" ]; then |
start-stop-daemon --stop --quiet --oknodo --pidfile $SESSION_PIDFILE |
start-stop-daemon --stop --quiet --oknodo --pidfile "$SESSION_PIDFILE" |
log_progress_msg "prayer-session" |
fi |
if [ -f "$FRONTEND_PIDFILE" ]; then |
start-stop-daemon --stop --quiet --oknodo --pidfile $FRONTEND_PIDFILE |
start-stop-daemon --stop --quiet --oknodo --exec $FRONTEND_DAEMON |
start-stop-daemon --stop --quiet --oknodo --pidfile "$FRONTEND_PIDFILE" |
start-stop-daemon --stop --quiet --oknodo --exec "$FRONTEND_DAEMON" |
log_progress_msg "prayer" |
fi |
rm -f "$FRONTEND_PIDFILE" "$SESSION_PIDFILE" |
62,6 → 68,9 |
case "$1" in |
start) |
# Create /var/run/prayer with prayer as owner in case /var/run is a tmpfs. |
# If local admin |
install -d -m 2750 -o "$PRAYER_USER" "$VAR_PREFIX" |
start |
;; |
/trunk |
---|
Property changes: |
Modified: svn:mergeinfo |
## -0,0 +0,2 ## |
Merged /branches/lenny:r71 |
Merged /tags/1.2.2.1-7:r53-72 |