Subversion Repositories prayer

Compare Revisions

Ignore whitespace Rev 169 → Rev 170

/trunk/debian/README.Debian
11,11 → 11,11
bugs. You can always find information about patches in
changelog.Debian.gz.
 
To enable Prayer, you must edit /etc/default/prayer and change
ENABLED=0 to ENABLED=1. But before you do that you should go through
/etc/prayer/prayer.cf and adapt it to your needs. In particular, if
you already run a web server on this machine you need to change
use_http_port (and use_https_port) to something else.
To enable Prayer, run update-rd.c prayer enable. But before you do
that you should go through /etc/prayer/prayer.cf and adapt it to your
needs. In particular, if you already run a web server on this machine
you need to change use_http_port (and use_https_port) to something
else.
 
Debian-specific configuration defaults:
 
100,5 → 100,5
automatically expunged. These two approaches are rather
incompatible, but some software can take either.
 
-- Magnus Holmgren <holmgren@debian.org>, Wed, 30 Sep 2009 22:57:19 +0200
-- Magnus Holmgren <holmgren@debian.org>, Sat, 27 Oct 2018 21:26:25 +0200
 
/trunk/debian/changelog
3,8 → 3,11
* [SECURITY] CVE-2018-18655 information disclosure: Add no-referrer meta
header to templates (Closes: #911842).
* Replace exim4 dependency with default-mta.
* Install init script initially disabled instead of using an ENABLED
flag in /etc/default/prayer to prevent premature start (note: also
affects prayer-accountd).
 
-- Magnus Holmgren <holmgren@debian.org> Sat, 27 Oct 2018 19:59:24 +0200
-- Magnus Holmgren <holmgren@debian.org> Sat, 27 Oct 2018 21:29:01 +0200
 
prayer (1.3.5-dfsg1-4) unstable; urgency=low
 
/trunk/debian/prayer.default
4,9 → 4,6
 
# This is a POSIX shell fragment
 
# Change to one to enable prayer after editing /etc/prayer/prayer.cf
ENABLED=0
 
# 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.
/trunk/debian/prayer.init
23,8 → 23,6
 
. /lib/lsb/init-functions
 
ENABLED=0
 
# Include prayer defaults if available
if [ -f /etc/default/prayer ] ; then
. /etc/default/prayer
36,12 → 34,6
set +e
 
start() {
if [ "$ENABLED" = "0" ]; then
echo "Prayer is disabled. Please set ENABLED=1 in /etc/default/prayer"
echo "after adapting /etc/prayer/prayer.cf to your needs."
exit 0
fi
 
log_daemon_msg "Starting $DESC" "prayer"
start-stop-daemon --start --pidfile "$FRONTEND_PIDFILE" \
--exec "$FRONTEND_DAEMON" \
/trunk/debian/rules
15,5 → 15,8
override_dh_installchangelogs:
dh_installchangelogs docs/DONE
 
override_dh_installinit:
dh_installinit --no-enable
 
override_dh_installman:
dh_installman --language=C